dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some string names

Browse Source
This commit is contained in:
PikalaxALT
2019-10-25 14:01:40 -04:00
parent d33509ec93
commit 15298c6cd1
3 changed files with 63 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/strings.s
+21 -21
View File
@@ -1427,19 +1427,19 @@ gText_MakeAChallenge:: @ 0x841796D
gText_Info_2:: @ 0x841797F
.string "INFO$"
gText_FreshWater200:: @ 0x8417984
gText_FreshWater_200:: @ 0x8417984
.string "FRESH WATER{CLEAR_TO 0x57}{SMALL}¥200$"
gText_SodaPop300:: @ 0x841799A
gText_SodaPop_300:: @ 0x841799A
.string "SODA POP{CLEAR_TO 0x57}{SMALL}¥300$"
gText_Lemonade350:: @ 0x84179AD
gText_Lemonade_350:: @ 0x84179AD
.string "LEMONADE{CLEAR_TO 0x57}{SMALL}¥350$"
gText_50Coins1000:: @ 0x84179C0
gText_50Coins_1000:: @ 0x84179C0
.string "{SMALL} 50 COINS{CLEAR_TO 0x45}¥1,000$"
gText_500Coins10000:: @ 0x84179D6
gText_500Coins_10000:: @ 0x84179D6
.string "{SMALL}500 COINS{CLEAR_TO 0x40}¥10,000$"
gText_Excellent:: @ 0x84179ED
@@ -1469,19 +1469,19 @@ gText_Right:: @ 0x8417A37
gText_Left:: @ 0x8417A3D
.string "Left$"
gText_Tm134000Coins:: @ 0x8417A42
gText_Tm13_4000Coins:: @ 0x8417A42
.string "TM13{CLEAR_TO 0x48}{SMALL}4,000 COINS$"
gText_Tm233500Coins:: @ 0x8417A58
gText_Tm23_3500Coins:: @ 0x8417A58
.string "TM23{CLEAR_TO 0x48}{SMALL}3,500 COINS$"
gText_Tm244000Coins:: @ 0x8417A6E
gText_Tm24_4000Coins:: @ 0x8417A6E
.string "TM24{CLEAR_TO 0x48}{SMALL}4,000 COINS$"
gText_Tm304500Coins:: @ 0x8417A84
gText_Tm30_4500Coins:: @ 0x8417A84
.string "TM30{CLEAR_TO 0x48}{SMALL}4,500 COINS$"
gText_Tm354000Coins:: @ 0x8417A9A
gText_Tm35_4000Coins:: @ 0x8417A9A
.string "TM35{CLEAR_TO 0x48}{SMALL}4,000 COINS$"
gText_1F:: @ 0x8417AB0
@@ -1625,25 +1625,25 @@ gText_Lemonade:: @ 0x8417C24
gText_Coins_2:: @ 8417C2D
.string "COINS$"
gText_Bicycle1000000:: @ 0x8417C33
gText_Bicycle_1000000:: @ 0x8417C33
.string "BICYCLE{CLEAR_TO 0x49}{SMALL}¥1,000,000$"
gText_NoThanks:: @ 0x8417C4B
.string "NO THANKS$"
gText_Abra180Coins:: @ 0x8417C55
gText_Abra_180Coins:: @ 0x8417C55
.string "ABRA{CLEAR_TO 0x55}{SMALL} 180 COINS$"
gText_Clefairy500Coins:: @ 0x8417C6A
gText_Clefairy_500Coins:: @ 0x8417C6A
.string "CLEFAIRY{CLEAR_TO 0x55}{SMALL} 500 COINS$"
gText_Dratini2800Coins:: @ 0x8417C83
gText_Dratini_2800Coins:: @ 0x8417C83
.string "DRATINI{CLEAR_TO 0x4B}{SMALL} 2,800 COINS$"
gText_Scyther5500Coins:: @ 0x8417C9D
gText_Scyther_5500Coins:: @ 0x8417C9D
.string "SCYTHER{CLEAR_TO 0x4B}{SMALL} 5,500 COINS$"
gText_Porygon9999Coins:: @ 0x8417CB7
gText_Porygon_9999Coins:: @ 0x8417CB7
.string "PORYGON{CLEAR_TO 0x4B}{SMALL} 9,999 COINS$"
gUnknown_8417CD1:: @ 0x8417CD1
@@ -1766,19 +1766,19 @@ gText_NavelRock:: @ 0x8417EC1
gText_BirthIsland:: @ 0x8417ECC
.string "BIRTH ISLAND$"
gText_MiracleSeed1000Coins:: @ 0x8417ED9
gText_MiracleSeed_1000Coins:: @ 0x8417ED9
.string "MIRACLE SEED{CLEAR_TO 0x50}{SMALL}1,000 COINS$"
gText_Charcoal1000Coins:: @ 0x8417EF7
gText_Charcoal_1000Coins:: @ 0x8417EF7
.string "CHARCOAL{CLEAR_TO 0x50}{SMALL}1,000 COINS$"
gText_MysticWater1000Coins:: @ 0x8417F11
gText_MysticWater_1000Coins:: @ 0x8417F11
.string "MYSTIC WATER{CLEAR_TO 0x50}{SMALL}1,000 COINS$"
gText_YellowFlute1600Coins:: @ 0x8417F2F
gText_YellowFlute_1600Coins:: @ 0x8417F2F
.string "YELLOW FLUTE{CLEAR_TO 0x50}{SMALL}1,600 COINS$"
gText_SmokeBall800Coins:: @ 0x8417F4D
gText_SmokeBall_800Coins:: @ 0x8417F4D
.string "SMOKE BALL{CLEAR_TO 0x5A}{SMALL}800 COINS$"
gText_Dummy_8417F67:: @ 0x8417F67
include/strings.h
+21 -21
View File
@@ -544,11 +544,11 @@ extern const u8 gText_DoubleBattle[];
extern const u8 gText_MultiBattle[];
extern const u8 gText_MakeAChallenge[];
extern const u8 gText_Info_2[];
extern const u8 gText_FreshWater200[];
extern const u8 gText_SodaPop300[];
extern const u8 gText_Lemonade350[];
extern const u8 gText_50Coins1000[];
extern const u8 gText_500Coins10000[];
extern const u8 gText_FreshWater_200[];
extern const u8 gText_SodaPop_300[];
extern const u8 gText_Lemonade_350[];
extern const u8 gText_50Coins_1000[];
extern const u8 gText_500Coins_10000[];
extern const u8 gText_Excellent[];
extern const u8 gText_NotSoBad[];
extern const u8 gText_RedShard[];
@@ -557,11 +557,11 @@ extern const u8 gText_BlueShard[];
extern const u8 gText_GreenShard[];
extern const u8 gText_Right[];
extern const u8 gText_Left[];
extern const u8 gText_Tm134000Coins[];
extern const u8 gText_Tm233500Coins[];
extern const u8 gText_Tm244000Coins[];
extern const u8 gText_Tm304500Coins[];
extern const u8 gText_Tm354000Coins[];
extern const u8 gText_Tm13_4000Coins[];
extern const u8 gText_Tm23_3500Coins[];
extern const u8 gText_Tm24_4000Coins[];
extern const u8 gText_Tm30_4500Coins[];
extern const u8 gText_Tm35_4000Coins[];
extern const u8 gText_1F[];
extern const u8 gText_2F[];
extern const u8 gText_3F[];
@@ -579,13 +579,13 @@ extern const u8 gText_QuitLooking[];
extern const u8 gText_FreshWater[];
extern const u8 gText_SodaPop[];
extern const u8 gText_Lemonade[];
extern const u8 gText_Bicycle1000000[];
extern const u8 gText_Bicycle_1000000[];
extern const u8 gText_NoThanks[];
extern const u8 gText_Abra180Coins[];
extern const u8 gText_Clefairy500Coins[];
extern const u8 gText_Dratini2800Coins[];
extern const u8 gText_Scyther5500Coins[];
extern const u8 gText_Porygon9999Coins[];
extern const u8 gText_Abra_180Coins[];
extern const u8 gText_Clefairy_500Coins[];
extern const u8 gText_Dratini_2800Coins[];
extern const u8 gText_Scyther_5500Coins[];
extern const u8 gText_Porygon_9999Coins[];
extern const u8 gText_NoThanks_2[];
extern const u8 gText_HelixFossil[];
extern const u8 gText_DomeFossil[];
@@ -610,11 +610,11 @@ extern const u8 gText_1BigMushroom[];
extern const u8 gText_SeviiIslands[];
extern const u8 gText_NavelRock[];
extern const u8 gText_BirthIsland[];
extern const u8 gText_MiracleSeed1000Coins[];
extern const u8 gText_Charcoal1000Coins[];
extern const u8 gText_MysticWater1000Coins[];
extern const u8 gText_YellowFlute1600Coins[];
extern const u8 gText_SmokeBall800Coins[];
extern const u8 gText_MiracleSeed_1000Coins[];
extern const u8 gText_Charcoal_1000Coins[];
extern const u8 gText_MysticWater_1000Coins[];
extern const u8 gText_YellowFlute_1600Coins[];
extern const u8 gText_SmokeBall_800Coins[];
extern const u8 gText_Dummy_8417F67[];
extern const u8 gText_Dummy_8417F68[];
extern const u8 gText_BecomeLeader[];
src/script_menu.c
+21 -21
View File
@@ -161,33 +161,33 @@ static const struct MenuAction sScriptMultiChoiceMenu_25[] = {
};
static const struct MenuAction sScriptMultiChoiceMenu_26[] = {
{ gText_FreshWater200 },
{ gText_SodaPop300 },
{ gText_Lemonade350 },
{ gText_FreshWater_200 },
{ gText_SodaPop_300 },
{ gText_Lemonade_350 },
{ gOtherText_Exit }
};
static const struct MenuAction sScriptMultiChoiceMenu_30[] = {
{ gText_Tm134000Coins },
{ gText_Tm233500Coins },
{ gText_Tm244000Coins },
{ gText_Tm304500Coins },
{ gText_Tm354000Coins },
{ gText_Tm13_4000Coins },
{ gText_Tm23_3500Coins },
{ gText_Tm24_4000Coins },
{ gText_Tm30_4500Coins },
{ gText_Tm35_4000Coins },
{ gText_NoThanks_2 }
};
static const struct MenuAction sScriptMultiChoiceMenu_41[] = {
{ gText_SmokeBall800Coins },
{ gText_MiracleSeed1000Coins },
{ gText_Charcoal1000Coins },
{ gText_MysticWater1000Coins },
{ gText_YellowFlute1600Coins },
{ gText_SmokeBall_800Coins },
{ gText_MiracleSeed_1000Coins },
{ gText_Charcoal_1000Coins },
{ gText_MysticWater_1000Coins },
{ gText_YellowFlute_1600Coins },
{ gText_NoThanks_2 }
};
static const struct MenuAction sScriptMultiChoiceMenu_27[] = {
{ gText_50Coins1000 },
{ gText_500Coins10000 },
{ gText_50Coins_1000 },
{ gText_500Coins_10000 },
{ gOtherText_Exit }
};
@@ -311,16 +311,16 @@ static const struct MenuAction sScriptMultiChoiceMenu_1[] = {
};
static const struct MenuAction sScriptMultiChoiceMenu_13[] = {
{ gText_Bicycle1000000 },
{ gText_Bicycle_1000000 },
{ gText_NoThanks }
};
static const struct MenuAction sScriptMultiChoiceMenu_14[] = {
{ gText_Abra180Coins },
{ gText_Clefairy500Coins },
{ gText_Dratini2800Coins },
{ gText_Scyther5500Coins },
{ gText_Porygon9999Coins },
{ gText_Abra_180Coins },
{ gText_Clefairy_500Coins },
{ gText_Dratini_2800Coins },
{ gText_Scyther_5500Coins },
{ gText_Porygon_9999Coins },
{ gText_NoThanks_2 }
};