Game-Decompilation/pokeruby
1
0
Fork 0
mirror of https://github.com/pret/pokeruby.git synced 2024-11-24 05:29:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

simplify version-dependent string names

Browse Source
This commit is contained in:
YamaArashi 2016-05-17 06:09:08 -07:00
parent 4bed639c29
commit 4af578c186
3 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
charmap.txt
View File

@ -257,21 +257,21 @@ PKMN = 53 54
POKEBLOCK = 55 56 57 58 59
@ string placeholders
@ unknown (FD 00)
PLAYER = FD 01
STR_VAR_1 = FD 02
STR_VAR_2 = FD 03
STR_VAR_3 = FD 04
@ unknown (FD 05)
RIVAL = FD 06
@ unknown (FD 00)
PLAYER = FD 01
STR_VAR_1 = FD 02
STR_VAR_2 = FD 03
STR_VAR_3 = FD 04
@ unknown (FD 05)
RIVAL = FD 06
@ version-dependent strings
VERSION = FD 07 @ "RUBY" / "SAPPHIRE"
EVIL_TEAM = FD 08 @ "MAGMA" / "AQUA"
GOOD_TEAM = FD 09 @ "AQUA" / "MAGMA"
EVIL_TEAM_LEADER = FD 0A @ "MAXIE" / "ARCHIE"
GOOD_TEAM_LEADER = FD 0B @ "ARCHIE" / "MAXIE"
CUR_VERSION_MASCOT = FD 0C @ "GROUDON" / "KYOGRE"
OPP_VERSION_MASCOT = FD 0D @ "KYOGRE" / "GROUDON"
VERSION = FD 07 @ "RUBY" / "SAPPHIRE"
EVIL_TEAM = FD 08 @ "MAGMA" / "AQUA"
GOOD_TEAM = FD 09 @ "AQUA" / "MAGMA"
EVIL_LEADER = FD 0A @ "MAXIE" / "ARCHIE"
GOOD_LEADER = FD 0B @ "ARCHIE" / "MAXIE"
EVIL_LEGENDARY = FD 0C @ "GROUDON" / "KYOGRE"
GOOD_LEGENDARY = FD 0D @ "KYOGRE" / "GROUDON"
@ indicates the end of a town/city name (before " TOWN" or " CITY")
NAME_END = FC 00

8
data/string_util.s
View File

@ -37,7 +37,7 @@ gExpandPlaceholderFuncTable: @ 81E72F8
.4byte ExpandPlaceholder_Version
.4byte ExpandPlaceholder_EvilTeam
.4byte ExpandPlaceholder_GoodTeam
.4byte ExpandPlaceholder_EvilTeamLeader
.4byte ExpandPlaceholder_GoodTeamLeader
.4byte ExpandPlaceholder_CurVersionMascot
.4byte ExpandPlaceholder_OppVersionMascot
.4byte ExpandPlaceholder_EvilLeader
.4byte ExpandPlaceholder_GoodLeader
.4byte ExpandPlaceholder_EvilLegendary
.4byte ExpandPlaceholder_GoodLegendary

14
src/string_util.c
View File

@ -469,13 +469,13 @@ u8 *ExpandPlaceholder_RivalName()
}
#define VERSION_DEPENDENT_PLACEHOLDER_LIST \
X(Version, Ruby, Sapphire) \
X(EvilTeam, Magma, Aqua) \
X(GoodTeam, Aqua, Magma) \
X(EvilTeamLeader, Maxie, Archie) \
X(GoodTeamLeader, Archie, Maxie) \
X(CurVersionMascot, Groudon, Kyogre) \
X(OppVersionMascot, Kyogre, Groudon)
X(Version, Ruby, Sapphire) \
X(EvilTeam, Magma, Aqua) \
X(GoodTeam, Aqua, Magma) \
X(EvilLeader, Maxie, Archie) \
X(GoodLeader, Archie, Maxie) \
X(EvilLegendary, Groudon, Kyogre) \
X(GoodLegendary, Kyogre, Groudon)
#ifdef SAPPHIRE
#define X(ph, r, s) \