diff options
Diffstat (limited to 'data')
32 files changed, 281 insertions, 261 deletions
diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/map.json b/data/maps/BattleFrontier_PokemonCenter_1F/map.json index 8f8153c08..743bab8b0 100644 --- a/data/maps/BattleFrontier_PokemonCenter_1F/map.json +++ b/data/maps/BattleFrontier_PokemonCenter_1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "BattleFrontier_PokemonCenter_1F_EventScript_267908", + "script": "BattleFrontier_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "BattleFrontier_PokemonCenter_1F_EventScript_267916", + "script": "BattleFrontier_PokemonCenter_1F_EventScript_SchoolKid", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "BattleFrontier_PokemonCenter_1F_EventScript_26791F", + "script": "BattleFrontier_PokemonCenter_1F_EventScript_Man", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "BattleFrontier_PokemonCenter_1F_EventScript_267928", + "script": "BattleFrontier_PokemonCenter_1F_EventScript_Picnicker", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "BattleFrontier_PokemonCenter_1F_EventScript_267931", + "script": "BattleFrontier_PokemonCenter_1F_EventScript_Skitty", "flag": "0" } ], diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc index 84aeef182..f77d9ab83 100644 --- a/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc +++ b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc @@ -1,13 +1,14 @@ BattleFrontier_PokemonCenter_1F_MapScripts:: @ 82678F9 - map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_PokemonCenter_1F_MapScript1_267904 + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 -BattleFrontier_PokemonCenter_1F_MapScript1_267904: @ 8267904 +BattleFrontier_PokemonCenter_1F_OnTransition: @ 8267904 setrespawn HEAL_LOCATION_BATTLE_FRONTIER_OUTSIDE_EAST end -BattleFrontier_PokemonCenter_1F_EventScript_267908:: @ 8267908 +@ VAR_0x800B is the Nurse's object event id +BattleFrontier_PokemonCenter_1F_EventScript_Nurse:: @ 8267908 setvar VAR_0x800B, 1 call Common_EventScript_PkmnCenterNurse waitmessage @@ -15,29 +16,29 @@ BattleFrontier_PokemonCenter_1F_EventScript_267908:: @ 8267908 release end -BattleFrontier_PokemonCenter_1F_EventScript_267916:: @ 8267916 - msgbox BattleFrontier_PokemonCenter_1F_Text_267944, MSGBOX_NPC +BattleFrontier_PokemonCenter_1F_EventScript_SchoolKid:: @ 8267916 + msgbox BattleFrontier_PokemonCenter_1F_Text_NeverSeenPokemon, MSGBOX_NPC end -BattleFrontier_PokemonCenter_1F_EventScript_26791F:: @ 826791F - msgbox BattleFrontier_PokemonCenter_1F_Text_2679EB, MSGBOX_NPC +BattleFrontier_PokemonCenter_1F_EventScript_Man:: @ 826791F + msgbox BattleFrontier_PokemonCenter_1F_Text_NextStopBattleArena, MSGBOX_NPC end -BattleFrontier_PokemonCenter_1F_EventScript_267928:: @ 8267928 - msgbox BattleFrontier_PokemonCenter_1F_Text_267A4B, MSGBOX_NPC +BattleFrontier_PokemonCenter_1F_EventScript_Picnicker:: @ 8267928 + msgbox BattleFrontier_PokemonCenter_1F_Text_GoingThroughEveryChallenge, MSGBOX_NPC end -BattleFrontier_PokemonCenter_1F_EventScript_267931:: @ 8267931 +BattleFrontier_PokemonCenter_1F_EventScript_Skitty:: @ 8267931 lock faceplayer waitse playmoncry SPECIES_SKITTY, 0 - msgbox BattleFrontier_PokemonCenter_1F_Text_267A90, MSGBOX_DEFAULT + msgbox BattleFrontier_PokemonCenter_1F_Text_Skitty, MSGBOX_DEFAULT waitmoncry release end -BattleFrontier_PokemonCenter_1F_Text_267944: @ 8267944 +BattleFrontier_PokemonCenter_1F_Text_NeverSeenPokemon: @ 8267944 .string "There was someone here using a \n" .string "POKéMON I've never seen before.\p" .string "I never learned about it at\n" @@ -45,15 +46,15 @@ BattleFrontier_PokemonCenter_1F_Text_267944: @ 8267944 .string "I wonder where you can catch POKéMON\n" .string "like that.$" -BattleFrontier_PokemonCenter_1F_Text_2679EB: @ 82679EB +BattleFrontier_PokemonCenter_1F_Text_NextStopBattleArena: @ 82679EB .string "Okay! Next stop, the BATTLE ARENA!\n" .string "I'd better get the right POKéMON from\l" .string "the PC Storage System.$" -BattleFrontier_PokemonCenter_1F_Text_267A4B: @ 8267A4B +BattleFrontier_PokemonCenter_1F_Text_GoingThroughEveryChallenge: @ 8267A4B .string "Giggle… I'm going to go through every\n" .string "challenge with just this baby!$" -BattleFrontier_PokemonCenter_1F_Text_267A90: @ 8267A90 +BattleFrontier_PokemonCenter_1F_Text_Skitty: @ 8267A90 .string "SKITTY: Mya myaaah!$" diff --git a/data/maps/DewfordTown_PokemonCenter_1F/map.json b/data/maps/DewfordTown_PokemonCenter_1F/map.json index 89acf1ea8..67e0e5721 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/map.json +++ b/data/maps/DewfordTown_PokemonCenter_1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_PokemonCenter_1F_EventScript_1FC537", + "script": "DewfordTown_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_PokemonCenter_1F_EventScript_1FC545", + "script": "DewfordTown_PokemonCenter_1F_EventScript_PokefanF", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_PokemonCenter_1F_EventScript_1FC54E", + "script": "DewfordTown_PokemonCenter_1F_EventScript_Man", "flag": "0" } ], diff --git a/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc index 6fc9abb99..99d180d8f 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc @@ -8,7 +8,8 @@ DewfordTown_PokemonCenter_1F_OnTransition: @ 81FC52E call Common_EventScript_UpdateBrineyLocation end -DewfordTown_PokemonCenter_1F_EventScript_1FC537:: @ 81FC537 +@ VAR_0x800B is the Nurse's object event id +DewfordTown_PokemonCenter_1F_EventScript_Nurse:: @ 81FC537 setvar VAR_0x800B, 1 call Common_EventScript_PkmnCenterNurse waitmessage @@ -16,21 +17,21 @@ DewfordTown_PokemonCenter_1F_EventScript_1FC537:: @ 81FC537 release end -DewfordTown_PokemonCenter_1F_EventScript_1FC545:: @ 81FC545 - msgbox DewfordTown_PokemonCenter_1F_Text_1FC557, MSGBOX_NPC +DewfordTown_PokemonCenter_1F_EventScript_PokefanF:: @ 81FC545 + msgbox DewfordTown_PokemonCenter_1F_Text_StoneCavern, MSGBOX_NPC end -DewfordTown_PokemonCenter_1F_EventScript_1FC54E:: @ 81FC54E - msgbox DewfordTown_PokemonCenter_1F_Text_1FC5AE, MSGBOX_NPC +DewfordTown_PokemonCenter_1F_EventScript_Man:: @ 81FC54E + msgbox DewfordTown_PokemonCenter_1F_Text_FaintedMonCanUseHM, MSGBOX_NPC end -DewfordTown_PokemonCenter_1F_Text_1FC557: @ 81FC557 +DewfordTown_PokemonCenter_1F_Text_StoneCavern: @ 81FC557 .string "There's a stone cavern at the edge\n" .string "of town.\p" .string "I've heard you can find rare stones\n" .string "there.$" -DewfordTown_PokemonCenter_1F_Text_1FC5AE: @ 81FC5AE +DewfordTown_PokemonCenter_1F_Text_FaintedMonCanUseHM: @ 81FC5AE .string "Even if a POKéMON faints and can't\n" .string "battle, it can still use a move learned\l" .string "from a HIDDEN MACHINE (HM).$" diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/map.json b/data/maps/EverGrandeCity_PokemonCenter_1F/map.json index 38c527b34..23bbe085f 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/map.json +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "EverGrandeCity_PokemonCenter_1F_EventScript_229A59", + "script": "EverGrandeCity_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "EverGrandeCity_PokemonCenter_1F_EventScript_229A67", + "script": "EverGrandeCity_PokemonCenter_1F_EventScript_Woman", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "EverGrandeCity_PokemonCenter_1F_EventScript_229A70", + "script": "EverGrandeCity_PokemonCenter_1F_EventScript_ExpertM", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "EverGrandeCity_PokemonCenter_1F_EventScript_229A79", + "script": "EverGrandeCity_PokemonCenter_1F_EventScript_Scott", "flag": "FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT" } ], diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc index 2d1f1de37..95be20f75 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc @@ -5,15 +5,16 @@ EverGrandeCity_PokemonCenter_1F_MapScripts:: @ 8229A34 EverGrandeCity_PokemonCenter_1F_OnTransition: @ 8229A3F setrespawn HEAL_LOCATION_EVER_GRANDE_CITY_1 - call_if_unset FLAG_MET_SCOTT_IN_EVERGRANDE, EverGrandeCity_PokemonCenter_1F_EventScript_229A4C + call_if_unset FLAG_MET_SCOTT_IN_EVERGRANDE, EverGrandeCity_PokemonCenter_1F_EventScript_TryShowScott end -EverGrandeCity_PokemonCenter_1F_EventScript_229A4C:: @ 8229A4C +EverGrandeCity_PokemonCenter_1F_EventScript_TryShowScott:: @ 8229A4C goto_if_unset FLAG_BADGE06_GET, Common_EventScript_NopReturn clearflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT return -EverGrandeCity_PokemonCenter_1F_EventScript_229A59:: @ 8229A59 +@ VAR_0x800B is the Nurse's object event id +EverGrandeCity_PokemonCenter_1F_EventScript_Nurse:: @ 8229A59 setvar VAR_0x800B, 1 call Common_EventScript_PkmnCenterNurse waitmessage @@ -21,25 +22,25 @@ EverGrandeCity_PokemonCenter_1F_EventScript_229A59:: @ 8229A59 release end -EverGrandeCity_PokemonCenter_1F_EventScript_229A67:: @ 8229A67 - msgbox EverGrandeCity_PokemonCenter_1F_Text_229ADA, MSGBOX_NPC +EverGrandeCity_PokemonCenter_1F_EventScript_Woman:: @ 8229A67 + msgbox EverGrandeCity_PokemonCenter_1F_Text_LeagueAfterVictoryRoad, MSGBOX_NPC end -EverGrandeCity_PokemonCenter_1F_EventScript_229A70:: @ 8229A70 - msgbox EverGrandeCity_PokemonCenter_1F_Text_229B62, MSGBOX_NPC +EverGrandeCity_PokemonCenter_1F_EventScript_ExpertM:: @ 8229A70 + msgbox EverGrandeCity_PokemonCenter_1F_Text_BelieveInYourPokemon, MSGBOX_NPC end -EverGrandeCity_PokemonCenter_1F_EventScript_229A79:: @ 8229A79 +EverGrandeCity_PokemonCenter_1F_EventScript_Scott:: @ 8229A79 lock faceplayer - msgbox EverGrandeCity_PokemonCenter_1F_Text_229BF1, MSGBOX_DEFAULT + msgbox EverGrandeCity_PokemonCenter_1F_Text_ScottHappyForYou, MSGBOX_DEFAULT closemessage compare VAR_FACING, DIR_NORTH - call_if_eq EverGrandeCity_PokemonCenter_1F_EventScript_229AB6 + call_if_eq EverGrandeCity_PokemonCenter_1F_EventScript_ScottExitNorth compare VAR_FACING, DIR_EAST - call_if_eq EverGrandeCity_PokemonCenter_1F_EventScript_229AC1 + call_if_eq EverGrandeCity_PokemonCenter_1F_EventScript_ScottExit compare VAR_FACING, DIR_WEST - call_if_eq EverGrandeCity_PokemonCenter_1F_EventScript_229AC1 + call_if_eq EverGrandeCity_PokemonCenter_1F_EventScript_ScottExit addvar VAR_SCOTT_STATE, 1 setflag FLAG_MET_SCOTT_IN_EVERGRANDE playse SE_KAIDAN @@ -48,17 +49,17 @@ EverGrandeCity_PokemonCenter_1F_EventScript_229A79:: @ 8229A79 release end -EverGrandeCity_PokemonCenter_1F_EventScript_229AB6:: @ 8229AB6 - applymovement 4, EverGrandeCity_PokemonCenter_1F_Movement_229ACC +EverGrandeCity_PokemonCenter_1F_EventScript_ScottExitNorth:: @ 8229AB6 + applymovement 4, EverGrandeCity_PokemonCenter_1F_Movement_ScottExitNorth waitmovement 0 return -EverGrandeCity_PokemonCenter_1F_EventScript_229AC1:: @ 8229AC1 - applymovement 4, EverGrandeCity_PokemonCenter_1F_Movement_229AD3 +EverGrandeCity_PokemonCenter_1F_EventScript_ScottExit:: @ 8229AC1 + applymovement 4, EverGrandeCity_PokemonCenter_1F_Movement_ScottExit waitmovement 0 return -EverGrandeCity_PokemonCenter_1F_Movement_229ACC: @ 8229ACC +EverGrandeCity_PokemonCenter_1F_Movement_ScottExitNorth: @ 8229ACC walk_left walk_down walk_down @@ -67,7 +68,7 @@ EverGrandeCity_PokemonCenter_1F_Movement_229ACC: @ 8229ACC walk_down step_end -EverGrandeCity_PokemonCenter_1F_Movement_229AD3: @ 8229AD3 +EverGrandeCity_PokemonCenter_1F_Movement_ScottExit: @ 8229AD3 walk_down walk_down walk_left @@ -76,20 +77,20 @@ EverGrandeCity_PokemonCenter_1F_Movement_229AD3: @ 8229AD3 walk_down step_end -EverGrandeCity_PokemonCenter_1F_Text_229ADA: @ 8229ADA +EverGrandeCity_PokemonCenter_1F_Text_LeagueAfterVictoryRoad: @ 8229ADA .string "The POKéMON LEAGUE is only a short\n" .string "distance after the VICTORY ROAD.\p" .string "If you've come this far, what choice\n" .string "do you have but to keep going?$" -EverGrandeCity_PokemonCenter_1F_Text_229B62: @ 8229B62 +EverGrandeCity_PokemonCenter_1F_Text_BelieveInYourPokemon: @ 8229B62 .string "The long and harrowing VICTORY ROAD…\p" .string "It's like reliving the path one has\n" .string "traveled in life…\p" .string "Believe in your POKéMON and give it\n" .string "your very best!$" -EverGrandeCity_PokemonCenter_1F_Text_229BF1: @ 8229BF1 +EverGrandeCity_PokemonCenter_1F_Text_ScottHappyForYou: @ 8229BF1 .string "SCOTT: {PLAYER}{KUN}, you've clawed your\n" .string "way up to face the POKéMON LEAGUE!\p" .string "I'm happy for you!\n" diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/map.json b/data/maps/EverGrandeCity_PokemonLeague_1F/map.json index 2a9efbeaf..8efb63b9a 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/map.json +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "EverGrandeCity_PokemonLeague_1F_EventScript_2295FC", + "script": "EverGrandeCity_PokemonLeague_1F_EventScript_Nurse", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "EverGrandeCity_PokemonLeague_1F_EventScript_22960A", + "script": "EverGrandeCity_PokemonLeague_1F_EventScript_Clerk", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "EverGrandeCity_PokemonLeague_1F_EventScript_229636", + "script": "EverGrandeCity_PokemonLeague_1F_EventScript_DoorGuard", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "EverGrandeCity_PokemonLeague_1F_EventScript_229636", + "script": "EverGrandeCity_PokemonLeague_1F_EventScript_DoorGuard", "flag": "0" } ], diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc index 4b695d9d9..814025895 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc @@ -6,15 +6,16 @@ EverGrandeCity_PokemonLeague_1F_MapScripts:: @ 82295D2 EverGrandeCity_PokemonLeague_1F_OnTransition: @ 82295DD setrespawn HEAL_LOCATION_EVER_GRANDE_CITY_2 setflag FLAG_LANDMARK_POKEMON_LEAGUE - call_if_unset FLAG_ENTERED_ELITE_FOUR, EverGrandeCity_PokemonLeague_1F_EventScript_2295ED + call_if_unset FLAG_ENTERED_ELITE_FOUR, EverGrandeCity_PokemonLeague_1F_EventScript_GuardsBlockDoor end -EverGrandeCity_PokemonLeague_1F_EventScript_2295ED:: @ 82295ED +EverGrandeCity_PokemonLeague_1F_EventScript_GuardsBlockDoor:: @ 82295ED setobjectxyperm 3, 9, 2 setobjectxyperm 4, 10, 2 return -EverGrandeCity_PokemonLeague_1F_EventScript_2295FC:: @ 82295FC +@ VAR_0x800B is the Nurse's object event id +EverGrandeCity_PokemonLeague_1F_EventScript_Nurse:: @ 82295FC setvar VAR_0x800B, 1 call Common_EventScript_PkmnCenterNurse waitmessage @@ -22,18 +23,18 @@ EverGrandeCity_PokemonLeague_1F_EventScript_2295FC:: @ 82295FC release end -EverGrandeCity_PokemonLeague_1F_EventScript_22960A:: @ 822960A +EverGrandeCity_PokemonLeague_1F_EventScript_Clerk:: @ 822960A lock faceplayer message gText_HowMayIServeYou waitmessage - pokemart EverGrandeCity_PokemonLeague_1F_Pokemart_229624 + pokemart EverGrandeCity_PokemonLeague_1F_Pokemart msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -EverGrandeCity_PokemonLeague_1F_Pokemart_229624: @ 8229624 +EverGrandeCity_PokemonLeague_1F_Pokemart: @ 8229624 .2byte ITEM_ULTRA_BALL .2byte ITEM_HYPER_POTION .2byte ITEM_MAX_POTION @@ -45,25 +46,27 @@ EverGrandeCity_PokemonLeague_1F_Pokemart_229624: @ 8229624 release end -EverGrandeCity_PokemonLeague_1F_EventScript_229636:: @ 8229636 +@ The door guards only check for FLAG_BADGE06_GET because Winonas badge is the only one that can be skipped +@ Its assumed the player has the remaining badges +EverGrandeCity_PokemonLeague_1F_EventScript_DoorGuard:: @ 8229636 lockall - goto_if_set FLAG_ENTERED_ELITE_FOUR, EverGrandeCity_PokemonLeague_1F_EventScript_2296BB + goto_if_set FLAG_ENTERED_ELITE_FOUR, EverGrandeCity_PokemonLeague_1F_EventScript_GoForth getplayerxy VAR_TEMP_0, VAR_TEMP_1 compare VAR_TEMP_0, 11 - call_if_ge EverGrandeCity_PokemonLeague_1F_EventScript_229698 + call_if_ge EverGrandeCity_PokemonLeague_1F_EventScript_PlayerMoveToFrontFromRight compare VAR_TEMP_0, 8 - call_if_le EverGrandeCity_PokemonLeague_1F_EventScript_2296A3 - message EverGrandeCity_PokemonLeague_1F_Text_2296E8 + call_if_le EverGrandeCity_PokemonLeague_1F_EventScript_PlayerMoveToFrontFromLeft + message EverGrandeCity_PokemonLeague_1F_Text_MustHaveAllGymBadges waitmessage delay 120 - goto_if_unset FLAG_BADGE06_GET, EverGrandeCity_PokemonLeague_1F_EventScript_2296AE + goto_if_unset FLAG_BADGE06_GET, EverGrandeCity_PokemonLeague_1F_EventScript_NotAllBadges closemessage - applymovement 3, EverGrandeCity_PokemonLeague_1F_Movement_2296E2 - applymovement 4, EverGrandeCity_PokemonLeague_1F_Movement_2296E5 + applymovement 3, EverGrandeCity_PokemonLeague_1F_Movement_LeftGuardOutOfWay + applymovement 4, EverGrandeCity_PokemonLeague_1F_Movement_RightGuardOutOfWay waitmovement 0 delay 10 playfanfare MUS_ME_BACHI - message EverGrandeCity_PokemonLeague_1F_Text_2297EF + message EverGrandeCity_PokemonLeague_1F_Text_GoForth waitmessage waitfanfare closemessage @@ -73,67 +76,67 @@ EverGrandeCity_PokemonLeague_1F_EventScript_229636:: @ 8229636 releaseall end -EverGrandeCity_PokemonLeague_1F_EventScript_229698:: @ 8229698 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_PokemonLeague_1F_Movement_2296DA +EverGrandeCity_PokemonLeague_1F_EventScript_PlayerMoveToFrontFromRight:: @ 8229698 + applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_PokemonLeague_1F_Movement_MoveToFrontFromRight waitmovement 0 return -EverGrandeCity_PokemonLeague_1F_EventScript_2296A3:: @ 82296A3 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_PokemonLeague_1F_Movement_2296DE +EverGrandeCity_PokemonLeague_1F_EventScript_PlayerMoveToFrontFromLeft:: @ 82296A3 + applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_PokemonLeague_1F_Movement_MoveToFrontFromLeft waitmovement 0 return -EverGrandeCity_PokemonLeague_1F_EventScript_2296AE:: @ 82296AE +EverGrandeCity_PokemonLeague_1F_EventScript_NotAllBadges:: @ 82296AE playse SE_HAZURE - msgbox EverGrandeCity_PokemonLeague_1F_Text_229787, MSGBOX_DEFAULT + msgbox EverGrandeCity_PokemonLeague_1F_Text_HaventObtainedAllBadges, MSGBOX_DEFAULT releaseall end -EverGrandeCity_PokemonLeague_1F_EventScript_2296BB:: @ 82296BB +EverGrandeCity_PokemonLeague_1F_EventScript_GoForth:: @ 82296BB applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 - msgbox EverGrandeCity_PokemonLeague_1F_Text_2297EF, MSGBOX_DEFAULT + msgbox EverGrandeCity_PokemonLeague_1F_Text_GoForth, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end -EverGrandeCity_PokemonLeague_1F_Movement_2296DA: @ 82296DA +EverGrandeCity_PokemonLeague_1F_Movement_MoveToFrontFromRight: @ 82296DA walk_down walk_left walk_in_place_fastest_up step_end -EverGrandeCity_PokemonLeague_1F_Movement_2296DE: @ 82296DE +EverGrandeCity_PokemonLeague_1F_Movement_MoveToFrontFromLeft: @ 82296DE walk_down walk_right walk_in_place_fastest_up step_end -EverGrandeCity_PokemonLeague_1F_Movement_2296E2: @ 82296E2 +EverGrandeCity_PokemonLeague_1F_Movement_LeftGuardOutOfWay: @ 82296E2 walk_left walk_in_place_fastest_down step_end -EverGrandeCity_PokemonLeague_1F_Movement_2296E5: @ 82296E5 +EverGrandeCity_PokemonLeague_1F_Movement_RightGuardOutOfWay: @ 82296E5 walk_right walk_in_place_fastest_down step_end -EverGrandeCity_PokemonLeague_1F_Text_2296E8: @ 82296E8 +EverGrandeCity_PokemonLeague_1F_Text_MustHaveAllGymBadges: @ 82296E8 .string "Beyond this point, only those TRAINERS\n" .string "who have collected all the GYM BADGES\l" .string "are permitted to enter.\p" .string "TRAINER, let us confirm that you have\n" .string "all the GYM BADGES.$" -EverGrandeCity_PokemonLeague_1F_Text_229787: @ 8229787 +EverGrandeCity_PokemonLeague_1F_Text_HaventObtainedAllBadges: @ 8229787 .string "You haven't obtained all the BADGES.\p" .string "If you're bound for the POKéMON\n" .string "LEAGUE, you must return with them.$" -EverGrandeCity_PokemonLeague_1F_Text_2297EF: @ 82297EF +EverGrandeCity_PokemonLeague_1F_Text_GoForth: @ 82297EF .string "TRAINER! Believe in yourself and your\n" .string "POKéMON, and go forth!$" diff --git a/data/maps/FallarborTown_PokemonCenter_1F/map.json b/data/maps/FallarborTown_PokemonCenter_1F/map.json index b1ea1ed14..0b55de01a 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/map.json +++ b/data/maps/FallarborTown_PokemonCenter_1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_PokemonCenter_1F_EventScript_200BE1", + "script": "FallarborTown_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_PokemonCenter_1F_EventScript_200BEF", + "script": "FallarborTown_PokemonCenter_1F_EventScript_Girl", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_PokemonCenter_1F_EventScript_200BF8", + "script": "FallarborTown_PokemonCenter_1F_EventScript_ExpertM", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_PokemonCenter_1F_EventScript_200C01", + "script": "FallarborTown_PokemonCenter_1F_EventScript_Lanette", "flag": "FLAG_HIDE_FALLORBOR_POKEMON_CENTER_LANETTE" } ], diff --git a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc index db9122b6d..70c209ef9 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc @@ -8,7 +8,8 @@ FallarborTown_PokemonCenter_1F_OnTransition: @ 8200BD8 call Common_EventScript_UpdateBrineyLocation end -FallarborTown_PokemonCenter_1F_EventScript_200BE1:: @ 8200BE1 +@ VAR_0x800B is the Nurse's object event id +FallarborTown_PokemonCenter_1F_EventScript_Nurse:: @ 8200BE1 setvar VAR_0x800B, 1 call Common_EventScript_PkmnCenterNurse waitmessage @@ -16,44 +17,44 @@ FallarborTown_PokemonCenter_1F_EventScript_200BE1:: @ 8200BE1 release end -FallarborTown_PokemonCenter_1F_EventScript_200BEF:: @ 8200BEF - msgbox FallarborTown_PokemonCenter_1F_Text_200E22, MSGBOX_NPC +FallarborTown_PokemonCenter_1F_EventScript_Girl:: @ 8200BEF + msgbox FallarborTown_PokemonCenter_1F_Text_FossilManiacEdgeOfTown, MSGBOX_NPC end -FallarborTown_PokemonCenter_1F_EventScript_200BF8:: @ 8200BF8 - msgbox FallarborTown_PokemonCenter_1F_Text_200E8B, MSGBOX_NPC +FallarborTown_PokemonCenter_1F_EventScript_ExpertM:: @ 8200BF8 + msgbox FallarborTown_PokemonCenter_1F_Text_PlantHardyTrees, MSGBOX_NPC end -FallarborTown_PokemonCenter_1F_EventScript_200C01:: @ 8200C01 +FallarborTown_PokemonCenter_1F_EventScript_Lanette:: @ 8200C01 lock faceplayer - msgbox FallarborTown_PokemonCenter_1F_Text_200C6B, MSGBOX_DEFAULT + msgbox FallarborTown_PokemonCenter_1F_Text_LanetteGreeting, MSGBOX_DEFAULT closemessage switch VAR_FACING - case DIR_NORTH, FallarborTown_PokemonCenter_1F_EventScript_200C28 - case DIR_WEST, FallarborTown_PokemonCenter_1F_EventScript_200C38 + case DIR_NORTH, FallarborTown_PokemonCenter_1F_EventScript_LanetteExitNorth + case DIR_WEST, FallarborTown_PokemonCenter_1F_EventScript_LanetteExitWest end -FallarborTown_PokemonCenter_1F_EventScript_200C28:: @ 8200C28 - applymovement 4, FallarborTown_PokemonCenter_1F_Movement_200C53 +FallarborTown_PokemonCenter_1F_EventScript_LanetteExitNorth:: @ 8200C28 + applymovement 4, FallarborTown_PokemonCenter_1F_Movement_LanetteExitNorth waitmovement 0 - goto FallarborTown_PokemonCenter_1F_EventScript_200C48 + goto FallarborTown_PokemonCenter_1F_EventScript_LanetteExited end -FallarborTown_PokemonCenter_1F_EventScript_200C38:: @ 8200C38 - applymovement 4, FallarborTown_PokemonCenter_1F_Movement_200C60 +FallarborTown_PokemonCenter_1F_EventScript_LanetteExitWest:: @ 8200C38 + applymovement 4, FallarborTown_PokemonCenter_1F_Movement_LanetteExitWest waitmovement 0 - goto FallarborTown_PokemonCenter_1F_EventScript_200C48 + goto FallarborTown_PokemonCenter_1F_EventScript_LanetteExited end -FallarborTown_PokemonCenter_1F_EventScript_200C48:: @ 8200C48 +FallarborTown_PokemonCenter_1F_EventScript_LanetteExited:: @ 8200C48 playse SE_JIDO_DOA removeobject 4 clearflag FLAG_HIDE_LANETTES_HOUSE_LANETTE release end -FallarborTown_PokemonCenter_1F_Movement_200C53: @ 8200C53 +FallarborTown_PokemonCenter_1F_Movement_LanetteExitNorth: @ 8200C53 walk_right walk_down walk_down @@ -68,7 +69,7 @@ FallarborTown_PokemonCenter_1F_Movement_200C53: @ 8200C53 delay_8 step_end -FallarborTown_PokemonCenter_1F_Movement_200C60: @ 8200C60 +FallarborTown_PokemonCenter_1F_Movement_LanetteExitWest: @ 8200C60 walk_down walk_down walk_left @@ -81,7 +82,7 @@ FallarborTown_PokemonCenter_1F_Movement_200C60: @ 8200C60 delay_8 step_end -FallarborTown_PokemonCenter_1F_Text_200C6B: @ 8200C6B +FallarborTown_PokemonCenter_1F_Text_LanetteGreeting: @ 8200C6B .string "Oh, hello.\n" .string "You are?\p" .string "Okay, your name's {PLAYER}{KUN}.\n" @@ -98,13 +99,13 @@ FallarborTown_PokemonCenter_1F_Text_200C6B: @ 8200C6B .string "If you could, please visit me at home.\n" .string "My house is on ROUTE 114.$" -FallarborTown_PokemonCenter_1F_Text_200E22: @ 8200E22 +FallarborTown_PokemonCenter_1F_Text_FossilManiacEdgeOfTown: @ 8200E22 .string "I wonder what POKéMON looked like\n" .string "long, long ago?\p" .string "Maybe the FOSSIL MANIAC at the edge\n" .string "of town will know.$" -FallarborTown_PokemonCenter_1F_Text_200E8B: @ 8200E8B +FallarborTown_PokemonCenter_1F_Text_PlantHardyTrees: @ 8200E8B .string "In the fields of FALLARBOR, we plant\n" .string "seedlings of hardy trees that thrive\l" .string "even in volcanic ash.$" diff --git a/data/maps/FortreeCity_PokemonCenter_1F/map.json b/data/maps/FortreeCity_PokemonCenter_1F/map.json index efa58e87b..38f133cc0 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/map.json +++ b/data/maps/FortreeCity_PokemonCenter_1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_PokemonCenter_1F_EventScript_2173E7", + "script": "FortreeCity_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_PokemonCenter_1F_EventScript_2173F5", + "script": "FortreeCity_PokemonCenter_1F_EventScript_Gentleman", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_PokemonCenter_1F_EventScript_2173FE", + "script": "FortreeCity_PokemonCenter_1F_EventScript_Man", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_PokemonCenter_1F_EventScript_217407", + "script": "FortreeCity_PokemonCenter_1F_EventScript_Boy", "flag": "0" } ], diff --git a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc index fa88bd752..e759d2d93 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc @@ -7,7 +7,8 @@ FortreeCity_PokemonCenter_1F_OnTransition: @ 82173E3 setrespawn HEAL_LOCATION_FORTREE_CITY end -FortreeCity_PokemonCenter_1F_EventScript_2173E7:: @ 82173E7 +@ VAR_0x800B is the Nurse's object event id +FortreeCity_PokemonCenter_1F_EventScript_Nurse:: @ 82173E7 setvar VAR_0x800B, 1 call Common_EventScript_PkmnCenterNurse waitmessage @@ -15,25 +16,25 @@ FortreeCity_PokemonCenter_1F_EventScript_2173E7:: @ 82173E7 release end -FortreeCity_PokemonCenter_1F_EventScript_2173F5:: @ 82173F5 - msgbox FortreeCity_PokemonCenter_1F_Text_217410, MSGBOX_NPC +FortreeCity_PokemonCenter_1F_EventScript_Gentleman:: @ 82173F5 + msgbox FortreeCity_PokemonCenter_1F_Text_GoToSafariZone, MSGBOX_NPC end -FortreeCity_PokemonCenter_1F_EventScript_2173FE:: @ 82173FE - msgbox FortreeCity_PokemonCenter_1F_Text_21746D, MSGBOX_NPC +FortreeCity_PokemonCenter_1F_EventScript_Man:: @ 82173FE + msgbox FortreeCity_PokemonCenter_1F_Text_RecordCornerIsNeat, MSGBOX_NPC end -FortreeCity_PokemonCenter_1F_EventScript_217407:: @ 8217407 - msgbox FortreeCity_PokemonCenter_1F_Text_21751F, MSGBOX_NPC +FortreeCity_PokemonCenter_1F_EventScript_Boy:: @ 8217407 + msgbox FortreeCity_PokemonCenter_1F_Text_DoYouKnowAboutPokenav, MSGBOX_NPC end -FortreeCity_PokemonCenter_1F_Text_217410: @ 8217410 +FortreeCity_PokemonCenter_1F_Text_GoToSafariZone: @ 8217410 .string "Listen, kid, are you working\n" .string "on a POKéDEX?\p" .string "Hmm… Go to the SAFARI ZONE.\n" .string "That's my suggestion.$" -FortreeCity_PokemonCenter_1F_Text_21746D: @ 821746D +FortreeCity_PokemonCenter_1F_Text_RecordCornerIsNeat: @ 821746D .string "Have you done anything at\n" .string "the RECORD CORNER?\p" .string "It's pretty neat. It mixes and matches\n" @@ -41,7 +42,7 @@ FortreeCity_PokemonCenter_1F_Text_21746D: @ 821746D .string "I don't know quite how it works,\n" .string "but it's cool. It's exciting, even!$" -FortreeCity_PokemonCenter_1F_Text_21751F: @ 821751F +FortreeCity_PokemonCenter_1F_Text_DoYouKnowAboutPokenav: @ 821751F .string "Oh, wow, you have a POKéNAV!\n" .string "And it's just like mine!\p" .string "Do you know about POKéNAV's\n" diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/map.json b/data/maps/LavaridgeTown_PokemonCenter_1F/map.json index ef32ef660..4df734a49 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/map.json +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_PokemonCenter_1F_EventScript_1FFB0E", + "script": "LavaridgeTown_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_PokemonCenter_1F_EventScript_1FFB1C", + "script": "LavaridgeTown_PokemonCenter_1F_EventScript_Youngster", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_PokemonCenter_1F_EventScript_1FFB25", + "script": "LavaridgeTown_PokemonCenter_1F_EventScript_Woman", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_PokemonCenter_1F_EventScript_1FFB2E", + "script": "LavaridgeTown_PokemonCenter_1F_EventScript_Gentleman", "flag": "0" } ], diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc index 3a27182d5..a2b25fe0e 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc @@ -8,7 +8,8 @@ LavaridgeTown_PokemonCenter_1F_OnTransition: @ 81FFB05 call Common_EventScript_UpdateBrineyLocation end -LavaridgeTown_PokemonCenter_1F_EventScript_1FFB0E:: @ 81FFB0E +@ VAR_0x800B is the Nurse's object event id +LavaridgeTown_PokemonCenter_1F_EventScript_Nurse:: @ 81FFB0E setvar VAR_0x800B, 1 call Common_EventScript_PkmnCenterNurse waitmessage @@ -16,31 +17,31 @@ LavaridgeTown_PokemonCenter_1F_EventScript_1FFB0E:: @ 81FFB0E release end -LavaridgeTown_PokemonCenter_1F_EventScript_1FFB1C:: @ 81FFB1C - msgbox LavaridgeTown_PokemonCenter_1F_Text_1FFBAD, MSGBOX_NPC +LavaridgeTown_PokemonCenter_1F_EventScript_Youngster:: @ 81FFB1C + msgbox LavaridgeTown_PokemonCenter_1F_Text_HotSpringCanInvigorate, MSGBOX_NPC end -LavaridgeTown_PokemonCenter_1F_EventScript_1FFB25:: @ 81FFB25 - msgbox LavaridgeTown_PokemonCenter_1F_Text_1FFB37, MSGBOX_NPC +LavaridgeTown_PokemonCenter_1F_EventScript_Woman:: @ 81FFB25 + msgbox LavaridgeTown_PokemonCenter_1F_Text_TrainersPokemonSpendTimeTogether, MSGBOX_NPC end -LavaridgeTown_PokemonCenter_1F_EventScript_1FFB2E:: @ 81FFB2E - msgbox LavaridgeTown_PokemonCenter_1F_Text_1FFC21, MSGBOX_NPC +LavaridgeTown_PokemonCenter_1F_EventScript_Gentleman:: @ 81FFB2E + msgbox LavaridgeTown_PokemonCenter_1F_Text_TrainersShouldRestToo, MSGBOX_NPC end -LavaridgeTown_PokemonCenter_1F_Text_1FFB37: @ 81FFB37 +LavaridgeTown_PokemonCenter_1F_Text_TrainersPokemonSpendTimeTogether: @ 81FFB37 .string "I think POKéMON get closer to their\n" .string "TRAINERS if they spend time together.\p" .string "The longer the better.\n" .string "That's what I think.$" -LavaridgeTown_PokemonCenter_1F_Text_1FFBAD: @ 81FFBAD +LavaridgeTown_PokemonCenter_1F_Text_HotSpringCanInvigorate: @ 81FFBAD .string "It's sort of magical how just sitting\n" .string "in a hot-spring pool can invigorate.\p" .string "I wish I could let my POKéMON\n" .string "soak, too.$" -LavaridgeTown_PokemonCenter_1F_Text_1FFC21: @ 81FFC21 +LavaridgeTown_PokemonCenter_1F_Text_TrainersShouldRestToo: @ 81FFC21 .string "Hohoho! Hey, kid, you can reach\n" .string "the hot springs from here.\p" .string "If POKéMON are getting rest, so too\n" diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/map.json b/data/maps/LilycoveCity_PokemonCenter_1F/map.json index 023717a59..4f87f50b0 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/map.json +++ b/data/maps/LilycoveCity_PokemonCenter_1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_PokemonCenter_1F_EventScript_21C5E8", + "script": "LilycoveCity_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_PokemonCenter_1F_EventScript_21C5F6", + "script": "LilycoveCity_PokemonCenter_1F_EventScript_Boy", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_PokemonCenter_1F_EventScript_21C5FF", + "script": "LilycoveCity_PokemonCenter_1F_EventScript_Maniac", "flag": "0" }, { @@ -77,7 +77,7 @@ "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_PokemonCenter_1F_EventScript_ContestLadyMon", - "flag": "FLAG_HIDE_LILYCOVE_POKEMON_CENTER_LADY" + "flag": "FLAG_HIDE_LILYCOVE_POKEMON_CENTER_CONTEST_LADY_MON" } ], "warp_events": [ diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc index 09b18f4bd..a7df8528e 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc @@ -5,26 +5,28 @@ LilycoveCity_PokemonCenter_1F_MapScripts:: @ 821C5B2 LilycoveCity_PokemonCenter_1F_OnTransition: @ 821C5BD setrespawn HEAL_LOCATION_LILYCOVE_CITY - goto LilycoveCity_PokemonCenter_1F_EventScript_21C5C6 + goto LilycoveCity_PokemonCenter_1F_EventScript_SetLilycoveLadyGfx end -LilycoveCity_PokemonCenter_1F_EventScript_21C5C6:: @ 821C5C6 +@ SetLilycoveLadyGfx returns TRUE if its the Contest Lady +LilycoveCity_PokemonCenter_1F_EventScript_SetLilycoveLadyGfx:: @ 821C5C6 special SetLilycoveLadyGfx - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_21C5E0 - compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_21C5E4 + compare VAR_RESULT, FALSE + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_HideContestLadyMon + compare VAR_RESULT, TRUE + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_ShowContestLadyMon end -LilycoveCity_PokemonCenter_1F_EventScript_21C5E0:: @ 821C5E0 - setflag FLAG_HIDE_LILYCOVE_POKEMON_CENTER_LADY +LilycoveCity_PokemonCenter_1F_EventScript_HideContestLadyMon:: @ 821C5E0 + setflag FLAG_HIDE_LILYCOVE_POKEMON_CENTER_CONTEST_LADY_MON end -LilycoveCity_PokemonCenter_1F_EventScript_21C5E4:: @ 821C5E4 - clearflag FLAG_HIDE_LILYCOVE_POKEMON_CENTER_LADY +LilycoveCity_PokemonCenter_1F_EventScript_ShowContestLadyMon:: @ 821C5E4 + clearflag FLAG_HIDE_LILYCOVE_POKEMON_CENTER_CONTEST_LADY_MON end -LilycoveCity_PokemonCenter_1F_EventScript_21C5E8:: @ 821C5E8 +@ VAR_0x800B is the Nurse's object event id +LilycoveCity_PokemonCenter_1F_EventScript_Nurse:: @ 821C5E8 setvar VAR_0x800B, 1 call Common_EventScript_PkmnCenterNurse waitmessage @@ -32,35 +34,35 @@ LilycoveCity_PokemonCenter_1F_EventScript_21C5E8:: @ 821C5E8 release end -LilycoveCity_PokemonCenter_1F_EventScript_21C5F6:: @ 821C5F6 - msgbox LilycoveCity_PokemonCenter_1F_Text_21C61E, MSGBOX_NPC +LilycoveCity_PokemonCenter_1F_EventScript_Boy:: @ 821C5F6 + msgbox LilycoveCity_PokemonCenter_1F_Text_HowManyKindsOfPokemon, MSGBOX_NPC end -LilycoveCity_PokemonCenter_1F_EventScript_21C5FF:: @ 821C5FF +LilycoveCity_PokemonCenter_1F_EventScript_Maniac:: @ 821C5FF lock faceplayer - goto_if_set FLAG_BADGE07_GET, LilycoveCity_PokemonCenter_1F_EventScript_21C614 - msgbox LilycoveCity_PokemonCenter_1F_Text_21C69D, MSGBOX_DEFAULT + goto_if_set FLAG_BADGE07_GET, LilycoveCity_PokemonCenter_1F_EventScript_ManiacBadTeamGone + msgbox LilycoveCity_PokemonCenter_1F_Text_HeardAboutRottenScoundrels, MSGBOX_DEFAULT release end -LilycoveCity_PokemonCenter_1F_EventScript_21C614:: @ 821C614 - msgbox LilycoveCity_PokemonCenter_1F_Text_21C6F6, MSGBOX_DEFAULT +LilycoveCity_PokemonCenter_1F_EventScript_ManiacBadTeamGone:: @ 821C614 + msgbox LilycoveCity_PokemonCenter_1F_Text_HaventSeenRottenScoundrels, MSGBOX_DEFAULT release end -LilycoveCity_PokemonCenter_1F_Text_21C61E: @ 821C61E +LilycoveCity_PokemonCenter_1F_Text_HowManyKindsOfPokemon: @ 821C61E .string "I wonder how many kinds of POKéMON\n" .string "there are in the world.\p" .string "It'd be great to cross seas and\n" .string "trade POKéMON with people far away.$" -LilycoveCity_PokemonCenter_1F_Text_21C69D: @ 821C69D +LilycoveCity_PokemonCenter_1F_Text_HeardAboutRottenScoundrels: @ 821C69D .string "I've been hearing about some rotten\n" .string "scoundrels who steal POKéMON and rip\l" .string "off METEORITES.$" -LilycoveCity_PokemonCenter_1F_Text_21C6F6: @ 821C6F6 +LilycoveCity_PokemonCenter_1F_Text_HaventSeenRottenScoundrels: @ 821C6F6 .string "Those rotten scoundrels who steal\n" .string "POKéMON and rip off METEORITES…\p" .string "I haven't seen them around recently.$" diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/map.json b/data/maps/MauvilleCity_PokemonCenter_1F/map.json index c5fd1b32f..6540334be 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/map.json +++ b/data/maps/MauvilleCity_PokemonCenter_1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_PokemonCenter_1F_EventScript_210E78", + "script": "MauvilleCity_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_PokemonCenter_1F_EventScript_210E86", + "script": "MauvilleCity_PokemonCenter_1F_EventScript_Woman1", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_PokemonCenter_1F_EventScript_210E8F", + "script": "MauvilleCity_PokemonCenter_1F_EventScript_Woman2", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_PokemonCenter_1F_EventScript_210E98", + "script": "MauvilleCity_PokemonCenter_1F_EventScript_Youngster", "flag": "0" } ], diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc index dd302167b..f37f362e2 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc @@ -6,14 +6,15 @@ MauvilleCity_PokemonCenter_1F_MapScripts:: @ 8210E5B MauvilleCity_PokemonCenter_1F_OnTransition: @ 8210E66 setrespawn HEAL_LOCATION_MAUVILLE_CITY call Common_EventScript_UpdateBrineyLocation - goto MauvilleCity_PokemonCenter_1F_EventScript_210E74 + goto MauvilleCity_PokemonCenter_1F_EventScript_SetMauvilleOldManGfx end -MauvilleCity_PokemonCenter_1F_EventScript_210E74:: @ 8210E74 +MauvilleCity_PokemonCenter_1F_EventScript_SetMauvilleOldManGfx:: @ 8210E74 special ScrSpecial_SetMauvilleOldManEventObjGfx end -MauvilleCity_PokemonCenter_1F_EventScript_210E78:: @ 8210E78 +@ VAR_0x800B is the Nurse's object event id +MauvilleCity_PokemonCenter_1F_EventScript_Nurse:: @ 8210E78 setvar VAR_0x800B, 1 call Common_EventScript_PkmnCenterNurse waitmessage @@ -21,32 +22,32 @@ MauvilleCity_PokemonCenter_1F_EventScript_210E78:: @ 8210E78 release end -MauvilleCity_PokemonCenter_1F_EventScript_210E86:: @ 8210E86 - msgbox MauvilleCity_PokemonCenter_1F_Text_210EA1, MSGBOX_NPC +MauvilleCity_PokemonCenter_1F_EventScript_Woman1:: @ 8210E86 + msgbox MauvilleCity_PokemonCenter_1F_Text_ManOverThereSaysWeirdThings, MSGBOX_NPC end -MauvilleCity_PokemonCenter_1F_EventScript_210E8F:: @ 8210E8F - msgbox MauvilleCity_PokemonCenter_1F_Text_210F06, MSGBOX_NPC +MauvilleCity_PokemonCenter_1F_EventScript_Woman2:: @ 8210E8F + msgbox MauvilleCity_PokemonCenter_1F_Text_MyDataUpdatedFromRecordCorner, MSGBOX_NPC end -MauvilleCity_PokemonCenter_1F_EventScript_210E98:: @ 8210E98 - msgbox MauvilleCity_PokemonCenter_1F_Text_210F8A, MSGBOX_NPC +MauvilleCity_PokemonCenter_1F_EventScript_Youngster:: @ 8210E98 + msgbox MauvilleCity_PokemonCenter_1F_Text_RecordCornerSoundsFun, MSGBOX_NPC end -MauvilleCity_PokemonCenter_1F_Text_210EA1: @ 8210EA1 +MauvilleCity_PokemonCenter_1F_Text_ManOverThereSaysWeirdThings: @ 8210EA1 .string "That man over there, he says weird\n" .string "things!\p" .string "He's funny in a weird way.\n" .string "I doubt I'll forget about him!$" -MauvilleCity_PokemonCenter_1F_Text_210F06: @ 8210F06 +MauvilleCity_PokemonCenter_1F_Text_MyDataUpdatedFromRecordCorner: @ 8210F06 .string "When I accessed the RECORD CORNER,\n" .string "the data for what's hot in DEWFORD\l" .string "got updated.\p" .string "Now that bit of data is the same\n" .string "as my friend's!$" -MauvilleCity_PokemonCenter_1F_Text_210F8A: @ 8210F8A +MauvilleCity_PokemonCenter_1F_Text_RecordCornerSoundsFun: @ 8210F8A .string "A RECORD CORNER opened upstairs in\n" .string "the POKéMON CENTER.\p" .string "I don't know what it's about, but it\n" diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/map.json b/data/maps/MossdeepCity_PokemonCenter_1F/map.json index fc78cc967..c8018bc36 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/map.json +++ b/data/maps/MossdeepCity_PokemonCenter_1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_PokemonCenter_1F_EventScript_22224E", + "script": "MossdeepCity_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_PokemonCenter_1F_EventScript_22225C", + "script": "MossdeepCity_PokemonCenter_1F_EventScript_Woman", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_PokemonCenter_1F_EventScript_222265", + "script": "MossdeepCity_PokemonCenter_1F_EventScript_Girl", "flag": "0" } ], diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc index 02e8b33b4..49c31dc6b 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc @@ -7,7 +7,8 @@ MossdeepCity_PokemonCenter_1F_OnTransition: @ 822224A setrespawn HEAL_LOCATION_MOSSDEEP_CITY end -MossdeepCity_PokemonCenter_1F_EventScript_22224E:: @ 822224E +@ VAR_0x800B is the Nurse's object event id +MossdeepCity_PokemonCenter_1F_EventScript_Nurse:: @ 822224E setvar VAR_0x800B, 1 call Common_EventScript_PkmnCenterNurse waitmessage @@ -15,21 +16,21 @@ MossdeepCity_PokemonCenter_1F_EventScript_22224E:: @ 822224E release end -MossdeepCity_PokemonCenter_1F_EventScript_22225C:: @ 822225C - msgbox MossdeepCity_PokemonCenter_1F_Text_22226E, MSGBOX_NPC +MossdeepCity_PokemonCenter_1F_EventScript_Woman:: @ 822225C + msgbox MossdeepCity_PokemonCenter_1F_Text_GymLeaderDuoFormidable, MSGBOX_NPC end -MossdeepCity_PokemonCenter_1F_EventScript_222265:: @ 8222265 - msgbox MossdeepCity_PokemonCenter_1F_Text_2222D9, MSGBOX_NPC +MossdeepCity_PokemonCenter_1F_EventScript_Girl:: @ 8222265 + msgbox MossdeepCity_PokemonCenter_1F_Text_AbilitiesMightChangeMoves, MSGBOX_NPC end -MossdeepCity_PokemonCenter_1F_Text_22226E: @ 822226E +MossdeepCity_PokemonCenter_1F_Text_GymLeaderDuoFormidable: @ 822226E .string "The GYM LEADERS in this town are\n" .string "a formidable duo.\p" .string "Their combination attacks are, like,\n" .string "excellent and wow!$" -MossdeepCity_PokemonCenter_1F_Text_2222D9: @ 82222D9 +MossdeepCity_PokemonCenter_1F_Text_AbilitiesMightChangeMoves: @ 82222D9 .string "Depending on the special abilities of\n" .string "POKéMON, some moves might change\l" .string "or not work at all.$" diff --git a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc index 4e54cc8e4..df405376a 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc @@ -8,6 +8,7 @@ OldaleTown_PokemonCenter_1F_OnTransition: @ 81FC011 call Common_EventScript_UpdateBrineyLocation end +@ VAR_0x800B is the Nurse's object event id OldaleTown_PokemonCenter_1F_EventScript_Nurse:: @ 81FC01A setvar VAR_0x800B, 1 call Common_EventScript_PkmnCenterNurse diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/map.json b/data/maps/PacifidlogTown_PokemonCenter_1F/map.json index 83fdd1f79..dd5dfcb9c 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/map.json +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_PokemonCenter_1F_EventScript_2034B6", + "script": "PacifidlogTown_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_PokemonCenter_1F_EventScript_2034D6", + "script": "PacifidlogTown_PokemonCenter_1F_EventScript_OldMan", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_PokemonCenter_1F_EventScript_2034C4", + "script": "PacifidlogTown_PokemonCenter_1F_EventScript_Girl", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_PokemonCenter_1F_EventScript_2034CD", + "script": "PacifidlogTown_PokemonCenter_1F_EventScript_Woman", "flag": "0" }, { diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc index e51f6e89f..8b0f0805a 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc @@ -7,7 +7,8 @@ PacifidlogTown_PokemonCenter_1F_OnTransition: @ 82034B2 setrespawn HEAL_LOCATION_PACIFIDLOG_TOWN end -PacifidlogTown_PokemonCenter_1F_EventScript_2034B6:: @ 82034B6 +@ VAR_0x800B is the Nurse's object event id +PacifidlogTown_PokemonCenter_1F_EventScript_Nurse:: @ 82034B6 setvar VAR_0x800B, 1 call Common_EventScript_PkmnCenterNurse waitmessage @@ -15,29 +16,29 @@ PacifidlogTown_PokemonCenter_1F_EventScript_2034B6:: @ 82034B6 release end -PacifidlogTown_PokemonCenter_1F_EventScript_2034C4:: @ 82034C4 - msgbox PacifidlogTown_PokemonCenter_1F_Text_2034DF, MSGBOX_NPC +PacifidlogTown_PokemonCenter_1F_EventScript_Girl:: @ 82034C4 + msgbox PacifidlogTown_PokemonCenter_1F_Text_WhatColorTrainerCard, MSGBOX_NPC end -PacifidlogTown_PokemonCenter_1F_EventScript_2034CD:: @ 82034CD - msgbox PacifidlogTown_PokemonCenter_1F_Text_20350F, MSGBOX_NPC +PacifidlogTown_PokemonCenter_1F_EventScript_Woman:: @ 82034CD + msgbox PacifidlogTown_PokemonCenter_1F_Text_OnColonyOfCorsola, MSGBOX_NPC end -PacifidlogTown_PokemonCenter_1F_EventScript_2034D6:: @ 82034D6 - msgbox PacifidlogTown_PokemonCenter_1F_Text_20356F, MSGBOX_NPC +PacifidlogTown_PokemonCenter_1F_EventScript_OldMan:: @ 82034D6 + msgbox PacifidlogTown_PokemonCenter_1F_Text_AncestorsLivedOnBoats, MSGBOX_NPC end -PacifidlogTown_PokemonCenter_1F_Text_2034DF: @ 82034DF +PacifidlogTown_PokemonCenter_1F_Text_WhatColorTrainerCard: @ 82034DF .string "What color is your TRAINER CARD?\n" .string "Mine's copper!$" -PacifidlogTown_PokemonCenter_1F_Text_20350F: @ 820350F +PacifidlogTown_PokemonCenter_1F_Text_OnColonyOfCorsola: @ 820350F .string "PACIFIDLOG TOWN floats on top of\n" .string "a colony of CORSOLA.\p" .string "If I told you that, would you believe\n" .string "me?$" -PacifidlogTown_PokemonCenter_1F_Text_20356F: @ 820356F +PacifidlogTown_PokemonCenter_1F_Text_AncestorsLivedOnBoats: @ 820356F .string "The ancestors of the people in\n" .string "PACIFIDLOG were said to have been\l" .string "born on boats and then lived and died \l" diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc index 60b56837c..151cd8afb 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc @@ -8,6 +8,7 @@ PetalburgCity_PokemonCenter_1F_OnTransition: @ 82079F3 call Common_EventScript_UpdateBrineyLocation end +@ VAR_0x800B is the Nurse's object event id PetalburgCity_PokemonCenter_1F_EventScript_Nurse:: @ 82079FC setvar VAR_0x800B, 1 call Common_EventScript_PkmnCenterNurse diff --git a/data/maps/RustboroCity_PokemonCenter_1F/map.json b/data/maps/RustboroCity_PokemonCenter_1F/map.json index b91dd25ac..db28ddcf3 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/map.json +++ b/data/maps/RustboroCity_PokemonCenter_1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_PokemonCenter_1F_EventScript_214D76", + "script": "RustboroCity_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_PokemonCenter_1F_EventScript_214D84", + "script": "RustboroCity_PokemonCenter_1F_EventScript_Man", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_PokemonCenter_1F_EventScript_214D8D", + "script": "RustboroCity_PokemonCenter_1F_EventScript_Boy", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_PokemonCenter_1F_EventScript_214D96", + "script": "RustboroCity_PokemonCenter_1F_EventScript_Girl", "flag": "0" } ], diff --git a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc index 46555ba28..ca10592b0 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc @@ -8,7 +8,8 @@ RustboroCity_PokemonCenter_1F_OnTransition: @ 8214D6D call Common_EventScript_UpdateBrineyLocation end -RustboroCity_PokemonCenter_1F_EventScript_214D76:: @ 8214D76 +@ VAR_0x800B is the Nurse's object event id +RustboroCity_PokemonCenter_1F_EventScript_Nurse:: @ 8214D76 setvar VAR_0x800B, 1 call Common_EventScript_PkmnCenterNurse waitmessage @@ -16,31 +17,31 @@ RustboroCity_PokemonCenter_1F_EventScript_214D76:: @ 8214D76 release end -RustboroCity_PokemonCenter_1F_EventScript_214D84:: @ 8214D84 - msgbox RustboroCity_PokemonCenter_1F_Text_214D9F, MSGBOX_NPC +RustboroCity_PokemonCenter_1F_EventScript_Man:: @ 8214D84 + msgbox RustboroCity_PokemonCenter_1F_Text_PokemonHavePersonalities, MSGBOX_NPC end -RustboroCity_PokemonCenter_1F_EventScript_214D8D:: @ 8214D8D - msgbox RustboroCity_PokemonCenter_1F_Text_214E13, MSGBOX_NPC +RustboroCity_PokemonCenter_1F_EventScript_Boy:: @ 8214D8D + msgbox RustboroCity_PokemonCenter_1F_Text_MaleAndFemalePokemon, MSGBOX_NPC end -RustboroCity_PokemonCenter_1F_EventScript_214D96:: @ 8214D96 - msgbox RustboroCity_PokemonCenter_1F_Text_214E81, MSGBOX_NPC +RustboroCity_PokemonCenter_1F_EventScript_Girl:: @ 8214D96 + msgbox RustboroCity_PokemonCenter_1F_Text_HMCutNextDoor, MSGBOX_NPC end -RustboroCity_PokemonCenter_1F_Text_214D9F: @ 8214D9F +RustboroCity_PokemonCenter_1F_Text_PokemonHavePersonalities: @ 8214D9F .string "My POKéMON has a NAIVE nature, and my\n" .string "friend's has a JOLLY nature.\p" .string "It's fascinating how POKéMON have\n" .string "personalities!$" -RustboroCity_PokemonCenter_1F_Text_214E13: @ 8214E13 +RustboroCity_PokemonCenter_1F_Text_MaleAndFemalePokemon: @ 8214E13 .string "Just like people, there are male and\n" .string "female POKéMON.\p" .string "But no one seems to have any idea how\n" .string "they're different.$" -RustboroCity_PokemonCenter_1F_Text_214E81: @ 8214E81 +RustboroCity_PokemonCenter_1F_Text_HMCutNextDoor: @ 8214E81 .string "The man next door gave me an HM!\p" .string "I used it to teach my POKéMON how to\n" .string "CUT down skinny trees.$" diff --git a/data/maps/SlateportCity_PokemonCenter_1F/map.json b/data/maps/SlateportCity_PokemonCenter_1F/map.json index 3e87ae256..4f8cefda9 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/map.json +++ b/data/maps/SlateportCity_PokemonCenter_1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_PokemonCenter_1F_EventScript_20DAD3", + "script": "SlateportCity_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_PokemonCenter_1F_EventScript_20DAE1", + "script": "SlateportCity_PokemonCenter_1F_EventScript_Sailor", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_PokemonCenter_1F_EventScript_20DAEA", + "script": "SlateportCity_PokemonCenter_1F_EventScript_Woman", "flag": "0" } ], diff --git a/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc index f148e5d3f..ba4319cba 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc @@ -8,7 +8,8 @@ SlateportCity_PokemonCenter_1F_OnTransition: @ 820DACA call Common_EventScript_UpdateBrineyLocation end -SlateportCity_PokemonCenter_1F_EventScript_20DAD3:: @ 820DAD3 +@ VAR_0x800B is the Nurse's object event id +SlateportCity_PokemonCenter_1F_EventScript_Nurse:: @ 820DAD3 setvar VAR_0x800B, 1 call Common_EventScript_PkmnCenterNurse waitmessage @@ -16,15 +17,15 @@ SlateportCity_PokemonCenter_1F_EventScript_20DAD3:: @ 820DAD3 release end -SlateportCity_PokemonCenter_1F_EventScript_20DAE1:: @ 820DAE1 - msgbox SlateportCity_PokemonCenter_1F_Text_20DAF3, MSGBOX_NPC +SlateportCity_PokemonCenter_1F_EventScript_Sailor:: @ 820DAE1 + msgbox SlateportCity_PokemonCenter_1F_Text_RaiseDifferentTypesOfPokemon, MSGBOX_NPC end -SlateportCity_PokemonCenter_1F_EventScript_20DAEA:: @ 820DAEA - msgbox SlateportCity_PokemonCenter_1F_Text_20DBBC, MSGBOX_NPC +SlateportCity_PokemonCenter_1F_EventScript_Woman:: @ 820DAEA + msgbox SlateportCity_PokemonCenter_1F_Text_TradedMonWithFriend, MSGBOX_NPC end -SlateportCity_PokemonCenter_1F_Text_20DAF3: @ 820DAF3 +SlateportCity_PokemonCenter_1F_Text_RaiseDifferentTypesOfPokemon: @ 820DAF3 .string "Want a tip for battling?\p" .string "I'd say it's raising different kinds\n" .string "of POKéMON in a balanced manner.\p" @@ -33,7 +34,7 @@ SlateportCity_PokemonCenter_1F_Text_20DAF3: @ 820DAF3 .string "If it has a type disadvantage,\n" .string "it might not stand a chance.$" -SlateportCity_PokemonCenter_1F_Text_20DBBC: @ 820DBBC +SlateportCity_PokemonCenter_1F_Text_TradedMonWithFriend: @ 820DBBC .string "I trade POKéMON with my friends.\p" .string "If a traded POKéMON is holding an\n" .string "item, it makes me twice as happy!$" diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/map.json b/data/maps/SootopolisCity_PokemonCenter_1F/map.json index a2307dc10..4a5eec747 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/map.json +++ b/data/maps/SootopolisCity_PokemonCenter_1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SootopolisCity_PokemonCenter_1F_EventScript_226500", + "script": "SootopolisCity_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SootopolisCity_PokemonCenter_1F_EventScript_22650E", + "script": "SootopolisCity_PokemonCenter_1F_EventScript_Gentleman", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SootopolisCity_PokemonCenter_1F_EventScript_226538", + "script": "SootopolisCity_PokemonCenter_1F_EventScript_Woman", "flag": "0" }, { diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc index d2b546831..d8ff4e7f6 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc @@ -7,7 +7,8 @@ SootopolisCity_PokemonCenter_1F_OnTransition: @ 82264FC setrespawn HEAL_LOCATION_SOOTOPOLIS_CITY end -SootopolisCity_PokemonCenter_1F_EventScript_226500:: @ 8226500 +@ VAR_0x800B is the Nurse's object event id +SootopolisCity_PokemonCenter_1F_EventScript_Nurse:: @ 8226500 setvar VAR_0x800B, 1 call Common_EventScript_PkmnCenterNurse waitmessage @@ -15,37 +16,37 @@ SootopolisCity_PokemonCenter_1F_EventScript_226500:: @ 8226500 release end -SootopolisCity_PokemonCenter_1F_EventScript_22650E:: @ 822650E +SootopolisCity_PokemonCenter_1F_EventScript_Gentleman:: @ 822650E lock faceplayer compare VAR_SKY_PILLAR_STATE, 2 - goto_if_ge SootopolisCity_PokemonCenter_1F_EventScript_22652E - goto_if_unset FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_PokemonCenter_1F_EventScript_22652E - msgbox SootopolisCity_PokemonCenter_1F_Text_22664B, MSGBOX_DEFAULT + goto_if_ge SootopolisCity_PokemonCenter_1F_EventScript_GentlemanNoLegendaries + goto_if_unset FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_PokemonCenter_1F_EventScript_GentlemanNoLegendaries + msgbox SootopolisCity_PokemonCenter_1F_Text_EveryoneTakenRefuge, MSGBOX_DEFAULT release end -SootopolisCity_PokemonCenter_1F_EventScript_22652E:: @ 822652E - msgbox SootopolisCity_PokemonCenter_1F_Text_226562, MSGBOX_DEFAULT +SootopolisCity_PokemonCenter_1F_EventScript_GentlemanNoLegendaries:: @ 822652E + msgbox SootopolisCity_PokemonCenter_1F_Text_WallaceToughestInHoenn, MSGBOX_DEFAULT release end -SootopolisCity_PokemonCenter_1F_EventScript_226538:: @ 8226538 +SootopolisCity_PokemonCenter_1F_EventScript_Woman:: @ 8226538 lock faceplayer compare VAR_SKY_PILLAR_STATE, 2 - goto_if_ge SootopolisCity_PokemonCenter_1F_EventScript_226558 - goto_if_unset FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_PokemonCenter_1F_EventScript_226558 - msgbox SootopolisCity_PokemonCenter_1F_Text_22672F, MSGBOX_DEFAULT + goto_if_ge SootopolisCity_PokemonCenter_1F_EventScript_WomanNoLegendaries + goto_if_unset FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_PokemonCenter_1F_EventScript_WomanNoLegendaries + msgbox SootopolisCity_PokemonCenter_1F_Text_ArentPokemonOurFriends, MSGBOX_DEFAULT release end -SootopolisCity_PokemonCenter_1F_EventScript_226558:: @ 8226558 - msgbox SootopolisCity_PokemonCenter_1F_Text_2266B9, MSGBOX_DEFAULT +SootopolisCity_PokemonCenter_1F_EventScript_WomanNoLegendaries:: @ 8226558 + msgbox SootopolisCity_PokemonCenter_1F_Text_AlwaysBeFriendsWithPokemon, MSGBOX_DEFAULT release end -SootopolisCity_PokemonCenter_1F_Text_226562: @ 8226562 +SootopolisCity_PokemonCenter_1F_Text_WallaceToughestInHoenn: @ 8226562 .string "WALLACE is rumored to be the toughest\n" .string "TRAINER in the whole HOENN region.\p" .string "This town's GYM is led by the TRAINER\n" @@ -54,19 +55,19 @@ SootopolisCity_PokemonCenter_1F_Text_226562: @ 8226562 .string "even stronger than WALLACE's mentor.\p" .string "How strong could they be?$" -SootopolisCity_PokemonCenter_1F_Text_22664B: @ 822664B +SootopolisCity_PokemonCenter_1F_Text_EveryoneTakenRefuge: @ 822664B .string "Everyone in town has taken refuge\n" .string "and won't come out of their homes.\p" .string "Even I would rather not venture\n" .string "outside.$" -SootopolisCity_PokemonCenter_1F_Text_2266B9: @ 82266B9 +SootopolisCity_PokemonCenter_1F_Text_AlwaysBeFriendsWithPokemon: @ 82266B9 .string "Whenever, wherever, and whatever\n" .string "happens, I will always be friends with\l" .string "POKéMON.\p" .string "Because it's fun to be with POKéMON!$" -SootopolisCity_PokemonCenter_1F_Text_22672F: @ 822672F +SootopolisCity_PokemonCenter_1F_Text_ArentPokemonOurFriends: @ 822672F .string "Aren't POKéMON our friends?\p" .string "Why are they going wild this way?$" diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/map.json b/data/maps/VerdanturfTown_PokemonCenter_1F/map.json index c437aeece..056e82ed1 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/map.json +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "VerdanturfTown_PokemonCenter_1F_EventScript_20273A", + "script": "VerdanturfTown_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "VerdanturfTown_PokemonCenter_1F_EventScript_202748", + "script": "VerdanturfTown_PokemonCenter_1F_EventScript_Gentleman", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "VerdanturfTown_PokemonCenter_1F_EventScript_202751", + "script": "VerdanturfTown_PokemonCenter_1F_EventScript_ExpertM", "flag": "0" }, { diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc index 32cecf152..040e69a16 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc @@ -8,7 +8,8 @@ VerdanturfTown_PokemonCenter_1F_OnTransition: @ 8202731 call Common_EventScript_UpdateBrineyLocation end -VerdanturfTown_PokemonCenter_1F_EventScript_20273A:: @ 820273A +@ VAR_0x800B is the Nurse's object event id +VerdanturfTown_PokemonCenter_1F_EventScript_Nurse:: @ 820273A setvar VAR_0x800B, 1 call Common_EventScript_PkmnCenterNurse waitmessage @@ -16,15 +17,15 @@ VerdanturfTown_PokemonCenter_1F_EventScript_20273A:: @ 820273A release end -VerdanturfTown_PokemonCenter_1F_EventScript_202748:: @ 8202748 - msgbox VerdanturfTown_PokemonCenter_1F_Text_20275A, MSGBOX_NPC +VerdanturfTown_PokemonCenter_1F_EventScript_Gentleman:: @ 8202748 + msgbox VerdanturfTown_PokemonCenter_1F_Text_FaithInYourPokemon, MSGBOX_NPC end -VerdanturfTown_PokemonCenter_1F_EventScript_202751:: @ 8202751 - msgbox VerdanturfTown_PokemonCenter_1F_Text_20280B, MSGBOX_NPC +VerdanturfTown_PokemonCenter_1F_EventScript_ExpertM:: @ 8202751 + msgbox VerdanturfTown_PokemonCenter_1F_Text_VisitForBattleTent, MSGBOX_NPC end -VerdanturfTown_PokemonCenter_1F_Text_20275A: @ 820275A +VerdanturfTown_PokemonCenter_1F_Text_FaithInYourPokemon: @ 820275A .string "You can't consider yourself a real\n" .string "TRAINER if you don't have faith\l" .string "in your POKéMON.\p" @@ -32,7 +33,7 @@ VerdanturfTown_PokemonCenter_1F_Text_20275A: @ 820275A .string "in their battling POKéMON can win\l" .string "through to the very end.$" -VerdanturfTown_PokemonCenter_1F_Text_20280B: @ 820280B +VerdanturfTown_PokemonCenter_1F_Text_VisitForBattleTent: @ 820280B .string "The reason why anyone would visit\n" .string "VERDANTURF…\p" .string "It's the BATTLE TENT. It goes without\n" |