dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Remove address comments

Browse Source
This commit is contained in:
GriffinR
2021-07-20 15:18:31 -04:00
parent bea170e8e9
commit 06351bf63c
576 changed files with 17798 additions and 17798 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
data/maps/Route117/scripts.inc
View File

@@ -1,44 +1,44 @@
.set LOCALID_DAYCARE_MAN, 3
Route117_MapScripts:: @ 81F397D
Route117_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, Route117_OnTransition
.byte 0
Route117_OnTransition: @ 81F3983
Route117_OnTransition:
call Route117_EventScript_TryMoveDayCareMan
end
Route117_EventScript_TryMoveDayCareMan:: @ 81F3989
Route117_EventScript_TryMoveDayCareMan::
goto_if_unset FLAG_PENDING_DAYCARE_EGG, Route117_EventScript_StopMoveDayCareMan
setobjectxyperm LOCALID_DAYCARE_MAN, 47, 6
Route117_EventScript_StopMoveDayCareMan:: @ 81F3999
Route117_EventScript_StopMoveDayCareMan::
return
Route117_EventScript_Woman:: @ 81F399A
Route117_EventScript_Woman::
msgbox Route117_Text_ArentTheseFlowersPretty, MSGBOX_NPC
end
Route117_EventScript_LittleBoy:: @ 81F39A3
Route117_EventScript_LittleBoy::
msgbox Route117_Text_AirIsTastyHere, MSGBOX_NPC
end
Route117_EventScript_Girl:: @ 81F39AC
Route117_EventScript_Girl::
msgbox Route117_Text_DayCarePokemonHadNewMove, MSGBOX_NPC
end
Route117_EventScript_RouteSignVerdanturf:: @ 81F39B5
Route117_EventScript_RouteSignVerdanturf::
msgbox Route117_Text_RouteSignVerdanturf, MSGBOX_SIGN
end
Route117_EventScript_RouteSignMauville:: @ 81F39BE
Route117_EventScript_RouteSignMauville::
msgbox Route117_Text_RouteSignMauville, MSGBOX_SIGN
end
Route117_EventScript_DayCareSign:: @ 81F39C7
Route117_EventScript_DayCareSign::
msgbox Route117_Text_DayCareSign, MSGBOX_SIGN
end
Route117_EventScript_Isaac:: @ 81F39D0
Route117_EventScript_Isaac::
trainerbattle_single TRAINER_ISAAC_1, Route117_Text_IsaacIntro, Route117_Text_IsaacDefeat, Route117_EventScript_RegisterIsaac
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, TRUE
@@ -47,7 +47,7 @@ Route117_EventScript_Isaac:: @ 81F39D0
release
end
Route117_EventScript_RegisterIsaac:: @ 81F39FC
Route117_EventScript_RegisterIsaac::
special PlayerFaceTrainerAfterBattle
waitmovement 0
msgbox Route117_Text_IsaacRegister, MSGBOX_DEFAULT
@@ -55,12 +55,12 @@ Route117_EventScript_RegisterIsaac:: @ 81F39FC
release
end
Route117_EventScript_RematchIsaac:: @ 81F3A1B
Route117_EventScript_RematchIsaac::
trainerbattle_rematch TRAINER_ISAAC_1, Route117_Text_IsaacRematchIntro, Route117_Text_IsaacRematchDefeat
msgbox Route117_Text_IsaacPostRematch, MSGBOX_AUTOCLOSE
end
Route117_EventScript_Lydia:: @ 81F3A32
Route117_EventScript_Lydia::
trainerbattle_single TRAINER_LYDIA_1, Route117_Text_LydiaIntro, Route117_Text_LydiaDefeat, Route117_EventScript_RegisterLydia
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, TRUE
@@ -69,7 +69,7 @@ Route117_EventScript_Lydia:: @ 81F3A32
release
end
Route117_EventScript_RegisterLydia:: @ 81F3A5E
Route117_EventScript_RegisterLydia::
special PlayerFaceTrainerAfterBattle
waitmovement 0
msgbox Route117_Text_LydiaRegister, MSGBOX_DEFAULT
@@ -77,12 +77,12 @@ Route117_EventScript_RegisterLydia:: @ 81F3A5E
release
end
Route117_EventScript_RematchLydia:: @ 81F3A7D
Route117_EventScript_RematchLydia::
trainerbattle_rematch TRAINER_LYDIA_1, Route117_Text_LydiaRematchIntro, Route117_Text_LydiaRematchDefeat
msgbox Route117_Text_LydiaPostRematch, MSGBOX_AUTOCLOSE
end
Route117_EventScript_Dylan:: @ 81F3A94
Route117_EventScript_Dylan::
trainerbattle_single TRAINER_DYLAN_1, Route117_Text_DylanIntro, Route117_Text_DylanDefeat, Route117_EventScript_RegisterDylan
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, TRUE
@@ -91,7 +91,7 @@ Route117_EventScript_Dylan:: @ 81F3A94
release
end
Route117_EventScript_RegisterDylan:: @ 81F3AC0
Route117_EventScript_RegisterDylan::
special PlayerFaceTrainerAfterBattle
waitmovement 0
msgbox Route117_Text_DylanRegister, MSGBOX_DEFAULT
@@ -99,12 +99,12 @@ Route117_EventScript_RegisterDylan:: @ 81F3AC0
release
end
Route117_EventScript_RematchDylan:: @ 81F3ADF
Route117_EventScript_RematchDylan::
trainerbattle_rematch TRAINER_DYLAN_1, Route117_Text_DylanRematchIntro, Route117_Text_DylanRematchDefeat
msgbox Route117_Text_DylanPostRematch, MSGBOX_AUTOCLOSE
end
Route117_EventScript_Maria:: @ 81F3AF6
Route117_EventScript_Maria::
trainerbattle_single TRAINER_MARIA_1, Route117_Text_MariaIntro, Route117_Text_MariaDefeat, Route117_EventScript_RegisterMaria
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, TRUE
@@ -113,7 +113,7 @@ Route117_EventScript_Maria:: @ 81F3AF6
release
end
Route117_EventScript_RegisterMaria:: @ 81F3B22
Route117_EventScript_RegisterMaria::
special PlayerFaceTrainerAfterBattle
waitmovement 0
msgbox Route117_Text_MariaRegister, MSGBOX_DEFAULT
@@ -121,17 +121,17 @@ Route117_EventScript_RegisterMaria:: @ 81F3B22
release
end
Route117_EventScript_RematchMaria:: @ 81F3B41
Route117_EventScript_RematchMaria::
trainerbattle_rematch TRAINER_MARIA_1, Route117_Text_MariaRematchIntro, Route117_Text_MariaRematchDefeat
msgbox Route117_Text_MariaPostRematch, MSGBOX_AUTOCLOSE
end
Route117_EventScript_Derek:: @ 81F3B58
Route117_EventScript_Derek::
trainerbattle_single TRAINER_DEREK, Route117_Text_DerekIntro, Route117_Text_DerekDefeat
msgbox Route117_Text_DerekPostBattle, MSGBOX_AUTOCLOSE
end
Route117_EventScript_Anna:: @ 81F3B6F
Route117_EventScript_Anna::
trainerbattle_double TRAINER_ANNA_AND_MEG_1, Route117_Text_AnnaIntro, Route117_Text_AnnaDefeat, Route117_Text_AnnaNotEnoughMons, Route117_EventScript_RegisterAnna
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, TRUE
@@ -140,18 +140,18 @@ Route117_EventScript_Anna:: @ 81F3B6F
release
end
Route117_EventScript_RegisterAnna:: @ 81F3B9F
Route117_EventScript_RegisterAnna::
msgbox Route117_Text_AnnaAndMegRegister, MSGBOX_DEFAULT
register_matchcall TRAINER_ANNA_AND_MEG_1
release
end
Route117_EventScript_RematchAnna:: @ 81F3BB8
Route117_EventScript_RematchAnna::
trainerbattle_rematch_double TRAINER_ANNA_AND_MEG_1, Route117_Text_AnnaRematchIntro, Route117_Text_AnnaRematchDefeat, Route117_Text_AnnaRematchNotEnoughMons
msgbox Route117_Text_AnnaPostRematch, MSGBOX_AUTOCLOSE
end
Route117_EventScript_Meg:: @ 81F3BD3
Route117_EventScript_Meg::
trainerbattle_double TRAINER_ANNA_AND_MEG_1, Route117_Text_MegIntro, Route117_Text_MegDefeat, Route117_Text_MegNotEnoughMons, Route117_EventScript_RegisterMeg
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, TRUE
@@ -160,55 +160,55 @@ Route117_EventScript_Meg:: @ 81F3BD3
release
end
Route117_EventScript_RegisterMeg:: @ 81F3C03
Route117_EventScript_RegisterMeg::
msgbox Route117_Text_AnnaAndMegRegister, MSGBOX_DEFAULT
register_matchcall TRAINER_ANNA_AND_MEG_1
release
end
Route117_EventScript_RematchMeg:: @ 81F3C1C
Route117_EventScript_RematchMeg::
trainerbattle_rematch_double TRAINER_ANNA_AND_MEG_1, Route117_Text_MegRematchIntro, Route117_Text_MegRematchDefeat, Route117_Text_MegRematchNotEnoughMons
msgbox Route117_Text_MegPostRematch, MSGBOX_AUTOCLOSE
end
Route117_EventScript_Melina:: @ 81F3C37
Route117_EventScript_Melina::
trainerbattle_single TRAINER_MELINA, Route117_Text_MelinaIntro, Route117_Text_MelinaDefeat
msgbox Route117_Text_MelinaPostBattle, MSGBOX_AUTOCLOSE
end
Route117_EventScript_Brandi:: @ 81F3C4E
Route117_EventScript_Brandi::
trainerbattle_single TRAINER_BRANDI, Route117_Text_BrandiIntro, Route117_Text_BrandiDefeat
msgbox Route117_Text_BrandiPostBattle, MSGBOX_AUTOCLOSE
end
Route117_EventScript_Aisha:: @ 81F3C65
Route117_EventScript_Aisha::
trainerbattle_single TRAINER_AISHA, Route117_Text_AishaIntro, Route117_Text_AishaDefeat
msgbox Route117_Text_AishaPostBattle, MSGBOX_AUTOCLOSE
end
Route117_Text_DayCarePokemonHadNewMove: @ 81F3C7C
Route117_Text_DayCarePokemonHadNewMove:
.string "I left my POKéMON at the DAY CARE.\p"
.string "When I got it back, it had a new move\n"
.string "that I didn't teach it.\l"
.string "I was really, really surprised.$"
Route117_Text_ArentTheseFlowersPretty: @ 81F3CFD
Route117_Text_ArentTheseFlowersPretty:
.string "What do you think?\n"
.string "Aren't these flowers pretty?\p"
.string "I planted them all!$"
Route117_Text_AirIsTastyHere: @ 81F3D41
Route117_Text_AirIsTastyHere:
.string "The air is tasty here!$"
Route117_Text_RouteSignVerdanturf: @ 81F3D58
Route117_Text_RouteSignVerdanturf:
.string "ROUTE 117\n"
.string "{LEFT_ARROW} VERDANTURF TOWN$"
Route117_Text_RouteSignMauville: @ 81F3D74
Route117_Text_RouteSignMauville:
.string "ROUTE 117\n"
.string "{RIGHT_ARROW} MAUVILLE CITY$"
Route117_Text_DayCareSign: @ 81F3D8E
Route117_Text_DayCareSign:
.string "POKéMON DAY CARE\n"
.string "“Let us raise your POKéMON.”$"