ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 04:04:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix capitalized symbol names

Browse Source
This commit is contained in:
Diegoisawesome 2017-11-11 18:17:46 -06:00
parent f497c1508b
commit 6e6e11205d
3 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
data/event_scripts.s
View File

@ -5737,7 +5737,7 @@ BattleFrontier_BattleTowerLobby_EventScript_28CB96:: @ 828CB96
compare_var_to_value VAR_RESULT, 1 compare_var_to_value VAR_RESULT, 1
goto_eq BattleFrontier_BattleTowerLobby_EventScript_28CC7A goto_eq BattleFrontier_BattleTowerLobby_EventScript_28CC7A
copyvar VAR_0x8009, VAR_0x8006 copyvar VAR_0x8009, VAR_0x8006
msgbox BATTLE_FRONTIER_BATTLE_TOWER_LOBBY_Text_27F704, 5 msgbox BattleFrontier_BattleTowerLobby_Text_27F704, 5
compare_var_to_value VAR_RESULT, 1 compare_var_to_value VAR_RESULT, 1
goto_eq BattleFrontier_BattleTowerLobby_EventScript_28CBD8 goto_eq BattleFrontier_BattleTowerLobby_EventScript_28CBD8
compare_var_to_value VAR_RESULT, 0 compare_var_to_value VAR_RESULT, 0
@ -5745,7 +5745,7 @@ BattleFrontier_BattleTowerLobby_EventScript_28CB96:: @ 828CB96
end end
BattleFrontier_BattleTowerLobby_EventScript_28CBD8:: @ 828CBD8 BattleFrontier_BattleTowerLobby_EventScript_28CBD8:: @ 828CBD8
message BATTLE_FRONTIER_BATTLE_TOWER_LOBBY_Text_27F7BA message BattleFrontier_BattleTowerLobby_Text_27F7BA
waitmessage waitmessage
multichoice 20, 8, 45, 1 multichoice 20, 8, 45, 1
copyvar VAR_0x8008, VAR_RESULT copyvar VAR_0x8008, VAR_RESULT
@ -5753,7 +5753,7 @@ BattleFrontier_BattleTowerLobby_EventScript_28CBD8:: @ 828CBD8
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_28CC38 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_28CC38
compare_var_to_value VAR_RESULT, 1 compare_var_to_value VAR_RESULT, 1
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_28CC41 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_28CC41
msgbox BATTLE_FRONTIER_BATTLE_TOWER_LOBBY_Text_27F97A, 4 msgbox BattleFrontier_BattleTowerLobby_Text_27F97A, 4
setvar VAR_0x8004, 12 setvar VAR_0x8004, 12
copyvar VAR_0x8005, VAR_0x8009 copyvar VAR_0x8005, VAR_0x8009
call BattleFrontier_BattleTowerLobby_EventScript_271E7C call BattleFrontier_BattleTowerLobby_EventScript_271E7C
@ -5766,22 +5766,22 @@ BattleFrontier_BattleTowerLobby_EventScript_28CBD8:: @ 828CBD8
end end
BattleFrontier_BattleTowerLobby_EventScript_28CC2E:: @ 828CC2E BattleFrontier_BattleTowerLobby_EventScript_28CC2E:: @ 828CC2E
msgbox BATTLE_FRONTIER_BATTLE_TOWER_LOBBY_Text_27F84C, 4 msgbox BattleFrontier_BattleTowerLobby_Text_27F84C, 4
release release
end end
BattleFrontier_BattleTowerLobby_EventScript_28CC38:: @ 828CC38 BattleFrontier_BattleTowerLobby_EventScript_28CC38:: @ 828CC38
msgbox BATTLE_FRONTIER_BATTLE_TOWER_LOBBY_Text_27F8AE, 4 msgbox BattleFrontier_BattleTowerLobby_Text_27F8AE, 4
return return
BattleFrontier_BattleTowerLobby_EventScript_28CC41:: @ 828CC41 BattleFrontier_BattleTowerLobby_EventScript_28CC41:: @ 828CC41
msgbox BATTLE_FRONTIER_BATTLE_TOWER_LOBBY_Text_27F921, 4 msgbox BattleFrontier_BattleTowerLobby_Text_27F921, 4
return return
BattleFrontier_BattleTowerLobby_EventScript_28CC4A:: @ 828CC4A BattleFrontier_BattleTowerLobby_EventScript_28CC4A:: @ 828CC4A
compare_var_to_value VAR_RESULT, 0 compare_var_to_value VAR_RESULT, 0
goto_eq BattleFrontier_BattleTowerLobby_EventScript_28CC70 goto_eq BattleFrontier_BattleTowerLobby_EventScript_28CC70
msgbox BATTLE_FRONTIER_BATTLE_TOWER_LOBBY_Text_27F9FD, 4 msgbox BattleFrontier_BattleTowerLobby_Text_27F9FD, 4
setflag FLAG_0x002 setflag FLAG_0x002
copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8004, VAR_0x8008
setvar VAR_0x8005, 7 setvar VAR_0x8005, 7
@ -5789,12 +5789,12 @@ BattleFrontier_BattleTowerLobby_EventScript_28CC4A:: @ 828CC4A
end end
BattleFrontier_BattleTowerLobby_EventScript_28CC70:: @ 828CC70 BattleFrontier_BattleTowerLobby_EventScript_28CC70:: @ 828CC70
msgbox BATTLE_FRONTIER_BATTLE_TOWER_LOBBY_Text_27FA6F, 4 msgbox BattleFrontier_BattleTowerLobby_Text_27FA6F, 4
release release
end end
BattleFrontier_BattleTowerLobby_EventScript_28CC7A:: @ 828CC7A BattleFrontier_BattleTowerLobby_EventScript_28CC7A:: @ 828CC7A
msgbox BATTLE_FRONTIER_BATTLE_TOWER_LOBBY_Text_27FAF3, 4 msgbox BattleFrontier_BattleTowerLobby_Text_27FAF3, 4
release release
end end

18
data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc
View File

@ -513,7 +513,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD90:: @ 821CD90
copyvar VAR_0x800A, VAR_0x8006 copyvar VAR_0x800A, VAR_0x8006
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
special sub_813BDB4 special sub_813BDB4
msgbox LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB_Text_281BCB, 4 msgbox LilycoveCity_PokemonTrainerFanClub_Text_281BCB, 4
setvar VAR_0x8004, 14 setvar VAR_0x8004, 14
copyvar VAR_0x8005, VAR_0x800A copyvar VAR_0x8005, VAR_0x800A
call LilycoveCity_PokemonTrainerFanClub_EventScript_271E7C call LilycoveCity_PokemonTrainerFanClub_EventScript_271E7C
@ -526,14 +526,14 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD90:: @ 821CD90
end end
LilycoveCity_PokemonTrainerFanClub_EventScript_21CDE0:: @ 821CDE0 LilycoveCity_PokemonTrainerFanClub_EventScript_21CDE0:: @ 821CDE0
msgbox LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB_Text_281C06, 4 msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C06, 4
goto LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D goto LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D
end end
LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE:: @ 821CDEE LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE:: @ 821CDEE
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
special sub_813BDB4 special sub_813BDB4
msgbox LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB_Text_281C3D, 5 msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C3D, 5
compare_var_to_value VAR_RESULT, 1 compare_var_to_value VAR_RESULT, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6
compare_var_to_value VAR_RESULT, 0 compare_var_to_value VAR_RESULT, 0
@ -543,7 +543,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE:: @ 821CDEE
LilycoveCity_PokemonTrainerFanClub_EventScript_21CE15:: @ 821CE15 LilycoveCity_PokemonTrainerFanClub_EventScript_21CE15:: @ 821CE15
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
special sub_813BDB4 special sub_813BDB4
msgbox LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB_Text_281C65, 4 msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C65, 4
setvar VAR_0x8004, 14 setvar VAR_0x8004, 14
copyvar VAR_0x8005, VAR_0x800A copyvar VAR_0x8005, VAR_0x800A
call LilycoveCity_PokemonTrainerFanClub_EventScript_271E7C call LilycoveCity_PokemonTrainerFanClub_EventScript_271E7C
@ -558,7 +558,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CE15:: @ 821CE15
LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D:: @ 821CE4D LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D:: @ 821CE4D
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
special sub_813BDB4 special sub_813BDB4
message LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB_Text_281C95 message LilycoveCity_PokemonTrainerFanClub_Text_281C95
waitmessage waitmessage
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
special sub_813A128 special sub_813A128
@ -578,7 +578,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D:: @ 821CE4D
LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F:: @ 821CE9F LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F:: @ 821CE9F
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
special sub_813BDB4 special sub_813BDB4
msgbox LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB_Text_281CCD, 5 msgbox LilycoveCity_PokemonTrainerFanClub_Text_281CCD, 5
compare_var_to_value VAR_RESULT, 1 compare_var_to_value VAR_RESULT, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6
compare_var_to_value VAR_RESULT, 0 compare_var_to_value VAR_RESULT, 0
@ -588,14 +588,14 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F:: @ 821CE9F
LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6:: @ 821CEC6 LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6:: @ 821CEC6
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
special sub_813BDB4 special sub_813BDB4
msgbox LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB_Text_281CF5, 4 msgbox LilycoveCity_PokemonTrainerFanClub_Text_281CF5, 4
release release
end end
LilycoveCity_PokemonTrainerFanClub_EventScript_21CED8:: @ 821CED8 LilycoveCity_PokemonTrainerFanClub_EventScript_21CED8:: @ 821CED8
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
special sub_813BDB4 special sub_813BDB4
msgbox LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB_Text_281D40, 4 msgbox LilycoveCity_PokemonTrainerFanClub_Text_281D40, 4
setflag FLAG_0x0D2 setflag FLAG_0x0D2
release release
end end
@ -603,7 +603,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CED8:: @ 821CED8
LilycoveCity_PokemonTrainerFanClub_EventScript_21CEED:: @ 821CEED LilycoveCity_PokemonTrainerFanClub_EventScript_21CEED:: @ 821CEED
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
special sub_813BDB4 special sub_813BDB4
msgbox LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB_Text_281DB4, 4 msgbox LilycoveCity_PokemonTrainerFanClub_Text_281DB4, 4
release release
end end

36
data/text/tv.inc
View File

@ -108,7 +108,7 @@ gTVBravoTrainerText07:: @ 0827F65C
gTVBravoTrainerText08:: @ 0827F6E6 gTVBravoTrainerText08:: @ 0827F6E6
.string "Introducing the TRAINER’s {STR_VAR_1}!$" .string "Introducing the TRAINER’s {STR_VAR_1}!$"
BATTLE_FRONTIER_BATTLE_TOWER_LOBBY_Text_27F704:: @ 0827F704 BattleFrontier_BattleTowerLobby_Text_27F704:: @ 0827F704
.string "Hello! You’re the TRAINER who just had\n" .string "Hello! You’re the TRAINER who just had\n"
.string "a battle, right?\p" .string "a battle, right?\p"
.string "I’m gathering interviews with TRAINERS\n" .string "I’m gathering interviews with TRAINERS\n"
@ -116,7 +116,7 @@ BATTLE_FRONTIER_BATTLE_TOWER_LOBBY_Text_27F704:: @ 0827F704
.string "May I get a few words from you about\n" .string "May I get a few words from you about\n"
.string "your impressions on battling?$" .string "your impressions on battling?$"
BATTLE_FRONTIER_BATTLE_TOWER_LOBBY_Text_27F7BA:: @ 0827F7BA BattleFrontier_BattleTowerLobby_Text_27F7BA:: @ 0827F7BA
.string "You will? Really?\n" .string "You will? Really?\n"
.string "Thank you!\l" .string "Thank you!\l"
.string "Then, uh…\p" .string "Then, uh…\p"
@ -125,44 +125,44 @@ BATTLE_FRONTIER_BATTLE_TOWER_LOBBY_Text_27F7BA:: @ 0827F7BA
.string "Were you satisfied with the battle?\n" .string "Were you satisfied with the battle?\n"
.string "Or are you unhappy?$" .string "Or are you unhappy?$"
BATTLE_FRONTIER_BATTLE_TOWER_LOBBY_Text_27F84C:: @ 0827F84C BattleFrontier_BattleTowerLobby_Text_27F84C:: @ 0827F84C
.string "Oh…\n" .string "Oh…\n"
.string "Sorry we disturbed you.\p" .string "Sorry we disturbed you.\p"
.string "Please give us an interview the next\n" .string "Please give us an interview the next\n"
.string "time you visit the BATTLE TOWER.$" .string "time you visit the BATTLE TOWER.$"
BATTLE_FRONTIER_BATTLE_TOWER_LOBBY_Text_27F8AE:: @ 0827F8AE BattleFrontier_BattleTowerLobby_Text_27F8AE:: @ 0827F8AE
.string "Well, of course!\p" .string "Well, of course!\p"
.string "That unmistakable look of satisfaction\n" .string "That unmistakable look of satisfaction\n"
.string "on your face…\p" .string "on your face…\p"
.string "It’s obvious that you’ve had a great\n" .string "It’s obvious that you’ve had a great\n"
.string "battle.$" .string "battle.$"
BATTLE_FRONTIER_BATTLE_TOWER_LOBBY_Text_27F921:: @ 0827F921 BattleFrontier_BattleTowerLobby_Text_27F921:: @ 0827F921
.string "Oh, I see…\p" .string "Oh, I see…\p"
.string "Well, it certainly is difficult to make a\n" .string "Well, it certainly is difficult to make a\n"
.string "battle turn out exactly as planned.$" .string "battle turn out exactly as planned.$"
BATTLE_FRONTIER_BATTLE_TOWER_LOBBY_Text_27F97A:: @ 0827F97A BattleFrontier_BattleTowerLobby_Text_27F97A:: @ 0827F97A
.string "Oh, oh, may I ask one more question?\p" .string "Oh, oh, may I ask one more question?\p"
.string "If you were to describe your\n" .string "If you were to describe your\n"
.string "impressions about this battle with\l" .string "impressions about this battle with\l"
.string "one saying, what would it be?$" .string "one saying, what would it be?$"
BATTLE_FRONTIER_BATTLE_TOWER_LOBBY_Text_27F9FD:: @ 0827F9FD BattleFrontier_BattleTowerLobby_Text_27F9FD:: @ 0827F9FD
.string "Oh, that is stunningly cool!\p" .string "Oh, that is stunningly cool!\p"
.string "That’s a great line!\n" .string "That’s a great line!\n"
.string "I hope you’ll do great next time, too.\p" .string "I hope you’ll do great next time, too.\p"
.string "I hope to see you again!$" .string "I hope to see you again!$"
BATTLE_FRONTIER_BATTLE_TOWER_LOBBY_Text_27FA6F:: @ 0827FA6F BattleFrontier_BattleTowerLobby_Text_27FA6F:: @ 0827FA6F
.string "Oh, I see…\p" .string "Oh, I see…\p"
.string "Still, being the silent type is also\n" .string "Still, being the silent type is also\n"
.string "cool, isn’t it?\p" .string "cool, isn’t it?\p"
.string "I hope you’ll give me the opportunity\n" .string "I hope you’ll give me the opportunity\n"
.string "to share your thoughts again!$" .string "to share your thoughts again!$"
BATTLE_FRONTIER_BATTLE_TOWER_LOBBY_Text_27FAF3:: @ 0827FAF3 BattleFrontier_BattleTowerLobby_Text_27FAF3:: @ 0827FAF3
.string "I’ll be looking forward to your\n" .string "I’ll be looking forward to your\n"
.string "next battle!$" .string "next battle!$"
@ -612,44 +612,44 @@ gTV3CheersForPokeblocksText05:: @ 08281B93
.string "Tune in next time!\n" .string "Tune in next time!\n"
.string "Our slogan is “3 CHEERS FOR {POKEBLOCK}S!”$" .string "Our slogan is “3 CHEERS FOR {POKEBLOCK}S!”$"
LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB_Text_281BCB:: @ 8281BCB LilycoveCity_PokemonTrainerFanClub_Text_281BCB:: @ 8281BCB
.string "Hi, there!\p" .string "Hi, there!\p"
.string "I’m a big fan of {STR_VAR_1}.\n" .string "I’m a big fan of {STR_VAR_1}.\n"
.string "What’s your opinion of {STR_VAR_1}?$" .string "What’s your opinion of {STR_VAR_1}?$"
LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB_Text_281C06:: @ 8281C06 LilycoveCity_PokemonTrainerFanClub_Text_281C06:: @ 8281C06
.string "I see, I see. That’s what you think\n" .string "I see, I see. That’s what you think\n"
.string "about the TRAINER.$" .string "about the TRAINER.$"
LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB_Text_281C3D:: @ 8281C3D LilycoveCity_PokemonTrainerFanClub_Text_281C3D:: @ 8281C3D
.string "Have you completely forgotten\n" .string "Have you completely forgotten\n"
.string "about {STR_VAR_1}?$" .string "about {STR_VAR_1}?$"
LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB_Text_281C65:: @ 8281C65 LilycoveCity_PokemonTrainerFanClub_Text_281C65:: @ 8281C65
.string "I’m a big fan of {STR_VAR_1}.\n" .string "I’m a big fan of {STR_VAR_1}.\n"
.string "What’s your opinion of {STR_VAR_1}?$" .string "What’s your opinion of {STR_VAR_1}?$"
LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB_Text_281C95:: @ 8281C95 LilycoveCity_PokemonTrainerFanClub_Text_281C95:: @ 8281C95
.string "How strong would you rate {STR_VAR_1}\n" .string "How strong would you rate {STR_VAR_1}\n"
.string "on a scale of one hundred?$" .string "on a scale of one hundred?$"
LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB_Text_281CCD:: @ 8281CCD LilycoveCity_PokemonTrainerFanClub_Text_281CCD:: @ 8281CCD
.string "Have you completely forgotten\n" .string "Have you completely forgotten\n"
.string "about {STR_VAR_1}?$" .string "about {STR_VAR_1}?$"
LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB_Text_281CF5:: @ 8281CF5 LilycoveCity_PokemonTrainerFanClub_Text_281CF5:: @ 8281CF5
.string "Oh, I see!\n" .string "Oh, I see!\n"
.string "You should meet {STR_VAR_1} sometime.\l" .string "You should meet {STR_VAR_1} sometime.\l"
.string "I’m sure you’ll become a fan, too!$" .string "I’m sure you’ll become a fan, too!$"
LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB_Text_281D40:: @ 8281D40 LilycoveCity_PokemonTrainerFanClub_Text_281D40:: @ 8281D40
.string "I see, I see.\p" .string "I see, I see.\p"
.string "Thank you!\n" .string "Thank you!\n"
.string "That’s very useful to know.\p" .string "That’s very useful to know.\p"
.string "I’ll share this information with other\n" .string "I’ll share this information with other\n"
.string "{STR_VAR_1} fans and discuss it.$" .string "{STR_VAR_1} fans and discuss it.$"
LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB_Text_281DB4:: @ 8281DB4 LilycoveCity_PokemonTrainerFanClub_Text_281DB4:: @ 8281DB4
.string "There’s going to be a TV special on\n" .string "There’s going to be a TV special on\n"
.string "{STR_VAR_1} very soon.\p" .string "{STR_VAR_1} very soon.\p"
.string "I hope you catch it!$" .string "I hope you catch it!$"