diff options
Diffstat (limited to 'data/maps')
110 files changed, 3310 insertions, 3306 deletions
diff --git a/data/maps/BattleFrontier_OutsideEast/map.json b/data/maps/BattleFrontier_OutsideEast/map.json index 341b20321..e45e4f13b 100644 --- a/data/maps/BattleFrontier_OutsideEast/map.json +++ b/data/maps/BattleFrontier_OutsideEast/map.json @@ -199,7 +199,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "BattleFrontier_OutsideEast_EventScript_242CEA", + "script": "BattleFrontier_OutsideEast_EventScript_Sudowoodo", "flag": "FLAG_HIDE_BATTLE_FRONTIER_SUDOWOODO" }, { diff --git a/data/maps/BattleFrontier_OutsideEast/scripts.inc b/data/maps/BattleFrontier_OutsideEast/scripts.inc index 5170716d7..ab968b6dd 100644 --- a/data/maps/BattleFrontier_OutsideEast/scripts.inc +++ b/data/maps/BattleFrontier_OutsideEast/scripts.inc @@ -102,24 +102,24 @@ BattleFrontier_OutsideEast_EventScript_242CE1:: @ 8242CE1 msgbox BattleFrontier_OutsideEast_Text_243230, MSGBOX_NPC end -BattleFrontier_OutsideEast_EventScript_242CEA:: @ 8242CEA +BattleFrontier_OutsideEast_EventScript_Sudowoodo:: @ 8242CEA lock faceplayer waitse playse 269 - applymovement 14, BattleFrontier_OutsideEast_Movement_242D69 + applymovement 14, BattleFrontier_OutsideEast_Movement_SudowoodoShake waitmovement 0 release end -BattleFrontier_OutsideEast_EventScript_242CFC:: @ 8242CFC +BattleFrontier_OutsideEast_EventScript_WaterSudowoodo:: @ 8242CFC lock faceplayer special DoWateringBerryTreeAnim waitstate waitse - playse 269 - applymovement 14, BattleFrontier_OutsideEast_Movement_242D69 + playse SE_USSOKI + applymovement 14, BattleFrontier_OutsideEast_Movement_SudowoodoShake waitmovement 0 msgbox gText_Sudowoodo_Attacked, MSGBOX_DEFAULT closemessage @@ -127,28 +127,28 @@ BattleFrontier_OutsideEast_EventScript_242CFC:: @ 8242CFC playmoncry SPECIES_SUDOWOODO, 2 delay 40 waitmoncry - setvar VAR_LAST_TALKED, 14 + setvar VAR_LAST_TALKED, 14 @ Sudowoodo object event id setwildbattle SPECIES_SUDOWOODO, 40, ITEM_NONE setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON - goto_if_eq BattleFrontier_OutsideEast_EventScript_242D60 + goto_if_eq BattleFrontier_OutsideEast_EventScript_RemoveSudowoodo compare VAR_RESULT, B_OUTCOME_RAN - goto_if_eq BattleFrontier_OutsideEast_EventScript_242D60 + goto_if_eq BattleFrontier_OutsideEast_EventScript_RemoveSudowoodo compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED - goto_if_eq BattleFrontier_OutsideEast_EventScript_242D60 + goto_if_eq BattleFrontier_OutsideEast_EventScript_RemoveSudowoodo setflag FLAG_DEFEATED_SUDOWOODO release end -BattleFrontier_OutsideEast_EventScript_242D60:: @ 8242D60 +BattleFrontier_OutsideEast_EventScript_RemoveSudowoodo:: @ 8242D60 setflag FLAG_DEFEATED_SUDOWOODO goto Common_EventScript_RemoveStaticPokemon end -BattleFrontier_OutsideEast_Movement_242D69: @ 8242D69 +BattleFrontier_OutsideEast_Movement_SudowoodoShake: @ 8242D69 face_right delay_8 face_down diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc index ac0155df9..862d91bf3 100644 --- a/data/maps/DewfordTown/scripts.inc +++ b/data/maps/DewfordTown/scripts.inc @@ -115,7 +115,7 @@ DewfordTown_EventScript_1E9656:: @ 81E9656 end DewfordTown_EventScript_1E9660:: @ 81E9660 - call DewfordTown_EventScript_271E95 + call EventScript_BackupMrBrineyLocation setobjectpriority 2, MAP_DEWFORD_TOWN, 0 setobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN, 0 applymovement 2, DewfordTown_Movement_1E991D @@ -147,7 +147,7 @@ DewfordTown_EventScript_1E9660:: @ 81E9660 end DewfordTown_EventScript_1E96E7:: @ 81E96E7 - call DewfordTown_EventScript_271E95 + call EventScript_BackupMrBrineyLocation setobjectpriority 2, MAP_DEWFORD_TOWN, 0 setobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN, 1 applymovement 2, DewfordTown_Movement_1E991D @@ -169,7 +169,7 @@ DewfordTown_EventScript_1E96E7:: @ 81E96E7 setobjectpriority 2, MAP_ROUTE109, 0 applymovement 2, DewfordTown_Movement_1E991F waitmovement 0 - clearflag FLAG_HIDE_ROUTE_108_MR_BRINEY + clearflag FLAG_HIDE_ROUTE_109_MR_BRINEY addobject 1 clearflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN @@ -185,11 +185,11 @@ DewfordTown_EventScript_1E96E7:: @ 81E96E7 end DewfordTown_EventScript_1E9790:: @ 81E9790 - msgbox DewfordTown_Text_1EEC1D, MSGBOX_DEFAULT + msgbox DewfordTown_Text_BrineyLandedInSlateportDeliverGoods, MSGBOX_DEFAULT return DewfordTown_EventScript_1E9799:: @ 81E9799 - msgbox DewfordTown_Text_1EEDA7, MSGBOX_DEFAULT + msgbox DewfordTown_Text_BrineyLandedInSlateport, MSGBOX_DEFAULT return DewfordTown_Movement_1E97A2: @ 81E97A2 @@ -654,7 +654,7 @@ DewfordTown_Text_1E9A7F: @ 81E9A7F .string "DEWFORD HALL\n" .string "“Everyone's information exchange!”$" -Route104_Text_1E9AAF: @ 81E9AAF +Route104_Text_LandedInDewfordDeliverLetter: @ 81E9AAF .string "MR. BRINEY: Ahoy!\n" .string "We've hit land in DEWFORD.\p" .string "I suppose you're off to deliver that\n" @@ -675,8 +675,7 @@ DewfordTown_Text_1E9BD9: @ 81E9BD9 .string "MR. BRINEY: Then you go on and deliver\n" .string "the LETTER. I'll be waiting.$" -Route104_Text_1E9C1D: @ 81E9C1D -Route109_Text_1E9C1D: @ 81E9C1D +DewfordTown_Text_BrineyLandedInDewford: @ 81E9C1D .string "MR. BRINEY: Ahoy!\n" .string "We've hit land in DEWFORD!\p" .string "You just go on and tell me whenever\n" diff --git a/data/maps/FortreeCity/scripts.inc b/data/maps/FortreeCity/scripts.inc index a36031664..34853336d 100644 --- a/data/maps/FortreeCity/scripts.inc +++ b/data/maps/FortreeCity/scripts.inc @@ -8,7 +8,7 @@ FortreeCity_OnTransition: @ 81E25AF end FortreeCity_MapScript1_1E25B3: @ 81E25B3 - setstepcallback 2 + setstepcallback STEP_CB_FORTREE_BRIDGE end FortreeCity_EventScript_1E25B6:: @ 81E25B6 diff --git a/data/maps/FortreeCity_Gym/map.json b/data/maps/FortreeCity_Gym/map.json index f985b2ce4..7b17c58c0 100644 --- a/data/maps/FortreeCity_Gym/map.json +++ b/data/maps/FortreeCity_Gym/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_Gym_EventScript_2165C8", + "script": "FortreeCity_Gym_EventScript_Winona", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "FortreeCity_Gym_EventScript_2166A8", + "script": "FortreeCity_Gym_EventScript_Jared", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "FortreeCity_Gym_EventScript_2166D6", + "script": "FortreeCity_Gym_EventScript_Flint", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "FortreeCity_Gym_EventScript_2166ED", + "script": "FortreeCity_Gym_EventScript_Ashley", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "FortreeCity_Gym_EventScript_2166BF", + "script": "FortreeCity_Gym_EventScript_Edwardo", "flag": "0" }, { @@ -89,7 +89,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_Gym_EventScript_216732", + "script": "FortreeCity_Gym_EventScript_GymGuide", "flag": "0" }, { @@ -102,7 +102,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "FortreeCity_Gym_EventScript_216704", + "script": "FortreeCity_Gym_EventScript_Humberto", "flag": "0" }, { @@ -115,7 +115,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "FortreeCity_Gym_EventScript_21671B", + "script": "FortreeCity_Gym_EventScript_Darius", "flag": "0" } ], @@ -143,7 +143,7 @@ "y": 21, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "FortreeCity_Gym_EventScript_216751" + "script": "FortreeCity_Gym_EventScript_LeftGymStatue" }, { "type": "sign", @@ -151,7 +151,7 @@ "y": 21, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "FortreeCity_Gym_EventScript_216761" + "script": "FortreeCity_Gym_EventScript_RightGymStatue" } ] }
\ No newline at end of file diff --git a/data/maps/FortreeCity_Gym/scripts.inc b/data/maps/FortreeCity_Gym/scripts.inc index 59ca317a7..0b0008d53 100644 --- a/data/maps/FortreeCity_Gym/scripts.inc +++ b/data/maps/FortreeCity_Gym/scripts.inc @@ -1,44 +1,44 @@ FortreeCity_Gym_MapScripts:: @ 82165AB map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_Gym_OnTransition - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FortreeCity_Gym_MapScript2_2165BA + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FortreeCity_Gym_OnWarp .byte 0 FortreeCity_Gym_OnTransition: @ 82165B6 special RotatingGate_InitPuzzle end -FortreeCity_Gym_MapScript2_2165BA: @ 82165BA - map_script_2 VAR_TEMP_0, 16384, FortreeCity_Gym_EventScript_2165C4 +FortreeCity_Gym_OnWarp: @ 82165BA + map_script_2 VAR_TEMP_0, VAR_TEMP_0, FortreeCity_Gym_EventScript_InitRotatingGates .2byte 0 -FortreeCity_Gym_EventScript_2165C4:: @ 82165C4 +FortreeCity_Gym_EventScript_InitRotatingGates:: @ 82165C4 special RotatingGate_InitPuzzleAndGraphics end -FortreeCity_Gym_EventScript_2165C8:: @ 82165C8 - trainerbattle_single TRAINER_WINONA_1, FortreeCity_Gym_Text_216D75, FortreeCity_Gym_Text_216E60, FortreeCity_Gym_EventScript_2165FD, NO_MUSIC +FortreeCity_Gym_EventScript_Winona:: @ 82165C8 + trainerbattle_single TRAINER_WINONA_1, FortreeCity_Gym_Text_WinonaPreBattle, FortreeCity_Gym_Text_WinonaDefeat, FortreeCity_Gym_EventScript_WinonaDefeated, NO_MUSIC specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq FortreeCity_Gym_EventScript_21668D - goto_if_unset FLAG_RECEIVED_TM40, FortreeCity_Gym_EventScript_216646 - msgbox FortreeCity_Gym_Text_217071, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq FortreeCity_Gym_EventScript_WinonaRematch + goto_if_unset FLAG_RECEIVED_TM40, FortreeCity_Gym_EventScript_GiveAerialAce2 + msgbox FortreeCity_Gym_Text_WinonaPostBattle, MSGBOX_DEFAULT release end -FortreeCity_Gym_EventScript_2165FD:: @ 82165FD - message FortreeCity_Gym_Text_216EEC +FortreeCity_Gym_EventScript_WinonaDefeated:: @ 82165FD + message FortreeCity_Gym_Text_ReceivedFeatherBadge waitmessage call Common_EventScript_PlayGymBadgeFanfare - msgbox FortreeCity_Gym_Text_216F17, MSGBOX_DEFAULT + msgbox FortreeCity_Gym_Text_ExplainFeatherBadgeTakeThis, MSGBOX_DEFAULT setflag FLAG_DEFEATED_FORTREE_GYM setflag FLAG_BADGE06_GET setvar VAR_0x8008, 6 call Common_EventScript_SetGymTrainers - call FortreeCity_Gym_EventScript_21666A + call FortreeCity_Gym_EventScript_GiveAerialAce closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox FortreeCity_Gym_Text_217044, MSGBOX_DEFAULT + msgbox FortreeCity_Gym_Text_RegisteredWinona, MSGBOX_DEFAULT waitfanfare closemessage delay 30 @@ -48,94 +48,94 @@ FortreeCity_Gym_EventScript_2165FD:: @ 82165FD release end -FortreeCity_Gym_EventScript_216646:: @ 8216646 +FortreeCity_Gym_EventScript_GiveAerialAce2:: @ 8216646 giveitem_std ITEM_TM40 compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull - msgbox FortreeCity_Gym_Text_216FEC, MSGBOX_DEFAULT + msgbox FortreeCity_Gym_Text_ExplainAerialAce, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM40 release end -FortreeCity_Gym_EventScript_21666A:: @ 821666A +FortreeCity_Gym_EventScript_GiveAerialAce:: @ 821666A giveitem_std ITEM_TM40 compare VAR_RESULT, 0 goto_if_eq Common_EventScript_BagIsFull - msgbox FortreeCity_Gym_Text_216FEC, MSGBOX_DEFAULT + msgbox FortreeCity_Gym_Text_ExplainAerialAce, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM40 return -FortreeCity_Gym_EventScript_21668D:: @ 821668D - trainerbattle_rematch_double TRAINER_WINONA_1, FortreeCity_Gym_Text_217100, FortreeCity_Gym_Text_2171E6, FortreeCity_Gym_Text_217292 - msgbox FortreeCity_Gym_Text_21720B, MSGBOX_AUTOCLOSE +FortreeCity_Gym_EventScript_WinonaRematch:: @ 821668D + trainerbattle_rematch_double TRAINER_WINONA_1, FortreeCity_Gym_Text_WinonaPreRematch, FortreeCity_Gym_Text_WinonaRematchDefeat, FortreeCity_Gym_Text_WinonaRematchNeedTwoMons + msgbox FortreeCity_Gym_Text_WinonaPostRematch, MSGBOX_AUTOCLOSE end -FortreeCity_Gym_EventScript_2166A8:: @ 82166A8 - trainerbattle_single TRAINER_JARED, FortreeCity_Gym_Text_2168A2, FortreeCity_Gym_Text_2168D3 - msgbox FortreeCity_Gym_Text_2168E7, MSGBOX_AUTOCLOSE +FortreeCity_Gym_EventScript_Jared:: @ 82166A8 + trainerbattle_single TRAINER_JARED, FortreeCity_Gym_Text_JaredPreBattle, FortreeCity_Gym_Text_JaredDefeat + msgbox FortreeCity_Gym_Text_JaredPostBattle, MSGBOX_AUTOCLOSE end -FortreeCity_Gym_EventScript_2166BF:: @ 82166BF - trainerbattle_single TRAINER_EDWARDO, FortreeCity_Gym_Text_21695A, FortreeCity_Gym_Text_2169C7 - msgbox FortreeCity_Gym_Text_2169F1, MSGBOX_AUTOCLOSE +FortreeCity_Gym_EventScript_Edwardo:: @ 82166BF + trainerbattle_single TRAINER_EDWARDO, FortreeCity_Gym_Text_EdwardoPreBattle, FortreeCity_Gym_Text_EdwardoDefeat + msgbox FortreeCity_Gym_Text_EdwardoPostBattle, MSGBOX_AUTOCLOSE end -FortreeCity_Gym_EventScript_2166D6:: @ 82166D6 - trainerbattle_single TRAINER_FLINT, FortreeCity_Gym_Text_216A66, FortreeCity_Gym_Text_216AC4 - msgbox FortreeCity_Gym_Text_216AD7, MSGBOX_AUTOCLOSE +FortreeCity_Gym_EventScript_Flint:: @ 82166D6 + trainerbattle_single TRAINER_FLINT, FortreeCity_Gym_Text_FlintPreBattle, FortreeCity_Gym_Text_FlintDefeat + msgbox FortreeCity_Gym_Text_FlintPostBattle, MSGBOX_AUTOCLOSE end -FortreeCity_Gym_EventScript_2166ED:: @ 82166ED - trainerbattle_single TRAINER_ASHLEY, FortreeCity_Gym_Text_216B1A, FortreeCity_Gym_Text_216B51 - msgbox FortreeCity_Gym_Text_216B5F, MSGBOX_AUTOCLOSE +FortreeCity_Gym_EventScript_Ashley:: @ 82166ED + trainerbattle_single TRAINER_ASHLEY, FortreeCity_Gym_Text_AshleyPreBattle, FortreeCity_Gym_Text_AshleyDefeat + msgbox FortreeCity_Gym_Text_AshleyPostBattle, MSGBOX_AUTOCLOSE end -FortreeCity_Gym_EventScript_216704:: @ 8216704 - trainerbattle_single TRAINER_HUMBERTO, FortreeCity_Gym_Text_216B9E, FortreeCity_Gym_Text_216C18 - msgbox FortreeCity_Gym_Text_216C32, MSGBOX_AUTOCLOSE +FortreeCity_Gym_EventScript_Humberto:: @ 8216704 + trainerbattle_single TRAINER_HUMBERTO, FortreeCity_Gym_Text_HumbertoPreBattle, FortreeCity_Gym_Text_HumbertoDefeat + msgbox FortreeCity_Gym_Text_HumbertoPostBattle, MSGBOX_AUTOCLOSE end -FortreeCity_Gym_EventScript_21671B:: @ 821671B - trainerbattle_single TRAINER_DARIUS, FortreeCity_Gym_Text_216C96, FortreeCity_Gym_Text_216CF2 - msgbox FortreeCity_Gym_Text_216D0F, MSGBOX_AUTOCLOSE +FortreeCity_Gym_EventScript_Darius:: @ 821671B + trainerbattle_single TRAINER_DARIUS, FortreeCity_Gym_Text_DariusPreBattle, FortreeCity_Gym_Text_DariusDefeat + msgbox FortreeCity_Gym_Text_DariusPostBattle, MSGBOX_AUTOCLOSE end -FortreeCity_Gym_EventScript_216732:: @ 8216732 +FortreeCity_Gym_EventScript_GymGuide:: @ 8216732 lock faceplayer - goto_if_set FLAG_DEFEATED_FORTREE_GYM, FortreeCity_Gym_EventScript_216747 - msgbox FortreeCity_Gym_Text_216785, MSGBOX_DEFAULT + goto_if_set FLAG_DEFEATED_FORTREE_GYM, FortreeCity_Gym_EventScript_GymGuidePostVictory + msgbox FortreeCity_Gym_Text_GymGuideAdvice, MSGBOX_DEFAULT release end -FortreeCity_Gym_EventScript_216747:: @ 8216747 - msgbox FortreeCity_Gym_Text_21687D, MSGBOX_DEFAULT +FortreeCity_Gym_EventScript_GymGuidePostVictory:: @ 8216747 + msgbox FortreeCity_Gym_Text_GymGuidePostVictory, MSGBOX_DEFAULT release end -FortreeCity_Gym_EventScript_216751:: @ 8216751 +FortreeCity_Gym_EventScript_LeftGymStatue:: @ 8216751 lockall - goto_if_set FLAG_BADGE06_GET, FortreeCity_Gym_EventScript_216771 - goto FortreeCity_Gym_EventScript_21677B + goto_if_set FLAG_BADGE06_GET, FortreeCity_Gym_EventScript_GymStatueCertified + goto FortreeCity_Gym_EventScript_GymStatue end -FortreeCity_Gym_EventScript_216761:: @ 8216761 +FortreeCity_Gym_EventScript_RightGymStatue:: @ 8216761 lockall - goto_if_set FLAG_BADGE06_GET, FortreeCity_Gym_EventScript_216771 - goto FortreeCity_Gym_EventScript_21677B + goto_if_set FLAG_BADGE06_GET, FortreeCity_Gym_EventScript_GymStatueCertified + goto FortreeCity_Gym_EventScript_GymStatue end -FortreeCity_Gym_EventScript_216771:: @ 8216771 - msgbox FortreeCity_Gym_Text_2170C7, MSGBOX_DEFAULT +FortreeCity_Gym_EventScript_GymStatueCertified:: @ 8216771 + msgbox FortreeCity_Gym_Text_GymStatueCertified, MSGBOX_DEFAULT releaseall end -FortreeCity_Gym_EventScript_21677B:: @ 821677B - msgbox FortreeCity_Gym_Text_2170AE, MSGBOX_DEFAULT +FortreeCity_Gym_EventScript_GymStatue:: @ 821677B + msgbox FortreeCity_Gym_Text_GymStatue, MSGBOX_DEFAULT releaseall end -FortreeCity_Gym_Text_216785: @ 8216785 +FortreeCity_Gym_Text_GymGuideAdvice: @ 8216785 .string "Yo, how's it going, CHAMPION-\n" .string "bound {PLAYER}?\p" .string "FORTREE GYM LEADER WINONA is\n" @@ -146,94 +146,94 @@ FortreeCity_Gym_Text_216785: @ 8216785 .string "who are trying to take wing!\p" .string "Okay, go for it!$" -FortreeCity_Gym_Text_21687D: @ 821687D +FortreeCity_Gym_Text_GymGuidePostVictory: @ 821687D .string "You did it!\n" .string "You've achieved liftoff!$" -FortreeCity_Gym_Text_2168A2: @ 82168A2 +FortreeCity_Gym_Text_JaredPreBattle: @ 82168A2 .string "Behold the elegant battle style of\n" .string "BIRD POKéMON!$" -FortreeCity_Gym_Text_2168D3: @ 82168D3 +FortreeCity_Gym_Text_JaredDefeat: @ 82168D3 .string "You…\n" .string "You're strong…$" -FortreeCity_Gym_Text_2168E7: @ 82168E7 +FortreeCity_Gym_Text_JaredPostBattle: @ 82168E7 .string "A TRAINER has to be smart to keep\n" .string "up with unexpected turns of events.\p" .string "Do you have the smarts to get to\n" .string "our LEADER?$" -FortreeCity_Gym_Text_21695A: @ 821695A +FortreeCity_Gym_Text_EdwardoPreBattle: @ 821695A .string "The lovers of BIRD POKéMON aspire\n" .string "to join this GYM.\p" .string "As a member of the FORTREE GYM,\n" .string "I'm not allowed to lose!$" -FortreeCity_Gym_Text_2169C7: @ 82169C7 +FortreeCity_Gym_Text_EdwardoDefeat: @ 82169C7 .string "It was too much of a load for me\n" .string "to bear…$" -FortreeCity_Gym_Text_2169F1: @ 82169F1 +FortreeCity_Gym_Text_EdwardoPostBattle: @ 82169F1 .string "The world is huge, and there are\n" .string "countless tough TRAINERS.\p" .string "I'm going to keep training and make\n" .string "myself even stronger.$" -FortreeCity_Gym_Text_216A66: @ 8216A66 +FortreeCity_Gym_Text_FlintPreBattle: @ 8216A66 .string "There's no need for WINONA, our GYM\n" .string "LEADER, to deal with you!\p" .string "I'm plenty good enough for you!$" -FortreeCity_Gym_Text_216AC4: @ 8216AC4 +FortreeCity_Gym_Text_FlintDefeat: @ 8216AC4 .string "WINONA, I…\n" .string "I lost!$" -FortreeCity_Gym_Text_216AD7: @ 8216AD7 +FortreeCity_Gym_Text_FlintPostBattle: @ 8216AD7 .string "WINONA is cute and she's strong.\n" .string "She's the ultimate LEADER!\p" .string "Blush…$" -FortreeCity_Gym_Text_216B1A: @ 8216B1A +FortreeCity_Gym_Text_AshleyPreBattle: @ 8216B1A .string "WINONA taught me personally!\n" .string "You can't beat me easily!$" -FortreeCity_Gym_Text_216B51: @ 8216B51 +FortreeCity_Gym_Text_AshleyDefeat: @ 8216B51 .string "I was beaten…$" -FortreeCity_Gym_Text_216B5F: @ 8216B5F +FortreeCity_Gym_Text_AshleyPostBattle: @ 8216B5F .string "Thanks to WINONA, the people of\n" .string "FORTREE can live without fear.$" -FortreeCity_Gym_Text_216B9E: @ 8216B9E +FortreeCity_Gym_Text_HumbertoPreBattle: @ 8216B9E .string "When WINONA takes to battle, her face\n" .string "shines with beautiful determination…\p" .string "I'm not letting you witness that\n" .string "lovely sight!$" -FortreeCity_Gym_Text_216C18: @ 8216C18 +FortreeCity_Gym_Text_HumbertoDefeat: @ 8216C18 .string "Urk!\n" .string "I couldn't stop you.$" -FortreeCity_Gym_Text_216C32: @ 8216C32 +FortreeCity_Gym_Text_HumbertoPostBattle: @ 8216C32 .string "You'd better watch it!\n" .string "Don't get distracted staring at WINONA\l" .string "or you'll go crashing down in a heap!$" -FortreeCity_Gym_Text_216C96: @ 8216C96 +FortreeCity_Gym_Text_DariusPreBattle: @ 8216C96 .string "You'd better know that there are all\n" .string "sorts of FLYING-type POKéMON.\p" .string "You do know that, right?$" -FortreeCity_Gym_Text_216CF2: @ 8216CF2 +FortreeCity_Gym_Text_DariusDefeat: @ 8216CF2 .string "You seem to know your stuff!$" -FortreeCity_Gym_Text_216D0F: @ 8216D0F +FortreeCity_Gym_Text_DariusPostBattle: @ 8216D0F .string "Sure, you beat me all right.\n" .string "But you'd better watch it! Our LEADER\l" .string "WINONA's POKéMON are all business.$" -FortreeCity_Gym_Text_216D75: @ 8216D75 +FortreeCity_Gym_Text_WinonaPreBattle: @ 8216D75 .string "I am WINONA. I am the LEADER of\n" .string "the FORTREE POKéMON GYM.\p" .string "I have become one with BIRD POKéMON\n" @@ -243,18 +243,18 @@ FortreeCity_Gym_Text_216D75: @ 8216D75 .string "Witness the elegant choreography\n" .string "of BIRD POKéMON and I!$" -FortreeCity_Gym_Text_216E60: @ 8216E60 +FortreeCity_Gym_Text_WinonaDefeat: @ 8216E60 .string "Never before have I seen a TRAINER\n" .string "command POKéMON with more grace\l" .string "than I…\p" .string "In recognition of your prowess,\n" .string "I present to you this GYM BADGE.$" -FortreeCity_Gym_Text_216EEC: @ 8216EEC +FortreeCity_Gym_Text_ReceivedFeatherBadge: @ 8216EEC .string "{PLAYER} received the FEATHER BADGE\n" .string "from WINONA.$" -FortreeCity_Gym_Text_216F17: @ 8216F17 +FortreeCity_Gym_Text_ExplainFeatherBadgeTakeThis: @ 8216F17 .string "With the FEATHER BADGE, all POKéMON up\n" .string "to LV 70, even those received through\l" .string "trades, will obey your every command.\p" @@ -263,29 +263,29 @@ FortreeCity_Gym_Text_216F17: @ 8216F17 .string "And this…\n" .string "This is a gift from me.$" -FortreeCity_Gym_Text_216FEC: @ 8216FEC +FortreeCity_Gym_Text_ExplainAerialAce: @ 8216FEC .string "TM40 contains AERIAL ACE.\p" .string "Its speed…\n" .string "No POKéMON should be able to avoid it.\p" .string "… … … … … …$" -FortreeCity_Gym_Text_217044: @ 8217044 +FortreeCity_Gym_Text_RegisteredWinona: @ 8217044 .string "Registered GYM LEADER WINONA\n" .string "in the POKéNAV.$" -FortreeCity_Gym_Text_217071: @ 8217071 +FortreeCity_Gym_Text_WinonaPostBattle: @ 8217071 .string "Though I fell to you, I will remain\n" .string "devoted to BIRD POKéMON.$" -FortreeCity_Gym_Text_2170AE: @ 82170AE +FortreeCity_Gym_Text_GymStatue: @ 82170AE .string "FORTREE CITY POKéMON GYM$" -FortreeCity_Gym_Text_2170C7: @ 82170C7 +FortreeCity_Gym_Text_GymStatueCertified: @ 82170C7 .string "FORTREE CITY POKéMON GYM\p" .string "WINONA'S CERTIFIED TRAINERS:\n" .string "{PLAYER}$" -FortreeCity_Gym_Text_217100: @ 8217100 +FortreeCity_Gym_Text_WinonaPreRematch: @ 8217100 .string "WINONA: We humans can never escape\n" .string "gravity's pull on the ground.\p" .string "But by striving for excellence,\n" @@ -295,17 +295,17 @@ FortreeCity_Gym_Text_217100: @ 8217100 .string "Please, allow me to see your power\n" .string "at full flight!$" -FortreeCity_Gym_Text_2171E6: @ 82171E6 +FortreeCity_Gym_Text_WinonaRematchDefeat: @ 82171E6 .string "I failed to reach your height again…$" -FortreeCity_Gym_Text_21720B: @ 821720B +FortreeCity_Gym_Text_WinonaPostRematch: @ 821720B .string "WINONA: Even though I have lost,\n" .string "the wings of my heart remain unbroken.\p" .string "I can rise and soar again and\n" .string "yet again.\p" .string "I am convinced of it!$" -FortreeCity_Gym_Text_217292: @ 8217292 +FortreeCity_Gym_Text_WinonaRematchNeedTwoMons: @ 8217292 .string "WINONA: We humans can never escape\n" .string "gravity's pull on the ground.\p" .string "But by striving for excellence,\n" diff --git a/data/maps/GraniteCave_B1F/scripts.inc b/data/maps/GraniteCave_B1F/scripts.inc index afd77cf10..f465b0694 100644 --- a/data/maps/GraniteCave_B1F/scripts.inc +++ b/data/maps/GraniteCave_B1F/scripts.inc @@ -5,7 +5,7 @@ GraniteCave_B1F_MapScripts:: @ 822DC5E .byte 0 GraniteCave_B1F_SetHoleWarp: @ 822DC6E - setstepcallback 7 + setstepcallback STEP_CB_CRACKED_FLOOR setholewarp MAP_GRANITE_CAVE_B2F, 255, 0, 0 end diff --git a/data/maps/InsideOfTruck/scripts.inc b/data/maps/InsideOfTruck/scripts.inc index 043c8a8d8..9573fe745 100644 --- a/data/maps/InsideOfTruck/scripts.inc +++ b/data/maps/InsideOfTruck/scripts.inc @@ -10,7 +10,7 @@ InsideOfTruck_MapScript1_23BEE5: @ 823BEE5 end InsideOfTruck_MapScript1_23BF01: @ 823BF01 - setstepcallback 5 + setstepcallback STEP_CB_TRUCK end InsideOfTruck_EventScript_23BF04:: @ 823BF04 diff --git a/data/maps/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc index 2a12ab5a2..62ef6e1a9 100644 --- a/data/maps/JaggedPass/scripts.inc +++ b/data/maps/JaggedPass/scripts.inc @@ -5,7 +5,7 @@ JaggedPass_MapScripts:: @ 8230656 .byte 0 JaggedPass_MapScript1_230666: @ 8230666 - setstepcallback 1 + setstepcallback STEP_CB_ASH compare VAR_JAGGED_PASS_STATE, 0 call_if_eq JaggedPass_EventScript_230674 end diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/map.json b/data/maps/LilycoveCity_PokemonCenter_1F/map.json index c5c0121f4..023717a59 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/map.json +++ b/data/maps/LilycoveCity_PokemonCenter_1F/map.json @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_PokemonCenter_1F_EventScript_2A836B", + "script": "LilycoveCity_PokemonCenter_1F_EventScript_LilycoveLady", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_PokemonCenter_1F_EventScript_2A89C7", + "script": "LilycoveCity_PokemonCenter_1F_EventScript_ContestLadyMon", "flag": "FLAG_HIDE_LILYCOVE_POKEMON_CENTER_LADY" } ], diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/map.json b/data/maps/LittlerootTown_BrendansHouse_1F/map.json index d6d4af86c..8b0c762f9 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/map.json +++ b/data/maps/LittlerootTown_BrendansHouse_1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LittlerootTown_BrendansHouse_1F_EventScript_2929C5", + "script": "PlayersHouse_1F_EventScript_Mom", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_MOM" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LittlerootTown_BrendansHouse_1F_EventScript_292ACD", + "script": "PlayersHouse_1F_EventScript_Vigoroth2", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LittlerootTown_BrendansHouse_1F_EventScript_292ABA", + "script": "PlayersHouse_1F_EventScript_Vigoroth1", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F89F3", + "script": "RivalsHouse_1F_EventScript_RivalMom", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_MOM" }, { @@ -89,7 +89,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F8A3D", + "script": "RivalsHouse_1F_EventScript_RivalSibling", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_SIBLING" }, { @@ -137,7 +137,7 @@ "elevation": 0, "var": "VAR_LITTLEROOT_INTRO_STATE", "var_value": "4", - "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F78A3" + "script": "LittlerootTown_BrendansHouse_1F_EventScript_GoSeeRoom" }, { "type": "trigger", @@ -146,7 +146,7 @@ "elevation": 0, "var": "VAR_LITTLEROOT_RIVAL_STATE", "var_value": "2", - "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F78BE" + "script": "LittlerootTown_BrendansHouse_1F_EventScript_MeetRival0" }, { "type": "trigger", @@ -155,7 +155,7 @@ "elevation": 0, "var": "VAR_LITTLEROOT_RIVAL_STATE", "var_value": "2", - "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F78CA" + "script": "LittlerootTown_BrendansHouse_1F_EventScript_MeetRival1" }, { "type": "trigger", @@ -164,7 +164,7 @@ "elevation": 0, "var": "VAR_LITTLEROOT_RIVAL_STATE", "var_value": "2", - "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F78D6" + "script": "LittlerootTown_BrendansHouse_1F_EventScript_MeetRival2" } ], "bg_events": [] diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc index 3d6284600..59c173cf9 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc @@ -1,93 +1,94 @@ LittlerootTown_BrendansHouse_1F_MapScripts:: @ 81F7755 - map_script MAP_SCRIPT_ON_LOAD, LittlerootTown_BrendansHouse_1F_MapScript1_1F7765 - map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_BrendansHouse_1F_MapScript1_1F77A4 - map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_BrendansHouse_1F_MapScript2_1F77EA + map_script MAP_SCRIPT_ON_LOAD, LittlerootTown_BrendansHouse_1F_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_BrendansHouse_1F_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_BrendansHouse_1F_OnFrame .byte 0 -LittlerootTown_BrendansHouse_1F_MapScript1_1F7765: @ 81F7765 +LittlerootTown_BrendansHouse_1F_OnLoad: @ 81F7765 compare VAR_LITTLEROOT_INTRO_STATE, 6 - call_if_lt LittlerootTown_BrendansHouse_1F_EventScript_1F777A - call_if_set FLAG_RECEIVED_RUNNING_SHOES, LittlerootTown_BrendansHouse_1F_EventScript_1F778D + call_if_lt LittlerootTown_BrendansHouse_1F_EventScript_SetMovingBoxes + call_if_set FLAG_RECEIVED_RUNNING_SHOES, LittlerootTown_BrendansHouse_1F_EventScript_CheckShowShoesManual end -LittlerootTown_BrendansHouse_1F_EventScript_1F777A:: @ 81F777A +LittlerootTown_BrendansHouse_1F_EventScript_SetMovingBoxes:: @ 81F777A setmetatile 5, 4, METATILE_BrendansMaysHouse_MovingBox_Open, 1 setmetatile 5, 2, METATILE_BrendansMaysHouse_MovingBox_Closed, 1 return -LittlerootTown_BrendansHouse_1F_EventScript_1F778D:: @ 81F778D +LittlerootTown_BrendansHouse_1F_EventScript_CheckShowShoesManual:: @ 81F778D checkplayergender compare VAR_RESULT, MALE - goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F779A + goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_ShowRunningShoesManual return -LittlerootTown_BrendansHouse_1F_EventScript_1F779A:: @ 81F779A +LittlerootTown_BrendansHouse_1F_EventScript_ShowRunningShoesManual:: @ 81F779A setmetatile 3, 7, METATILE_BrendansMaysHouse_BookOnTable, 1 return -LittlerootTown_BrendansHouse_1F_MapScript1_1F77A4: @ 81F77A4 +LittlerootTown_BrendansHouse_1F_OnTransition: @ 81F77A4 compare VAR_LITTLEROOT_INTRO_STATE, 3 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F77DE + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_MoveMomToDoor compare VAR_LITTLEROOT_INTRO_STATE, 5 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F77C6 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_MoveMomToStairs compare VAR_LITTLEROOT_INTRO_STATE, 6 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F77D2 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_MoveMomToTV end -LittlerootTown_BrendansHouse_1F_EventScript_1F77C6:: @ 81F77C6 +LittlerootTown_BrendansHouse_1F_EventScript_MoveMomToStairs:: @ 81F77C6 setobjectxyperm 1, 8, 4 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP return -LittlerootTown_BrendansHouse_1F_EventScript_1F77D2:: @ 81F77D2 +LittlerootTown_BrendansHouse_1F_EventScript_MoveMomToTV:: @ 81F77D2 setobjectxyperm 1, 4, 5 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP return -LittlerootTown_BrendansHouse_1F_EventScript_1F77DE:: @ 81F77DE +LittlerootTown_BrendansHouse_1F_EventScript_MoveMomToDoor:: @ 81F77DE setobjectxyperm 1, 9, 8 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP return -LittlerootTown_BrendansHouse_1F_MapScript2_1F77EA: @ 81F77EA - map_script_2 VAR_LITTLEROOT_INTRO_STATE, 3, LittlerootTown_BrendansHouse_1F_EventScript_1F783C - map_script_2 VAR_LITTLEROOT_INTRO_STATE, 5, LittlerootTown_BrendansHouse_1F_EventScript_1F7814 - map_script_2 VAR_LITTLEROOT_INTRO_STATE, 6, LittlerootTown_BrendansHouse_1F_EventScript_1F784D - map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 1, LittlerootTown_BrendansHouse_1F_EventScript_1F785E - map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 3, LittlerootTown_BrendansHouse_1F_EventScript_292AF2 +@ Many of the below scripts have no gender check because they assume youre in the correct house +LittlerootTown_BrendansHouse_1F_OnFrame: @ 81F77EA + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 3, LittlerootTown_BrendansHouse_1F_EventScript_EnterHouseMovingIn + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 5, LittlerootTown_BrendansHouse_1F_EventScript_GoUpstairsToSetClock + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 6, LittlerootTown_BrendansHouse_1F_EventScript_PetalburgGymReport + map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 1, LittlerootTown_BrendansHouse_1F_EventScript_YoureNewNeighbor + map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 3, PlayersHouse_1F_EventScript_GetSSTicketAndSeeLatiTV .2byte 0 -LittlerootTown_BrendansHouse_1F_EventScript_1F7814:: @ 81F7814 +LittlerootTown_BrendansHouse_1F_EventScript_GoUpstairsToSetClock:: @ 81F7814 lockall - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7B67, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_GoSetTheClock, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1F783A - applymovement 1, LittlerootTown_BrendansHouse_1F_Movement_1F783A + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_PushTowardStairs + applymovement 1, LittlerootTown_BrendansHouse_1F_Movement_PushTowardStairs waitmovement 0 warp MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F, 255, 7, 1 waitstate releaseall end -LittlerootTown_BrendansHouse_1F_Movement_1F783A: @ 81F783A +LittlerootTown_BrendansHouse_1F_Movement_PushTowardStairs: @ 81F783A walk_up step_end -LittlerootTown_BrendansHouse_1F_EventScript_1F783C:: @ 81F783C +LittlerootTown_BrendansHouse_1F_EventScript_EnterHouseMovingIn:: @ 81F783C lockall setvar VAR_0x8004, 1 - setvar VAR_0x8005, 0 - goto LittlerootTown_BrendansHouse_1F_EventScript_292704 + setvar VAR_0x8005, MALE + goto PlayersHouse_1F_EventScript_EnterHouseMovingIn end -LittlerootTown_BrendansHouse_1F_EventScript_1F784D:: @ 81F784D +LittlerootTown_BrendansHouse_1F_EventScript_PetalburgGymReport:: @ 81F784D lockall setvar VAR_0x8004, 0 - setvar VAR_0x8005, 1 - goto LittlerootTown_BrendansHouse_1F_EventScript_29286D + setvar VAR_0x8005, 1 @ Object event ID for Mom + goto PlayersHouse_1F_EventScript_PetalburgGymReportMale end -LittlerootTown_BrendansHouse_1F_EventScript_1F785E:: @ 81F785E +LittlerootTown_BrendansHouse_1F_EventScript_YoureNewNeighbor:: @ 81F785E lockall playse SE_PIN applymovement 4, Common_Movement_ExclamationMark @@ -95,16 +96,16 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F785E:: @ 81F785E applymovement 4, Common_Movement_Delay48 waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft - applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_1F789C + applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_RivalMomApproach waitmovement 0 special GetRivalSonDaughterString - msgbox LittlerootTown_BrendansHouse_1F_Text_1F8BC5, MSGBOX_DEFAULT + msgbox RivalsHouse_1F_Text_OhYoureTheNewNeighbor, MSGBOX_DEFAULT setflag FLAG_MET_RIVAL_MOM setvar VAR_LITTLEROOT_HOUSES_STATE, 2 releaseall end -LittlerootTown_BrendansHouse_1F_Movement_1F789C: @ 81F789C +LittlerootTown_BrendansHouse_1F_Movement_RivalMomApproach: @ 81F789C walk_down walk_right walk_right @@ -113,34 +114,34 @@ LittlerootTown_BrendansHouse_1F_Movement_1F789C: @ 81F789C walk_right step_end -LittlerootTown_BrendansHouse_1F_EventScript_1F78A3:: @ 81F78A3 +LittlerootTown_BrendansHouse_1F_EventScript_GoSeeRoom:: @ 81F78A3 lockall setvar VAR_0x8004, 1 - setvar VAR_0x8005, 0 + setvar VAR_0x8005, MALE applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - goto LittlerootTown_BrendansHouse_1F_EventScript_292765 + goto PlayersHouse_1F_EventScript_MomGoSeeRoom end -LittlerootTown_BrendansHouse_1F_EventScript_1F78BE:: @ 81F78BE +LittlerootTown_BrendansHouse_1F_EventScript_MeetRival0:: @ 81F78BE lockall setvar VAR_0x8008, 0 - goto LittlerootTown_BrendansHouse_1F_EventScript_1F78E2 + goto LittlerootTown_BrendansHouse_1F_EventScript_MeetRival end -LittlerootTown_BrendansHouse_1F_EventScript_1F78CA:: @ 81F78CA +LittlerootTown_BrendansHouse_1F_EventScript_MeetRival1:: @ 81F78CA lockall setvar VAR_0x8008, 1 - goto LittlerootTown_BrendansHouse_1F_EventScript_1F78E2 + goto LittlerootTown_BrendansHouse_1F_EventScript_MeetRival end -LittlerootTown_BrendansHouse_1F_EventScript_1F78D6:: @ 81F78D6 +LittlerootTown_BrendansHouse_1F_EventScript_MeetRival2:: @ 81F78D6 lockall setvar VAR_0x8008, 2 - goto LittlerootTown_BrendansHouse_1F_EventScript_1F78E2 + goto LittlerootTown_BrendansHouse_1F_EventScript_MeetRival end -LittlerootTown_BrendansHouse_1F_EventScript_1F78E2:: @ 81F78E2 +LittlerootTown_BrendansHouse_1F_EventScript_MeetRival:: @ 81F78E2 playse SE_KAIDAN delay 10 addobject 7 @@ -151,22 +152,22 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78E2:: @ 81F78E2 applymovement 7, Common_Movement_Delay48 waitmovement 0 compare VAR_0x8008, 1 - call_if_ne LittlerootTown_BrendansHouse_1F_EventScript_1F7981 + call_if_ne LittlerootTown_BrendansHouse_1F_EventScript_PlayerFaceBrendan playbgm MUS_BOY_SUP, 1 compare VAR_0x8008, 0 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F798C + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_BrendanApproachPlayer0 compare VAR_0x8008, 1 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F7997 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_BrendanApproachPlayer1 compare VAR_0x8008, 2 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F79A2 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F90B4, MSGBOX_DEFAULT + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_BrendanApproachPlayer2 + msgbox RivalsHouse_1F_Text_BrendanWhoAreYou, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 0 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F79C1 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_BrendanGoUpstairs0 compare VAR_0x8008, 1 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F79D3 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_BrendanGoUpstairs1 compare VAR_0x8008, 2 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F79E5 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_BrendanGoUpstairs2 playse SE_KAIDAN removeobject 7 setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN @@ -180,27 +181,27 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78E2:: @ 81F78E2 releaseall end -LittlerootTown_BrendansHouse_1F_EventScript_1F7981:: @ 81F7981 +LittlerootTown_BrendansHouse_1F_EventScript_PlayerFaceBrendan:: @ 81F7981 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_1F798C:: @ 81F798C - applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_1F79AD +LittlerootTown_BrendansHouse_1F_EventScript_BrendanApproachPlayer0:: @ 81F798C + applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_BrendanApproachPlayer0 waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_1F7997:: @ 81F7997 - applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_1F79B5 +LittlerootTown_BrendansHouse_1F_EventScript_BrendanApproachPlayer1:: @ 81F7997 + applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_BrendanApproachPlayer1 waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_1F79A2:: @ 81F79A2 - applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_1F79B9 +LittlerootTown_BrendansHouse_1F_EventScript_BrendanApproachPlayer2:: @ 81F79A2 + applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_BrendanApproachPlayer2 waitmovement 0 return -LittlerootTown_BrendansHouse_1F_Movement_1F79AD: @ 81F79AD +LittlerootTown_BrendansHouse_1F_Movement_BrendanApproachPlayer0: @ 81F79AD walk_in_place_fastest_left walk_left walk_in_place_fastest_up @@ -210,13 +211,13 @@ LittlerootTown_BrendansHouse_1F_Movement_1F79AD: @ 81F79AD walk_up step_end -LittlerootTown_BrendansHouse_1F_Movement_1F79B5: @ 81F79B5 +LittlerootTown_BrendansHouse_1F_Movement_BrendanApproachPlayer1: @ 81F79B5 walk_up walk_up walk_up step_end -LittlerootTown_BrendansHouse_1F_Movement_1F79B9: @ 81F79B9 +LittlerootTown_BrendansHouse_1F_Movement_BrendanApproachPlayer2: @ 81F79B9 walk_in_place_fastest_right walk_right walk_in_place_fastest_up @@ -226,31 +227,31 @@ LittlerootTown_BrendansHouse_1F_Movement_1F79B9: @ 81F79B9 walk_up step_end -LittlerootTown_BrendansHouse_1F_EventScript_1F79C1:: @ 81F79C1 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1F79F7 - applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_1F7A06 +LittlerootTown_BrendansHouse_1F_EventScript_BrendanGoUpstairs0:: @ 81F79C1 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_PlayerWatchBrendanExit0 + applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_BrendanGoUpstairs0 waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_1F79D3:: @ 81F79D3 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1F79FB - applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_1F7A0C +LittlerootTown_BrendansHouse_1F_EventScript_BrendanGoUpstairs1:: @ 81F79D3 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_PlayerWatchBrendanExit1 + applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_BrendanGoUpstairs1 waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_1F79E5:: @ 81F79E5 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1F7A02 - applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_1F7A16 +LittlerootTown_BrendansHouse_1F_EventScript_BrendanGoUpstairs2:: @ 81F79E5 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_PlayerWatchBrendanExit2 + applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_BrendanGoUpstairs2 waitmovement 0 return -LittlerootTown_BrendansHouse_1F_Movement_1F79F7: @ 81F79F7 +LittlerootTown_BrendansHouse_1F_Movement_PlayerWatchBrendanExit0: @ 81F79F7 delay_16 delay_8 walk_in_place_fastest_right step_end -LittlerootTown_BrendansHouse_1F_Movement_1F79FB: @ 81F79FB +LittlerootTown_BrendansHouse_1F_Movement_PlayerWatchBrendanExit1: @ 81F79FB delay_16 delay_8 walk_in_place_fastest_right @@ -259,13 +260,13 @@ LittlerootTown_BrendansHouse_1F_Movement_1F79FB: @ 81F79FB walk_in_place_fastest_up step_end -LittlerootTown_BrendansHouse_1F_Movement_1F7A02: @ 81F7A02 +LittlerootTown_BrendansHouse_1F_Movement_PlayerWatchBrendanExit2: @ 81F7A02 delay_16 delay_8 walk_in_place_fastest_left step_end -LittlerootTown_BrendansHouse_1F_Movement_1F7A06: @ 81F7A06 +LittlerootTown_BrendansHouse_1F_Movement_BrendanGoUpstairs0: @ 81F7A06 walk_in_place_fastest_right walk_right walk_in_place_fastest_up @@ -273,7 +274,7 @@ LittlerootTown_BrendansHouse_1F_Movement_1F7A06: @ 81F7A06 walk_up step_end -LittlerootTown_BrendansHouse_1F_Movement_1F7A0C: @ 81F7A0C +LittlerootTown_BrendansHouse_1F_Movement_BrendanGoUpstairs1: @ 81F7A0C walk_in_place_fastest_right walk_right walk_in_place_fastest_up @@ -285,7 +286,7 @@ LittlerootTown_BrendansHouse_1F_Movement_1F7A0C: @ 81F7A0C walk_up step_end -LittlerootTown_BrendansHouse_1F_Movement_1F7A16: @ 81F7A16 +LittlerootTown_BrendansHouse_1F_Movement_BrendanGoUpstairs2: @ 81F7A16 walk_in_place_fastest_left walk_left walk_in_place_fastest_up @@ -293,11 +294,11 @@ LittlerootTown_BrendansHouse_1F_Movement_1F7A16: @ 81F7A16 walk_up step_end -LittlerootTown_BrendansHouse_1F_Text_1F7A1C: @ 81F7A1C +PlayersHouse_1F_Text_IsntItNiceInHere: @ 81F7A1C .string "MOM: See, {PLAYER}?\n" .string "Isn't it nice in here, too?$" -LittlerootTown_BrendansHouse_1F_Text_1F7A46: @ 81F7A46 +PlayersHouse_1F_Text_MoversPokemonGoSetClock: @ 81F7A46 .string "The mover's POKéMON do all the work\n" .string "of moving us in and cleaning up after.\l" .string "This is so convenient!\p" @@ -307,91 +308,87 @@ LittlerootTown_BrendansHouse_1F_Text_1F7A46: @ 81F7A46 .string "our move here.\l" .string "Don't forget to set it!$" -LittlerootTown_BrendansHouse_1F_Text_1F7B24: @ 81F7B24 +PlayersHouse_1F_Text_ArentYouInterestedInRoom: @ 81F7B24 .string "MOM: Well, {PLAYER}?\p" .string "Aren't you interested in seeing your\n" .string "very own room?$" -LittlerootTown_BrendansHouse_1F_Text_1F7B67: @ 81F7B67 -LittlerootTown_MaysHouse_1F_Text_1F7B67: @ 81F7B67 +PlayersHouse_1F_Text_GoSetTheClock: @ 81F7B67 .string "MOM: {PLAYER}.\p" .string "Go set the clock in your room, honey.$" -LittlerootTown_BrendansHouse_1F_Text_1F7B96: @ 81F7B96 +PlayersHouse_1F_Text_OhComeQuickly: @ 81F7B96 .string "MOM: Oh! {PLAYER}, {PLAYER}!\n" .string "Quick! Come quickly!$" -LittlerootTown_BrendansHouse_1F_Text_1F7BBC: @ 81F7BBC -LittlerootTown_MaysHouse_1F_Text_1F7BBC: @ 81F7BBC +PlayersHouse_1F_Text_MaybeDadWillBeOn: @ 81F7BBC .string "MOM: Look! It's PETALBURG GYM!\n" .string "Maybe DAD will be on!$" -LittlerootTown_BrendansHouse_1F_Text_1F7BF1: @ 81F7BF1 -LittlerootTown_MaysHouse_1F_Text_1F7BF1: @ 81F7BF1 +PlayersHouse_1F_Text_ItsOverWeMissedHim: @ 81F7BF1 .string "MOM: Oh… It's over.\p" .string "I think DAD was on, but we missed him.\n" .string "Too bad.$" -LittlerootTown_BrendansHouse_1F_Text_1F7C35: @ 81F7C35 -LittlerootTown_MaysHouse_1F_Text_1F7C35: @ 81F7C35 +PlayersHouse_1F_Text_GoIntroduceYourselfNextDoor: @ 81F7C35 .string "Oh, yes.\n" .string "One of DAD's friends lives in town.\p" .string "PROF. BIRCH is his name.\p" .string "He lives right next door, so you should\n" .string "go over and introduce yourself.$" -LittlerootTown_BrendansHouse_1F_Text_1F7CC3: @ 81F7CC3 +PlayersHouse_1F_Text_SeeYouHoney: @ 81F7CC3 .string "MOM: See you, honey!$" -LittlerootTown_BrendansHouse_1F_Text_1F7CD8: @ 81F7CD8 +PlayersHouse_1F_Text_DidYouMeetProfBirch: @ 81F7CD8 .string "MOM: Did you introduce yourself to\n" .string "PROF. BIRCH?$" -LittlerootTown_BrendansHouse_1F_Text_1F7D08: @ 81F7D08 +PlayersHouse_1F_Text_YouShouldRestABit: @ 81F7D08 .string "MOM: How are you doing, {PLAYER}?\n" .string "You look a little tired.\p" .string "I think you should rest a bit.$" -LittlerootTown_BrendansHouse_1F_Text_1F7D5C: @ 81F7D5C +PlayersHouse_1F_Text_TakeCareHoney: @ 81F7D5C .string "MOM: Take care, honey!$" -LittlerootTown_BrendansHouse_1F_Text_1F7D73: @ 81F7D73 +PlayersHouse_1F_Text_GotDadsBadgeHeresSomethingFromMom: @ 81F7D73 .string "MOM: Oh? Did DAD give you that BADGE?\p" .string "Then here's something from your MOM!$" -LittlerootTown_BrendansHouse_1F_Text_1F7DBE: @ 81F7DBE +PlayersHouse_1F_Text_DontPushYourselfTooHard: @ 81F7DBE .string "Don't push yourself too hard, dear.\n" .string "You can always come home.\p" .string "Go for it, honey!$" -LittlerootTown_BrendansHouse_1F_Text_1F7E0E: @ 81F7E0E +PlayersHouse_1F_Text_IsThatAPokenav: @ 81F7E0E .string "MOM: What is that, honey? A POKéNAV?\n" .string "Someone from DEVON gave it to you?\p" .string "Well, honey, how about registering\n" .string "your mom?\p" .string "… … …$" -LittlerootTown_BrendansHouse_1F_Text_1F7E89: @ 81F7E89 +PlayersHouse_1F_Text_RegisteredMom: @ 81F7E89 .string "Registered MOM\n" .string "in the POKéNAV.$" -LittlerootTown_BrendansHouse_1F_Text_1F7EA8: @ 81F7EA8 +PlayersHouse_1F_Text_Vigoroth1: @ 81F7EA8 .string "Fugiiiiih!$" -LittlerootTown_BrendansHouse_1F_Text_1F7EB3: @ 81F7EB3 +PlayersHouse_1F_Text_Vigoroth2: @ 81F7EB3 .string "Huggoh, uggo uggo…$" -LittlerootTown_BrendansHouse_1F_Text_1F7EC6: @ 81F7EC6 +PlayersHouse_1F_Text_ReportFromPetalburgGym: @ 81F7EC6 .string "INTERVIEWER: …We brought you this\n" .string "report from in front of PETALBURG GYM.$" -LittlerootTown_BrendansHouse_1F_Text_1F7F0F: @ 81F7F0F +PlayersHouse_1F_Text_TheresAMovieOnTV: @ 81F7F0F .string "There is a movie on TV.\p" .string "Two men are dancing on a big piano\n" .string "keyboard.\p" .string "Better get going!$" -LittlerootTown_BrendansHouse_1F_Text_1F7F66: @ 81F7F66 +PlayersHouse_1F_Text_RunningShoesManual: @ 81F7F66 .string "It's the instruction booklet for the\n" .string "RUNNING SHOES.\p" .string "“Press the B Button to run while\n" @@ -399,7 +396,7 @@ LittlerootTown_BrendansHouse_1F_Text_1F7F66: @ 81F7F66 .string "“Lace up your RUNNING SHOES and hit\n" .string "the road running!”$" -LittlerootTown_BrendansHouse_1F_Text_1F800E: @ 81F800E +PlayersHouse_1F_Text_TicketFromBrineyCameForYou: @ 81F800E .string "DAD: Hm?\p" .string "Hey, it's {PLAYER}!\p" .string "It's been a while since I saw you,\n" @@ -410,26 +407,26 @@ LittlerootTown_BrendansHouse_1F_Text_1F800E: @ 81F800E .string "This came to you from someone named\l" .string "MR. BRINEY.$" -LittlerootTown_BrendansHouse_1F_Text_1F80FE: @ 81F80FE +PlayersHouse_1F_Text_PortsInSlateportLilycove: @ 81F80FE .string "DAD: Hm, a TICKET for a ferry?\p" .string "If I recall, there are ferry ports in\n" .string "SLATEPORT and LILYCOVE.$" -LittlerootTown_BrendansHouse_1F_Text_1F815B: @ 81F815B +PlayersHouse_1F_Text_BetterGetBackToGym: @ 81F815B .string "I'd better get back to PETALBURG GYM.\p" .string "MOM, thanks for looking after the house\n" .string "while I'm away.$" -LittlerootTown_BrendansHouse_1F_Text_1F81B9: @ 81F81B9 +PlayersHouse_1F_Text_DadShouldStayLonger: @ 81F81B9 .string "MOM: That DAD of yours…\p" .string "He comes home for the first time in a\n" .string "while, but all he talks about is POKéMON.\p" .string "He should relax and stay a little longer.$" -LittlerootTown_BrendansHouse_1F_Text_1F824B: @ 81F824B +PlayersHouse_1F_Text_IsThatABreakingStory: @ 81F824B .string "MOM: Is that a breaking news story?$" -LittlerootTown_BrendansHouse_1F_Text_1F826F: @ 81F826F +PlayersHouse_1F_Text_LatiEmergencyNewsFlash: @ 81F826F .string "We bring you this emergency\n" .string "news flash!\p" .string "In various HOENN locales, there have\n" @@ -440,11 +437,11 @@ LittlerootTown_BrendansHouse_1F_Text_1F826F: @ 81F826F .string "We now return you to the regular\n" .string "movie program.$" -LittlerootTown_BrendansHouse_1F_Text_1F8351: @ 81F8351 +PlayersHouse_1F_Text_WhatColorDidTheySay: @ 81F8351 .string "MOM: {PLAYER}, did you catch that?\p" .string "What color did the announcer say\n" .string "that POKéMON was?$" -LittlerootTown_BrendansHouse_1F_Text_1F83A1: @ 81F83A1 +PlayersHouse_1F_Text_StillUnknownPokemon: @ 81F83A1 .string "MOM: Well, isn't that something!\n" .string "There are still unknown POKéMON.$" diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/map.json b/data/maps/LittlerootTown_BrendansHouse_2F/map.json index e07959b20..01af64e7d 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/map.json +++ b/data/maps/LittlerootTown_BrendansHouse_2F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LittlerootTown_BrendansHouse_2F_EventScript_1F94C1", + "script": "RivalsHouse_2F_EventScript_Rival", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM" }, { @@ -206,7 +206,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LittlerootTown_BrendansHouse_2F_EventScript_1F8481", + "script": "LittlerootTown_BrendansHouse_2F_EventScript_RivalsPokeBall", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL" }, { @@ -240,7 +240,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "EventScript_PlayerPCMale" + "script": "LittlerootTown_BrendansHouse_2F_EventScript_PC" }, { "type": "sign", @@ -248,7 +248,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_BrendansHouse_2F_EventScript_1F8656" + "script": "PlayersHouse_2F_EventScript_Notebook" }, { "type": "sign", @@ -256,7 +256,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_BrendansHouse_2F_EventScript_292781" + "script": "LittlerootTown_BrendansHouse_2F_EventScript_WallClock" }, { "type": "sign", @@ -264,7 +264,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_BrendansHouse_2F_EventScript_1F865F" + "script": "PlayersHouse_2F_EventScript_GameCube" } ] }
\ No newline at end of file diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc index 130781f23..101e2bbad 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc @@ -1,70 +1,70 @@ LittlerootTown_BrendansHouse_2F_MapScripts:: @ 81F83E3 - map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_BrendansHouse_2F_MapScript1_1F83EE - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_BrendansHouse_2F_MapScript2_1F846A + map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_BrendansHouse_2F_OnTransition + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_BrendansHouse_2F_OnWarp .byte 0 -LittlerootTown_BrendansHouse_2F_MapScript1_1F83EE: @ 81F83EE +LittlerootTown_BrendansHouse_2F_OnTransition: @ 81F83EE compare VAR_LITTLEROOT_RIVAL_STATE, 2 - call_if_lt LittlerootTown_BrendansHouse_2F_EventScript_1F8457 + call_if_lt LittlerootTown_BrendansHouse_2F_EventScript_CheckSetReadyToMeetBrendan compare VAR_LITTLEROOT_RIVAL_STATE, 3 - call_if_ge LittlerootTown_BrendansHouse_2F_EventScript_1F841A + call_if_ge LittlerootTown_BrendansHouse_2F_EventScript_CheckShouldUpdateBrendanPos compare VAR_LITTLEROOT_INTRO_STATE, 4 - call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_2926FE + call_if_eq PlayersHouse_2F_EventScript_BlockStairsUntilClockIsSet call SecretBase_EventScript_SetDecorationFlags setvar VAR_SECRET_BASE_INITIALIZED, 0 end -LittlerootTown_BrendansHouse_2F_EventScript_1F841A:: @ 81F841A - goto_if_set FLAG_MET_RIVAL_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_1F8433 +LittlerootTown_BrendansHouse_2F_EventScript_CheckShouldUpdateBrendanPos:: @ 81F841A + goto_if_set FLAG_MET_RIVAL_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_TryUpdateBrendanPos compare VAR_BIRCH_LAB_STATE, 2 - goto_if_ge LittlerootTown_BrendansHouse_2F_EventScript_1F8456 - goto LittlerootTown_BrendansHouse_2F_EventScript_1F8433 + goto_if_ge LittlerootTown_BrendansHouse_2F_EventScript_Ret + goto LittlerootTown_BrendansHouse_2F_EventScript_TryUpdateBrendanPos -LittlerootTown_BrendansHouse_2F_EventScript_1F8433:: @ 81F8433 +LittlerootTown_BrendansHouse_2F_EventScript_TryUpdateBrendanPos:: @ 81F8433 checkplayergender compare VAR_RESULT, MALE - goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8456 + goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_Ret compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 2 - goto_if_ge LittlerootTown_BrendansHouse_2F_EventScript_1F9309 + goto_if_ge LittlerootTown_MaysHouse_2F_EventScript_Ret @ Odd that the MaysHouse equivalent was used here instead setobjectxyperm 1, 0, 2 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP return -LittlerootTown_BrendansHouse_2F_EventScript_1F8456:: @ 81F8456 +LittlerootTown_BrendansHouse_2F_EventScript_Ret:: @ 81F8456 return -LittlerootTown_BrendansHouse_2F_EventScript_1F8457:: @ 81F8457 +LittlerootTown_BrendansHouse_2F_EventScript_CheckSetReadyToMeetBrendan:: @ 81F8457 checkplayergender compare VAR_RESULT, FEMALE - goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8464 + goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_SetReadyToMeetBrendan return -LittlerootTown_BrendansHouse_2F_EventScript_1F8464:: @ 81F8464 +LittlerootTown_BrendansHouse_2F_EventScript_SetReadyToMeetBrendan:: @ 81F8464 setvar VAR_LITTLEROOT_RIVAL_STATE, 2 return -LittlerootTown_BrendansHouse_2F_MapScript2_1F846A: @ 81F846A - map_script_2 VAR_SECRET_BASE_INITIALIZED, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F8474 +LittlerootTown_BrendansHouse_2F_OnWarp: @ 81F846A + map_script_2 VAR_SECRET_BASE_INITIALIZED, 0, LittlerootTown_BrendansHouse_2F_EventScript_CheckInitDecor .2byte 0 -LittlerootTown_BrendansHouse_2F_EventScript_1F8474:: @ 81F8474 +LittlerootTown_BrendansHouse_2F_EventScript_CheckInitDecor:: @ 81F8474 checkplayergender compare VAR_RESULT, MALE goto_if_eq SecretBase_EventScript_InitDecorations end -LittlerootTown_BrendansHouse_2F_EventScript_1F8481:: @ 81F8481 +LittlerootTown_BrendansHouse_2F_EventScript_RivalsPokeBall:: @ 81F8481 lockall compare VAR_LITTLEROOT_RIVAL_STATE, 2 - goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8497 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F9991, MSGBOX_DEFAULT + goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendan + msgbox RivalsHouse_2F_Text_ItsRivalsPokeBall, MSGBOX_DEFAULT releaseall end -LittlerootTown_BrendansHouse_2F_EventScript_1F8497:: @ 81F8497 +LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendan:: @ 81F8497 delay 10 addobject 1 - applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85BC + applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_BrendanEnters waitmovement 0 playse SE_PIN applymovement 1, Common_Movement_ExclamationMark @@ -74,13 +74,13 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8497:: @ 81F8497 delay 10 playbgm MUS_BOY_SUP, 1 compare VAR_FACING, DIR_NORTH - call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8507 + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanNorth compare VAR_FACING, DIR_SOUTH - call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8536 + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanSouth compare VAR_FACING, DIR_WEST - call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8565 + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanWest compare VAR_FACING, DIR_EAST - call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8594 + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanEast setvar VAR_LITTLEROOT_RIVAL_STATE, 3 setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL clearflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM @@ -90,60 +90,60 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8497:: @ 81F8497 releaseall end -LittlerootTown_BrendansHouse_2F_EventScript_1F8507:: @ 81F8507 - applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85C0 +LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanNorth:: @ 81F8507 + applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerNorth waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT + msgbox RivalsHouse_2F_Text_BrendanWhoAreYou, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_1F85CF - applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85C6 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanNorth + applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCNorth waitmovement 0 return -LittlerootTown_BrendansHouse_2F_EventScript_1F8536:: @ 81F8536 - applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85D7 +LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanSouth:: @ 81F8536 + applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerSouth waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT + msgbox RivalsHouse_2F_Text_BrendanWhoAreYou, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_1F85E2 - applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85DB + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanSouth + applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCSouth waitmovement 0 return -LittlerootTown_BrendansHouse_2F_EventScript_1F8565:: @ 81F8565 - applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85E8 +LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanWest:: @ 81F8565 + applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerWest waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT + msgbox RivalsHouse_2F_Text_BrendanWhoAreYou, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_1F85F6 - applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85ED + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanWest + applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCWest waitmovement 0 return -LittlerootTown_BrendansHouse_2F_EventScript_1F8594:: @ 81F8594 - applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85FD +LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanEast:: @ 81F8594 + applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerEast waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT + msgbox RivalsHouse_2F_Text_BrendanWhoAreYou, MSGBOX_DEFAULT closemessage - applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F8604 + applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCEast waitmovement 0 return -LittlerootTown_BrendansHouse_2F_Movement_1F85BC: @ 81F85BC +LittlerootTown_BrendansHouse_2F_Movement_BrendanEnters: @ 81F85BC walk_down walk_down walk_in_place_fastest_left step_end -LittlerootTown_BrendansHouse_2F_Movement_1F85C0: @ 81F85C0 +LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerNorth: @ 81F85C0 walk_left walk_left walk_down @@ -151,7 +151,7 @@ LittlerootTown_BrendansHouse_2F_Movement_1F85C0: @ 81F85C0 walk_left step_end -LittlerootTown_BrendansHouse_2F_Movement_1F85C6: @ 81F85C6 +LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCNorth: @ 81F85C6 walk_up walk_up walk_up @@ -162,7 +162,7 @@ LittlerootTown_BrendansHouse_2F_Movement_1F85C6: @ 81F85C6 walk_in_place_fastest_up step_end -LittlerootTown_BrendansHouse_2F_Movement_1F85CF: @ 81F85CF +LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanNorth: @ 81F85CF delay_16 walk_in_place_fastest_up delay_16 @@ -172,13 +172,13 @@ LittlerootTown_BrendansHouse_2F_Movement_1F85CF: @ 81F85CF walk_in_place_fastest_left step_end -LittlerootTown_BrendansHouse_2F_Movement_1F85D7: @ 81F85D7 +LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerSouth: @ 81F85D7 walk_left walk_left walk_left step_end -LittlerootTown_BrendansHouse_2F_Movement_1F85DB: @ 81F85DB +LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCSouth: @ 81F85DB walk_up walk_left walk_left @@ -187,7 +187,7 @@ LittlerootTown_BrendansHouse_2F_Movement_1F85DB: @ 81F85DB walk_in_place_fastest_up step_end -LittlerootTown_BrendansHouse_2F_Movement_1F85E2: @ 81F85E2 +LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanSouth: @ 81F85E2 delay_16 walk_in_place_fastest_up delay_16 @@ -195,14 +195,14 @@ LittlerootTown_BrendansHouse_2F_Movement_1F85E2: @ 81F85E2 walk_in_place_fastest_left step_end -LittlerootTown_BrendansHouse_2F_Movement_1F85E8: @ 81F85E8 +LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerWest: @ 81F85E8 walk_left walk_left walk_down walk_in_place_fastest_left step_end -LittlerootTown_BrendansHouse_2F_Movement_1F85ED: @ 81F85ED +LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCWest: @ 81F85ED walk_up walk_up walk_left @@ -213,7 +213,7 @@ LittlerootTown_BrendansHouse_2F_Movement_1F85ED: @ 81F85ED walk_in_place_fastest_up step_end -LittlerootTown_BrendansHouse_2F_Movement_1F85F6: @ 81F85F6 +LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanWest: @ 81F85F6 delay_8 delay_16 walk_in_place_fastest_up @@ -222,7 +222,7 @@ LittlerootTown_BrendansHouse_2F_Movement_1F85F6: @ 81F85F6 walk_in_place_fastest_left step_end -LittlerootTown_BrendansHouse_2F_Movement_1F85FD: @ 81F85FD +LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerEast: @ 81F85FD walk_left walk_left walk_left @@ -231,29 +231,30 @@ LittlerootTown_BrendansHouse_2F_Movement_1F85FD: @ 81F85FD walk_in_place_fastest_down step_end -LittlerootTown_BrendansHouse_2F_Movement_1F8604: @ 81F8604 +LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCEast: @ 81F8604 walk_up walk_left walk_left walk_in_place_fastest_up step_end -LittlerootTown_BrendansHouse_2F_Movement_1F8609: @ 81F8609 +@ Unused, the player is already facing this direction so its unneeded +LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanEast: @ 81F8609 delay_16 delay_16 walk_in_place_fastest_left step_end -EventScript_PlayerPCMale:: @ 81F860D +LittlerootTown_BrendansHouse_2F_EventScript_PC:: @ 81F860D lockall checkplayergender compare VAR_RESULT, MALE - goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8626 + goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_CheckPlayersPC compare VAR_RESULT, FEMALE - goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F864C + goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_CheckRivalsPC end -LittlerootTown_BrendansHouse_2F_EventScript_1F8626:: @ 81F8626 +LittlerootTown_BrendansHouse_2F_EventScript_CheckPlayersPC:: @ 81F8626 setvar VAR_0x8004, 1 special DoPCTurnOnEffect playse SE_PC_ON @@ -263,33 +264,31 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8626:: @ 81F8626 releaseall end -LittlerootTown_BrendansHouse_2F_EventScript_1F863F:: @ 81F863F +LittlerootTown_BrendansHouse_2F_EventScript_TurnOffPlayerPC:: @ 81F863F setvar VAR_0x8004, 1 playse SE_PC_OFF special DoPCTurnOffEffect releaseall end -LittlerootTown_BrendansHouse_2F_EventScript_1F864C:: @ 81F864C +LittlerootTown_BrendansHouse_2F_EventScript_CheckRivalsPC:: @ 81F864C msgbox gText_PokemonTrainerSchoolEmail, MSGBOX_DEFAULT releaseall end -LittlerootTown_BrendansHouse_2F_EventScript_1F8656:: @ 81F8656 -LittlerootTown_MaysHouse_2F_EventScript_1F8656:: @ 81F8656 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F877F, MSGBOX_SIGN +PlayersHouse_2F_EventScript_Notebook:: @ 81F8656 + msgbox PlayersHouse_2F_Text_Notebook, MSGBOX_SIGN end -LittlerootTown_BrendansHouse_2F_EventScript_1F865F:: @ 81F865F -LittlerootTown_MaysHouse_2F_EventScript_1F865F:: @ 81F865F - msgbox LittlerootTown_BrendansHouse_2F_Text_1F884F, MSGBOX_SIGN +PlayersHouse_2F_EventScript_GameCube:: @ 81F865F + msgbox PlayersHouse_2F_Text_ItsAGameCube, MSGBOX_SIGN end -LittlerootTown_BrendansHouse_2F_Text_1F8668: @ 81F8668 +PlayersHouse_2F_Text_ClockIsStopped: @ 81F8668 .string "The clock is stopped…\p" .string "Better set it and start it!$" -LittlerootTown_BrendansHouse_2F_Text_1F869A: @ 81F869A +PlayersHouse_2F_Text_HowDoYouLikeYourRoom: @ 81F869A .string "MOM: {PLAYER}, how do you like your\n" .string "new room?\p" .string "Good! Everything's put away neatly!\p" @@ -299,7 +298,7 @@ LittlerootTown_BrendansHouse_2F_Text_1F869A: @ 81F869A .string "Oh, you should make sure that\n" .string "everything's all there on your desk.$" -LittlerootTown_BrendansHouse_2F_Text_1F877F: @ 81F877F +PlayersHouse_2F_Text_Notebook: @ 81F877F .string "{PLAYER} flipped open the notebook.\p" .string "ADVENTURE RULE NO. 1\n" .string "Open the MENU with START.\p" @@ -311,7 +310,7 @@ Common_Text_LookCloserAtMap: @ 81F8820 .string "{PLAYER} took a closer look at the\n" .string "HOENN region map.$" -LittlerootTown_BrendansHouse_2F_Text_1F884F: @ 81F884F +PlayersHouse_2F_Text_ItsAGameCube: @ 81F884F .string "It's a Nintendo GameCube.\p" .string "A Game Boy Advance is connected to\n" .string "serve as the Controller.$" diff --git a/data/maps/LittlerootTown_MaysHouse_1F/map.json b/data/maps/LittlerootTown_MaysHouse_1F/map.json index 0938e6966..118e3e819 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/map.json +++ b/data/maps/LittlerootTown_MaysHouse_1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LittlerootTown_MaysHouse_1F_EventScript_2929C5", + "script": "PlayersHouse_1F_EventScript_Mom", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MOM" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LittlerootTown_MaysHouse_1F_EventScript_292ABA", + "script": "PlayersHouse_1F_EventScript_Vigoroth1", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LittlerootTown_MaysHouse_1F_EventScript_292ACD", + "script": "PlayersHouse_1F_EventScript_Vigoroth2", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LittlerootTown_MaysHouse_1F_EventScript_1F89F3", + "script": "RivalsHouse_1F_EventScript_RivalMom", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_MOM" }, { @@ -89,7 +89,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A3D", + "script": "RivalsHouse_1F_EventScript_RivalSibling", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_SIBLING" }, { @@ -103,7 +103,7 @@ "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", - "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_BRENDAN" + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MAY" } ], "warp_events": [ @@ -137,7 +137,7 @@ "elevation": 0, "var": "VAR_LITTLEROOT_INTRO_STATE", "var_value": "4", - "script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A4C" + "script": "LittlerootTown_MaysHouse_1F_EventScript_GoSeeRoom" }, { "type": "trigger", @@ -146,7 +146,7 @@ "elevation": 0, "var": "VAR_LITTLEROOT_RIVAL_STATE", "var_value": "2", - "script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A67" + "script": "LittlerootTown_MaysHouse_1F_EventScript_MeetRival0" }, { "type": "trigger", @@ -155,7 +155,7 @@ "elevation": 0, "var": "VAR_LITTLEROOT_RIVAL_STATE", "var_value": "2", - "script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A73" + "script": "LittlerootTown_MaysHouse_1F_EventScript_MeetRival1" }, { "type": "trigger", @@ -164,7 +164,7 @@ "elevation": 0, "var": "VAR_LITTLEROOT_RIVAL_STATE", "var_value": "2", - "script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A7F" + "script": "LittlerootTown_MaysHouse_1F_EventScript_MeetRival2" } ], "bg_events": [] diff --git a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc index 74654f7ee..55736f652 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc @@ -1,93 +1,94 @@ LittlerootTown_MaysHouse_1F_MapScripts:: @ 81F88A5 - map_script MAP_SCRIPT_ON_LOAD, LittlerootTown_MaysHouse_1F_MapScript1_1F88B5 - map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_MaysHouse_1F_MapScript1_1F88F4 - map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_MaysHouse_1F_MapScript2_1F893A + map_script MAP_SCRIPT_ON_LOAD, LittlerootTown_MaysHouse_1F_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_MaysHouse_1F_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_MaysHouse_1F_OnFrame .byte 0 -LittlerootTown_MaysHouse_1F_MapScript1_1F88B5: @ 81F88B5 +LittlerootTown_MaysHouse_1F_OnLoad: @ 81F88B5 compare VAR_LITTLEROOT_INTRO_STATE, 6 - call_if_lt LittlerootTown_MaysHouse_1F_EventScript_1F88CA - call_if_set FLAG_RECEIVED_RUNNING_SHOES, LittlerootTown_MaysHouse_1F_EventScript_1F88DD + call_if_lt LittlerootTown_MaysHouse_1F_EventScript_SetMovingBoxes + call_if_set FLAG_RECEIVED_RUNNING_SHOES, LittlerootTown_MaysHouse_1F_EventScript_CheckShowShoesManual end -LittlerootTown_MaysHouse_1F_EventScript_1F88CA:: @ 81F88CA +LittlerootTown_MaysHouse_1F_EventScript_SetMovingBoxes:: @ 81F88CA setmetatile 5, 4, METATILE_BrendansMaysHouse_MovingBox_Open, 1 setmetatile 5, 2, METATILE_BrendansMaysHouse_MovingBox_Closed, 1 return -LittlerootTown_MaysHouse_1F_EventScript_1F88DD:: @ 81F88DD +LittlerootTown_MaysHouse_1F_EventScript_CheckShowShoesManual:: @ 81F88DD checkplayergender compare VAR_RESULT, FEMALE - goto_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F88EA + goto_if_eq LittlerootTown_MaysHouse_1F_EventScript_ShowRunningShoesManual return -LittlerootTown_MaysHouse_1F_EventScript_1F88EA:: @ 81F88EA +LittlerootTown_MaysHouse_1F_EventScript_ShowRunningShoesManual:: @ 81F88EA setmetatile 6, 7, METATILE_BrendansMaysHouse_BookOnTable, 1 return -LittlerootTown_MaysHouse_1F_MapScript1_1F88F4: @ 81F88F4 +LittlerootTown_MaysHouse_1F_OnTransition: @ 81F88F4 compare VAR_LITTLEROOT_INTRO_STATE, 3 - call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F892E + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_MoveMomToDoor compare VAR_LITTLEROOT_INTRO_STATE, 5 - call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F8916 + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_MoveMomToStairs compare VAR_LITTLEROOT_INTRO_STATE, 6 - call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F8922 + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_MoveMomToTV end -LittlerootTown_MaysHouse_1F_EventScript_1F8916:: @ 81F8916 +LittlerootTown_MaysHouse_1F_EventScript_MoveMomToStairs:: @ 81F8916 setobjectxyperm 1, 2, 4 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP return -LittlerootTown_MaysHouse_1F_EventScript_1F8922:: @ 81F8922 +LittlerootTown_MaysHouse_1F_EventScript_MoveMomToTV:: @ 81F8922 setobjectxyperm 1, 6, 5 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP return -LittlerootTown_MaysHouse_1F_EventScript_1F892E:: @ 81F892E +LittlerootTown_MaysHouse_1F_EventScript_MoveMomToDoor:: @ 81F892E setobjectxyperm 1, 1, 8 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP return -LittlerootTown_MaysHouse_1F_MapScript2_1F893A: @ 81F893A - map_script_2 VAR_LITTLEROOT_INTRO_STATE, 3, LittlerootTown_MaysHouse_1F_EventScript_1F898C - map_script_2 VAR_LITTLEROOT_INTRO_STATE, 5, LittlerootTown_MaysHouse_1F_EventScript_1F8964 - map_script_2 VAR_LITTLEROOT_INTRO_STATE, 6, LittlerootTown_MaysHouse_1F_EventScript_1F899D - map_script_2 VAR_LITTLEROOT_HOUSES_STATE_2, 1, LittlerootTown_MaysHouse_1F_EventScript_1F89AE - map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 3, LittlerootTown_MaysHouse_1F_EventScript_292AF2 +@ Many of the below scripts have no gender check because they assume youre in the correct house +LittlerootTown_MaysHouse_1F_OnFrame: @ 81F893A + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 3, LittlerootTown_MaysHouse_1F_EventScript_EnterHouseMovingIn + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 5, LittlerootTown_MaysHouse_1F_EventScript_GoUpstairsToSetClock + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 6, LittlerootTown_MaysHouse_1F_EventScript_PetalburgGymReport + map_script_2 VAR_LITTLEROOT_HOUSES_STATE_2, 1, LittlerootTown_MaysHouse_1F_EventScript_YoureNewNeighbor + map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 3, PlayersHouse_1F_EventScript_GetSSTicketAndSeeLatiTV .2byte 0 -LittlerootTown_MaysHouse_1F_EventScript_1F8964:: @ 81F8964 +LittlerootTown_MaysHouse_1F_EventScript_GoUpstairsToSetClock:: @ 81F8964 lockall - msgbox LittlerootTown_MaysHouse_1F_Text_1F7B67, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_GoSetTheClock, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_1F898A - applymovement 1, LittlerootTown_MaysHouse_1F_Movement_1F898A + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_PushTowardStairs + applymovement 1, LittlerootTown_MaysHouse_1F_Movement_PushTowardStairs waitmovement 0 warp MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F, 255, 1, 1 waitstate releaseall end -LittlerootTown_MaysHouse_1F_Movement_1F898A: @ 81F898A +LittlerootTown_MaysHouse_1F_Movement_PushTowardStairs: @ 81F898A walk_up step_end -LittlerootTown_MaysHouse_1F_EventScript_1F898C:: @ 81F898C +LittlerootTown_MaysHouse_1F_EventScript_EnterHouseMovingIn:: @ 81F898C lockall setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - goto LittlerootTown_MaysHouse_1F_EventScript_292704 + setvar VAR_0x8005, FEMALE + goto PlayersHouse_1F_EventScript_EnterHouseMovingIn end -LittlerootTown_MaysHouse_1F_EventScript_1F899D:: @ 81F899D +LittlerootTown_MaysHouse_1F_EventScript_PetalburgGymReport:: @ 81F899D lockall setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 - goto LittlerootTown_MaysHouse_1F_EventScript_2928DC + goto PlayersHouse_1F_EventScript_PetalburgGymReportFemale end -LittlerootTown_MaysHouse_1F_EventScript_1F89AE:: @ 81F89AE +LittlerootTown_MaysHouse_1F_EventScript_YoureNewNeighbor:: @ 81F89AE lockall playse SE_PIN applymovement 4, Common_Movement_ExclamationMark @@ -95,16 +96,16 @@ LittlerootTown_MaysHouse_1F_EventScript_1F89AE:: @ 81F89AE applymovement 4, Common_Movement_Delay48 waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight - applymovement 4, LittlerootTown_MaysHouse_1F_Movement_1F89EC + applymovement 4, LittlerootTown_MaysHouse_1F_Movement_RivalMomApproach waitmovement 0 special GetRivalSonDaughterString - msgbox LittlerootTown_MaysHouse_1F_Text_1F8BC5, MSGBOX_DEFAULT + msgbox RivalsHouse_1F_Text_OhYoureTheNewNeighbor, MSGBOX_DEFAULT setflag FLAG_MET_RIVAL_MOM setvar VAR_LITTLEROOT_HOUSES_STATE_2, 2 releaseall end -LittlerootTown_MaysHouse_1F_Movement_1F89EC: @ 81F89EC +LittlerootTown_MaysHouse_1F_Movement_RivalMomApproach: @ 81F89EC walk_down walk_left walk_left @@ -113,71 +114,69 @@ LittlerootTown_MaysHouse_1F_Movement_1F89EC: @ 81F89EC walk_left step_end -LittlerootTown_BrendansHouse_1F_EventScript_1F89F3:: @ 81F89F3 -LittlerootTown_MaysHouse_1F_EventScript_1F89F3:: @ 81F89F3 +RivalsHouse_1F_EventScript_RivalMom:: @ 81F89F3 lock faceplayer - goto_if_set FLAG_DEFEATED_RIVAL_ROUTE103, LittlerootTown_BrendansHouse_1F_EventScript_1F8A33 - goto_if_set FLAG_SYS_POKEMON_GET, LittlerootTown_BrendansHouse_1F_EventScript_1F8A29 + goto_if_set FLAG_DEFEATED_RIVAL_ROUTE103, RivalsHouse_1F_EventScript_GoHomeEverySoOften + goto_if_set FLAG_SYS_POKEMON_GET, RivalsHouse_1F_EventScript_RivalIsOnRoute103 compare VAR_LITTLEROOT_RIVAL_STATE, 3 - goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F8A1F + goto_if_eq RivalsHouse_1F_EventScript_RivalTooBusy special GetRivalSonDaughterString - msgbox LittlerootTown_BrendansHouse_1F_Text_1F8CA5, MSGBOX_DEFAULT + msgbox RivalsHouse_1F_Text_LikeChildLikeFather, MSGBOX_DEFAULT release end -LittlerootTown_BrendansHouse_1F_EventScript_1F8A1F:: @ 81F8A1F - msgbox LittlerootTown_BrendansHouse_1F_Text_1F8D37, MSGBOX_DEFAULT +RivalsHouse_1F_EventScript_RivalTooBusy:: @ 81F8A1F + msgbox RivalsHouse_1F_Text_TooBusyToNoticeVisit, MSGBOX_DEFAULT release end -LittlerootTown_BrendansHouse_1F_EventScript_1F8A29:: @ 81F8A29 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F8D93, MSGBOX_DEFAULT +RivalsHouse_1F_EventScript_RivalIsOnRoute103:: @ 81F8A29 + msgbox RivalsHouse_1F_Text_WentOutToRoute103, MSGBOX_DEFAULT release end -LittlerootTown_BrendansHouse_1F_EventScript_1F8A33:: @ 81F8A33 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F8E01, MSGBOX_DEFAULT +RivalsHouse_1F_EventScript_GoHomeEverySoOften:: @ 81F8A33 + msgbox RivalsHouse_1F_Text_ShouldGoHomeEverySoOften, MSGBOX_DEFAULT release end -LittlerootTown_BrendansHouse_1F_EventScript_1F8A3D:: @ 81F8A3D -LittlerootTown_MaysHouse_1F_EventScript_1F8A3D:: @ 81F8A3D +RivalsHouse_1F_EventScript_RivalSibling:: @ 81F8A3D lock faceplayer special GetPlayerBigGuyGirlString - msgbox LittlerootTown_BrendansHouse_1F_Text_1F9262, MSGBOX_DEFAULT + msgbox RivalsHouse_1F_Text_DoYouHavePokemon, MSGBOX_DEFAULT release end -LittlerootTown_MaysHouse_1F_EventScript_1F8A4C:: @ 81F8A4C +LittlerootTown_MaysHouse_1F_EventScript_GoSeeRoom:: @ 81F8A4C lockall setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 + setvar VAR_0x8005, FEMALE applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - goto LittlerootTown_MaysHouse_1F_EventScript_292765 + goto PlayersHouse_1F_EventScript_MomGoSeeRoom end -LittlerootTown_MaysHouse_1F_EventScript_1F8A67:: @ 81F8A67 +LittlerootTown_MaysHouse_1F_EventScript_MeetRival0:: @ 81F8A67 lockall setvar VAR_0x8008, 0 - goto LittlerootTown_MaysHouse_1F_EventScript_1F8A8B + goto LittlerootTown_MaysHouse_1F_EventScript_MeetRival end -LittlerootTown_MaysHouse_1F_EventScript_1F8A73:: @ 81F8A73 +LittlerootTown_MaysHouse_1F_EventScript_MeetRival1:: @ 81F8A73 lockall setvar VAR_0x8008, 1 - goto LittlerootTown_MaysHouse_1F_EventScript_1F8A8B + goto LittlerootTown_MaysHouse_1F_EventScript_MeetRival end -LittlerootTown_MaysHouse_1F_EventScript_1F8A7F:: @ 81F8A7F +LittlerootTown_MaysHouse_1F_EventScript_MeetRival2:: @ 81F8A7F lockall setvar VAR_0x8008, 2 - goto LittlerootTown_MaysHouse_1F_EventScript_1F8A8B + goto LittlerootTown_MaysHouse_1F_EventScript_MeetRival end -LittlerootTown_MaysHouse_1F_EventScript_1F8A8B:: @ 81F8A8B +LittlerootTown_MaysHouse_1F_EventScript_MeetRival:: @ 81F8A8B playse SE_KAIDAN delay 10 addobject 7 @@ -188,25 +187,25 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A8B:: @ 81F8A8B applymovement 7, Common_Movement_Delay48 waitmovement 0 compare VAR_0x8008, 1 - call_if_ne LittlerootTown_MaysHouse_1F_EventScript_1F8B2A + call_if_ne LittlerootTown_MaysHouse_1F_EventScript_PlayerFaceMay playbgm MUS_GIRL_SUP, 1 compare VAR_0x8008, 0 - call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F8B35 + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_MayApproachPlayer0 compare VAR_0x8008, 1 - call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F8B40 + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_MayApproachPlayer1 compare VAR_0x8008, 2 - call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F8B4B - msgbox LittlerootTown_MaysHouse_1F_Text_1F8EC6, MSGBOX_DEFAULT + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_MayApproachPlayer2 + msgbox RivalsHouse_1F_Text_MayWhoAreYou, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 0 - call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F8B6A + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_MayGoUpstairs0 compare VAR_0x8008, 1 - call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F8B7C + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_MayGoUpstairs1 compare VAR_0x8008, 2 - call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F8B8E + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_MayGoUpstairs2 playse SE_KAIDAN removeobject 7 - setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_BRENDAN + setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MAY setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL clearflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM delay 30 @@ -217,27 +216,27 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A8B:: @ 81F8A8B releaseall end -LittlerootTown_MaysHouse_1F_EventScript_1F8B2A:: @ 81F8B2A +LittlerootTown_MaysHouse_1F_EventScript_PlayerFaceMay:: @ 81F8B2A applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return -LittlerootTown_MaysHouse_1F_EventScript_1F8B35:: @ 81F8B35 - applymovement 7, LittlerootTown_MaysHouse_1F_Movement_1F8B56 +LittlerootTown_MaysHouse_1F_EventScript_MayApproachPlayer0:: @ 81F8B35 + applymovement 7, LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer0 waitmovement 0 return -LittlerootTown_MaysHouse_1F_EventScript_1F8B40:: @ 81F8B40 - applymovement 7, LittlerootTown_MaysHouse_1F_Movement_1F8B5E +LittlerootTown_MaysHouse_1F_EventScript_MayApproachPlayer1:: @ 81F8B40 + applymovement 7, LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer1 waitmovement 0 return -LittlerootTown_MaysHouse_1F_EventScript_1F8B4B:: @ 81F8B4B - applymovement 7, LittlerootTown_MaysHouse_1F_Movement_1F8B62 +LittlerootTown_MaysHouse_1F_EventScript_MayApproachPlayer2:: @ 81F8B4B + applymovement 7, LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer2 waitmovement 0 return -LittlerootTown_MaysHouse_1F_Movement_1F8B56: @ 81F8B56 +LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer0: @ 81F8B56 walk_in_place_fastest_left walk_left walk_in_place_fastest_up @@ -247,13 +246,13 @@ LittlerootTown_MaysHouse_1F_Movement_1F8B56: @ 81F8B56 walk_up step_end -LittlerootTown_MaysHouse_1F_Movement_1F8B5E: @ 81F8B5E +LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer1: @ 81F8B5E walk_up walk_up walk_up step_end -LittlerootTown_MaysHouse_1F_Movement_1F8B62: @ 81F8B62 +LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer2: @ 81F8B62 walk_in_place_fastest_right walk_right walk_in_place_fastest_up @@ -263,31 +262,31 @@ LittlerootTown_MaysHouse_1F_Movement_1F8B62: @ 81F8B62 walk_up step_end -LittlerootTown_MaysHouse_1F_EventScript_1F8B6A:: @ 81F8B6A - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_1F8BA0 - applymovement 7, LittlerootTown_MaysHouse_1F_Movement_1F8BAF +LittlerootTown_MaysHouse_1F_EventScript_MayGoUpstairs0:: @ 81F8B6A + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit0 + applymovement 7, LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs0 waitmovement 0 return -LittlerootTown_MaysHouse_1F_EventScript_1F8B7C:: @ 81F8B7C - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_1F8BA4 - applymovement 7, LittlerootTown_MaysHouse_1F_Movement_1F8BB5 +LittlerootTown_MaysHouse_1F_EventScript_MayGoUpstairs1:: @ 81F8B7C + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit1 + applymovement 7, LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs1 waitmovement 0 return -LittlerootTown_MaysHouse_1F_EventScript_1F8B8E:: @ 81F8B8E - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_1F8BAB - applymovement 7, LittlerootTown_MaysHouse_1F_Movement_1F8BBF +LittlerootTown_MaysHouse_1F_EventScript_MayGoUpstairs2:: @ 81F8B8E + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit2 + applymovement 7, LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs2 waitmovement 0 return -LittlerootTown_MaysHouse_1F_Movement_1F8BA0: @ 81F8BA0 +LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit0: @ 81F8BA0 delay_16 delay_8 walk_in_place_fastest_right step_end -LittlerootTown_MaysHouse_1F_Movement_1F8BA4: @ 81F8BA4 +LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit1: @ 81F8BA4 delay_16 delay_8 walk_in_place_fastest_right @@ -296,13 +295,13 @@ LittlerootTown_MaysHouse_1F_Movement_1F8BA4: @ 81F8BA4 walk_in_place_fastest_up step_end -LittlerootTown_MaysHouse_1F_Movement_1F8BAB: @ 81F8BAB +LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit2: @ 81F8BAB delay_16 delay_8 walk_in_place_fastest_left step_end -LittlerootTown_MaysHouse_1F_Movement_1F8BAF: @ 81F8BAF +LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs0: @ 81F8BAF walk_in_place_fastest_right walk_right walk_in_place_fastest_up @@ -310,7 +309,7 @@ LittlerootTown_MaysHouse_1F_Movement_1F8BAF: @ 81F8BAF walk_up step_end -LittlerootTown_MaysHouse_1F_Movement_1F8BB5: @ 81F8BB5 +LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs1: @ 81F8BB5 walk_in_place_fastest_right walk_right walk_in_place_fastest_up @@ -322,7 +321,7 @@ LittlerootTown_MaysHouse_1F_Movement_1F8BB5: @ 81F8BB5 walk_up step_end -LittlerootTown_MaysHouse_1F_Movement_1F8BBF: @ 81F8BBF +LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs2: @ 81F8BBF walk_in_place_fastest_left walk_left walk_in_place_fastest_up @@ -330,8 +329,7 @@ LittlerootTown_MaysHouse_1F_Movement_1F8BBF: @ 81F8BBF walk_up step_end -LittlerootTown_BrendansHouse_1F_Text_1F8BC5: @ 81F8BC5 -LittlerootTown_MaysHouse_1F_Text_1F8BC5: @ 81F8BC5 +RivalsHouse_1F_Text_OhYoureTheNewNeighbor: @ 81F8BC5 .string "Oh, hello. And you are?\p" .string "… … … … … … … … …\n" .string "… … … … … … … … …\p" @@ -343,26 +341,26 @@ LittlerootTown_MaysHouse_1F_Text_1F8BC5: @ 81F8BC5 .string "a new friend.\p" .string "Our {STR_VAR_1} is upstairs, I think.$" -LittlerootTown_BrendansHouse_1F_Text_1F8CA5: @ 81F8CA5 +RivalsHouse_1F_Text_LikeChildLikeFather: @ 81F8CA5 .string "Like child, like father.\p" .string "My husband is as wild about POKéMON\n" .string "as our child.\p" .string "If he's not at his LAB, he's likely\n" .string "scrabbling about in grassy places.$" -LittlerootTown_BrendansHouse_1F_Text_1F8D37: @ 81F8D37 +RivalsHouse_1F_Text_TooBusyToNoticeVisit: @ 81F8D37 .string "That {RIVAL}!\p" .string "I guess our child is too busy with\n" .string "POKéMON to notice that you came\l" .string "to visit, {PLAYER}{KUN}.$" -LittlerootTown_BrendansHouse_1F_Text_1F8D93: @ 81F8D93 +RivalsHouse_1F_Text_WentOutToRoute103: @ 81F8D93 .string "Oh, {RIVAL} went out to ROUTE 103\n" .string "just a little while ago.\p" .string "Like father, like child.\n" .string "{RIVAL} can't stay quietly at home.$" -LittlerootTown_BrendansHouse_1F_Text_1F8E01: @ 81F8E01 +RivalsHouse_1F_Text_ShouldGoHomeEverySoOften: @ 81F8E01 .string "I think it's wonderful for people to\n" .string "travel with POKéMON.\p" .string "But you should go home every so often\n" @@ -370,7 +368,7 @@ LittlerootTown_BrendansHouse_1F_Text_1F8E01: @ 81F8E01 .string "She might not say it, but I'm sure she\n" .string "worries about you, {PLAYER}{KUN}.$" -LittlerootTown_MaysHouse_1F_Text_1F8EC6: @ 81F8EC6 +RivalsHouse_1F_Text_MayWhoAreYou: @ 81F8EC6 .string "Huh?\n" .string "Who… Who are you?\p" .string "… … … … … … … …\n" @@ -394,7 +392,7 @@ LittlerootTown_MaysHouse_1F_Text_1F8EC6: @ 81F8EC6 .string "some wild POKéMON!\p" .string "{PLAYER}{KUN}, I'll catch you later!$" -LittlerootTown_BrendansHouse_1F_Text_1F90B4: @ 81F90B4 +RivalsHouse_1F_Text_BrendanWhoAreYou: @ 81F90B4 .string "Hey!\n" .string "You…\p" .string "Who are you?\p" @@ -414,7 +412,7 @@ LittlerootTown_BrendansHouse_1F_Text_1F90B4: @ 81F90B4 .string "some wild POKéMON.\p" .string "Some other time, okay?$" -LittlerootTown_BrendansHouse_1F_Text_1F9262: @ 81F9262 +RivalsHouse_1F_Text_DoYouHavePokemon: @ 81F9262 .string "Hi, neighbor!\p" .string "Do you already have your\n" .string "own POKéMON?$" diff --git a/data/maps/LittlerootTown_MaysHouse_2F/map.json b/data/maps/LittlerootTown_MaysHouse_2F/map.json index d92b024c6..33cdfb7c1 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/map.json +++ b/data/maps/LittlerootTown_MaysHouse_2F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LittlerootTown_MaysHouse_2F_EventScript_1F94C1", + "script": "RivalsHouse_2F_EventScript_Rival", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM" }, { @@ -219,7 +219,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LittlerootTown_MaysHouse_2F_EventScript_1F9334", + "script": "LittlerootTown_MaysHouse_2F_EventScript_RivalsPokeBall", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL" } ], @@ -240,7 +240,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_MaysHouse_2F_EventScript_1F865F" + "script": "PlayersHouse_2F_EventScript_GameCube" }, { "type": "sign", @@ -248,7 +248,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_MaysHouse_2F_EventScript_1F8656" + "script": "PlayersHouse_2F_EventScript_Notebook" }, { "type": "sign", @@ -256,7 +256,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_MaysHouse_2F_EventScript_29278D" + "script": "LittlerootTown_MaysHouse_2F_EventScript_WallClock" }, { "type": "sign", @@ -264,7 +264,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "EventScript_PlayerPCFemale" + "script": "LittlerootTown_MaysHouse_2F_EventScript_PC" } ] }
\ No newline at end of file diff --git a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc index 31a097ead..5bfbfbbcd 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc @@ -1,71 +1,70 @@ LittlerootTown_MaysHouse_2F_MapScripts:: @ 81F9296 - map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_MaysHouse_2F_MapScript1_1F92A1 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_MaysHouse_2F_MapScript2_1F931D + map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_MaysHouse_2F_OnTransition + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_MaysHouse_2F_OnWarp .byte 0 -LittlerootTown_MaysHouse_2F_MapScript1_1F92A1: @ 81F92A1 +LittlerootTown_MaysHouse_2F_OnTransition: @ 81F92A1 compare VAR_LITTLEROOT_RIVAL_STATE, 2 - call_if_lt LittlerootTown_MaysHouse_2F_EventScript_1F930A + call_if_lt LittlerootTown_MaysHouse_2F_EventScript_CheckSetReadyToMeetMay compare VAR_LITTLEROOT_RIVAL_STATE, 3 - call_if_ge LittlerootTown_MaysHouse_2F_EventScript_1F92CD + call_if_ge LittlerootTown_MaysHouse_2F_EventScript_CheckShouldUpdateMayPos compare VAR_LITTLEROOT_INTRO_STATE, 4 - call_if_eq LittlerootTown_MaysHouse_2F_EventScript_2926FE + call_if_eq PlayersHouse_2F_EventScript_BlockStairsUntilClockIsSet call SecretBase_EventScript_SetDecorationFlags setvar VAR_SECRET_BASE_INITIALIZED, 0 end -LittlerootTown_MaysHouse_2F_EventScript_1F92CD:: @ 81F92CD - goto_if_set FLAG_MET_RIVAL_LILYCOVE, LittlerootTown_MaysHouse_2F_EventScript_1F92E6 +LittlerootTown_MaysHouse_2F_EventScript_CheckShouldUpdateMayPos:: @ 81F92CD + goto_if_set FLAG_MET_RIVAL_LILYCOVE, LittlerootTown_MaysHouse_2F_EventScript_TryUpdateMayPos compare VAR_BIRCH_LAB_STATE, 2 - goto_if_ge LittlerootTown_MaysHouse_2F_EventScript_1F9309 - goto LittlerootTown_MaysHouse_2F_EventScript_1F92E6 + goto_if_ge LittlerootTown_MaysHouse_2F_EventScript_Ret + goto LittlerootTown_MaysHouse_2F_EventScript_TryUpdateMayPos -LittlerootTown_MaysHouse_2F_EventScript_1F92E6:: @ 81F92E6 +LittlerootTown_MaysHouse_2F_EventScript_TryUpdateMayPos:: @ 81F92E6 checkplayergender compare VAR_RESULT, FEMALE - goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9309 + goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_Ret compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 2 - goto_if_ge LittlerootTown_MaysHouse_2F_EventScript_1F9309 + goto_if_ge LittlerootTown_MaysHouse_2F_EventScript_Ret setobjectxyperm 1, 8, 2 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP return -LittlerootTown_BrendansHouse_2F_EventScript_1F9309:: @ 81F9309 -LittlerootTown_MaysHouse_2F_EventScript_1F9309:: @ 81F9309 +LittlerootTown_MaysHouse_2F_EventScript_Ret:: @ 81F9309 return -LittlerootTown_MaysHouse_2F_EventScript_1F930A:: @ 81F930A +LittlerootTown_MaysHouse_2F_EventScript_CheckSetReadyToMeetMay:: @ 81F930A checkplayergender compare VAR_RESULT, MALE - goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9317 + goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_SetReadyToMeetMay return -LittlerootTown_MaysHouse_2F_EventScript_1F9317:: @ 81F9317 +LittlerootTown_MaysHouse_2F_EventScript_SetReadyToMeetMay:: @ 81F9317 setvar VAR_LITTLEROOT_RIVAL_STATE, 2 return -LittlerootTown_MaysHouse_2F_MapScript2_1F931D: @ 81F931D - map_script_2 VAR_SECRET_BASE_INITIALIZED, 0, LittlerootTown_MaysHouse_2F_EventScript_1F9327 +LittlerootTown_MaysHouse_2F_OnWarp: @ 81F931D + map_script_2 VAR_SECRET_BASE_INITIALIZED, 0, LittlerootTown_MaysHouse_2F_EventScript_CheckInitDecor .2byte 0 -LittlerootTown_MaysHouse_2F_EventScript_1F9327:: @ 81F9327 +LittlerootTown_MaysHouse_2F_EventScript_CheckInitDecor:: @ 81F9327 checkplayergender compare VAR_RESULT, FEMALE goto_if_eq SecretBase_EventScript_InitDecorations end -LittlerootTown_MaysHouse_2F_EventScript_1F9334:: @ 81F9334 +LittlerootTown_MaysHouse_2F_EventScript_RivalsPokeBall:: @ 81F9334 lockall compare VAR_LITTLEROOT_RIVAL_STATE, 2 - goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F934A - msgbox LittlerootTown_MaysHouse_2F_Text_1F9991, MSGBOX_DEFAULT + goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_MeetMay + msgbox RivalsHouse_2F_Text_ItsRivalsPokeBall, MSGBOX_DEFAULT releaseall end -LittlerootTown_MaysHouse_2F_EventScript_1F934A:: @ 81F934A +LittlerootTown_MaysHouse_2F_EventScript_MeetMay:: @ 81F934A delay 10 addobject 1 - applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F946F + applymovement 1, LittlerootTown_MaysHouse_2F_Movement_MayEnters waitmovement 0 playse SE_PIN applymovement 1, Common_Movement_ExclamationMark @@ -75,13 +74,13 @@ LittlerootTown_MaysHouse_2F_EventScript_1F934A:: @ 81F934A delay 10 playbgm MUS_GIRL_SUP, 1 compare VAR_FACING, DIR_NORTH - call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F93BA + call_if_eq LittlerootTown_MaysHouse_2F_EventScript_MeetMayNorth compare VAR_FACING, DIR_SOUTH - call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F93E9 + call_if_eq LittlerootTown_MaysHouse_2F_EventScript_MeetMaySouth compare VAR_FACING, DIR_WEST - call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9418 + call_if_eq LittlerootTown_MaysHouse_2F_EventScript_MeetMayWest compare VAR_FACING, DIR_EAST - call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9440 + call_if_eq LittlerootTown_MaysHouse_2F_EventScript_MeetMayEast setvar VAR_LITTLEROOT_RIVAL_STATE, 3 setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL clearflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM @@ -91,60 +90,60 @@ LittlerootTown_MaysHouse_2F_EventScript_1F934A:: @ 81F934A releaseall end -LittlerootTown_MaysHouse_2F_EventScript_1F93BA:: @ 81F93BA - applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F9473 +LittlerootTown_MaysHouse_2F_EventScript_MeetMayNorth:: @ 81F93BA + applymovement 1, LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerNorth waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT + msgbox RivalsHouse_2F_Text_MayWhoAreYou, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_1F9483 - applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F9479 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMayNorth + applymovement 1, LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCNorth waitmovement 0 return -LittlerootTown_MaysHouse_2F_EventScript_1F93E9:: @ 81F93E9 - applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F948B +LittlerootTown_MaysHouse_2F_EventScript_MeetMaySouth:: @ 81F93E9 + applymovement 1, LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerSouth waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT + msgbox RivalsHouse_2F_Text_MayWhoAreYou, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_1F9497 - applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F948F + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMaySouth + applymovement 1, LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCSouth waitmovement 0 return -LittlerootTown_MaysHouse_2F_EventScript_1F9418:: @ 81F9418 - applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F949D +LittlerootTown_MaysHouse_2F_EventScript_MeetMayWest:: @ 81F9418 + applymovement 1, LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerWest waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT + msgbox RivalsHouse_2F_Text_MayWhoAreYou, MSGBOX_DEFAULT closemessage - applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F94A4 + applymovement 1, LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCWest waitmovement 0 return -LittlerootTown_MaysHouse_2F_EventScript_1F9440:: @ 81F9440 - applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F94AD +LittlerootTown_MaysHouse_2F_EventScript_MeetMayEast:: @ 81F9440 + applymovement 1, LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerEast waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT + msgbox RivalsHouse_2F_Text_MayWhoAreYou, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_1F94BB - applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F94B2 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMayEast + applymovement 1, LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCEast waitmovement 0 return -LittlerootTown_MaysHouse_2F_Movement_1F946F: @ 81F946F +LittlerootTown_MaysHouse_2F_Movement_MayEnters: @ 81F946F walk_down walk_down walk_in_place_fastest_right step_end -LittlerootTown_MaysHouse_2F_Movement_1F9473: @ 81F9473 +LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerNorth: @ 81F9473 walk_right walk_right walk_down @@ -152,7 +151,7 @@ LittlerootTown_MaysHouse_2F_Movement_1F9473: @ 81F9473 walk_right step_end -LittlerootTown_MaysHouse_2F_Movement_1F9479: @ 81F9479 +LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCNorth: @ 81F9479 walk_up walk_up walk_up @@ -164,7 +163,7 @@ LittlerootTown_MaysHouse_2F_Movement_1F9479: @ 81F9479 walk_in_place_fastest_up step_end -LittlerootTown_MaysHouse_2F_Movement_1F9483: @ 81F9483 +LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMayNorth: @ 81F9483 delay_16 walk_in_place_fastest_up delay_16 @@ -174,13 +173,13 @@ LittlerootTown_MaysHouse_2F_Movement_1F9483: @ 81F9483 walk_in_place_fastest_right step_end -LittlerootTown_MaysHouse_2F_Movement_1F948B: @ 81F948B +LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerSouth: @ 81F948B walk_right walk_right walk_right step_end -LittlerootTown_MaysHouse_2F_Movement_1F948F: @ 81F948F +LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCSouth: @ 81F948F walk_up walk_in_place_fastest_right walk_right @@ -190,7 +189,7 @@ LittlerootTown_MaysHouse_2F_Movement_1F948F: @ 81F948F walk_in_place_fastest_up step_end -LittlerootTown_MaysHouse_2F_Movement_1F9497: @ 81F9497 +LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMaySouth: @ 81F9497 delay_16 walk_in_place_fastest_up delay_16 @@ -198,7 +197,7 @@ LittlerootTown_MaysHouse_2F_Movement_1F9497: @ 81F9497 walk_in_place_fastest_right step_end -LittlerootTown_MaysHouse_2F_Movement_1F949D: @ 81F949D +LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerWest: @ 81F949D walk_right walk_right walk_right @@ -207,27 +206,28 @@ LittlerootTown_MaysHouse_2F_Movement_1F949D: @ 81F949D walk_in_place_fastest_down step_end -LittlerootTown_MaysHouse_2F_Movement_1F94A4: @ 81F94A4 +LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCWest: @ 81F94A4 walk_up walk_right walk_right walk_in_place_fastest_up step_end -LittlerootTown_MaysHouse_2F_Movement_1F94A9: @ 81F94A9 +@ Unused, the player is already facing this direction so its unneeded +LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMayWest: @ 81F94A9 delay_16 delay_16 walk_in_place_fastest_right step_end -LittlerootTown_MaysHouse_2F_Movement_1F94AD: @ 81F94AD +LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerEast: @ 81F94AD walk_right walk_right walk_down walk_in_place_fastest_right step_end -LittlerootTown_MaysHouse_2F_Movement_1F94B2: @ 81F94B2 +LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCEast: @ 81F94B2 walk_up walk_up walk_right @@ -238,7 +238,7 @@ LittlerootTown_MaysHouse_2F_Movement_1F94B2: @ 81F94B2 walk_in_place_fastest_up step_end -LittlerootTown_MaysHouse_2F_Movement_1F94BB: @ 81F94BB +LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMayEast: @ 81F94BB delay_16 walk_in_place_fastest_up delay_16 @@ -246,72 +246,71 @@ LittlerootTown_MaysHouse_2F_Movement_1F94BB: @ 81F94BB walk_in_place_fastest_right step_end -LittlerootTown_BrendansHouse_2F_EventScript_1F94C1:: @ 81F94C1 -LittlerootTown_MaysHouse_2F_EventScript_1F94C1:: @ 81F94C1 +RivalsHouse_2F_EventScript_Rival:: @ 81F94C1 lockall - goto_if_set FLAG_MET_RIVAL_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_1F94F7 + goto_if_set FLAG_MET_RIVAL_LILYCOVE, RivalsHouse_2F_EventScript_RivalPostLilycove checkplayergender compare VAR_RESULT, MALE - goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F94E3 + goto_if_eq RivalsHouse_2F_EventScript_May compare VAR_RESULT, FEMALE - goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F94ED + goto_if_eq RivalsHouse_2F_EventScript_Brendan end -LittlerootTown_BrendansHouse_2F_EventScript_1F94E3:: @ 81F94E3 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F978A, MSGBOX_DEFAULT +RivalsHouse_2F_EventScript_May:: @ 81F94E3 + msgbox RivalsHouse_2F_Text_MayGettingReady, MSGBOX_DEFAULT releaseall end -LittlerootTown_BrendansHouse_2F_EventScript_1F94ED:: @ 81F94ED - msgbox LittlerootTown_BrendansHouse_2F_Text_1F9962, MSGBOX_DEFAULT +RivalsHouse_2F_EventScript_Brendan:: @ 81F94ED + msgbox RivalsHouse_2F_Text_BrendanGettingReady, MSGBOX_DEFAULT releaseall end -LittlerootTown_BrendansHouse_2F_EventScript_1F94F7:: @ 81F94F7 +RivalsHouse_2F_EventScript_RivalPostLilycove:: @ 81F94F7 applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 checkplayergender compare VAR_RESULT, MALE - call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F951D + call_if_eq RivalsHouse_2F_EventScript_MayPostLilycove compare VAR_RESULT, FEMALE - call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F952F + call_if_eq RivalsHouse_2F_EventScript_BrendanPostLilycove setflag FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE releaseall end -LittlerootTown_BrendansHouse_2F_EventScript_1F951D:: @ 81F951D - goto_if_set FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_1F9541 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F99C9, MSGBOX_DEFAULT +RivalsHouse_2F_EventScript_MayPostLilycove:: @ 81F951D + goto_if_set FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE, RivalsHouse_2F_EventScript_MayWhereShouldIGoNext + msgbox RivalsHouse_2F_Text_MayJustCheckingMyPokedex, MSGBOX_DEFAULT return -LittlerootTown_BrendansHouse_2F_EventScript_1F952F:: @ 81F952F - goto_if_set FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_1F954A - msgbox LittlerootTown_BrendansHouse_2F_Text_1F9B0D, MSGBOX_DEFAULT +RivalsHouse_2F_EventScript_BrendanPostLilycove:: @ 81F952F + goto_if_set FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE, RivalsHouse_2F_EventScript_BrendanWhereShouldIGoNext + msgbox RivalsHouse_2F_Text_BrendanJustCheckingMyPokedex, MSGBOX_DEFAULT return -LittlerootTown_BrendansHouse_2F_EventScript_1F9541:: @ 81F9541 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F9A9E, MSGBOX_DEFAULT +RivalsHouse_2F_EventScript_MayWhereShouldIGoNext:: @ 81F9541 + msgbox RivalsHouse_2F_Text_MayWhereShouldIGoNext, MSGBOX_DEFAULT return -LittlerootTown_BrendansHouse_2F_EventScript_1F954A:: @ 81F954A - msgbox LittlerootTown_BrendansHouse_2F_Text_1F9BE7, MSGBOX_DEFAULT +RivalsHouse_2F_EventScript_BrendanWhereShouldIGoNext:: @ 81F954A + msgbox RivalsHouse_2F_Text_BrendanWhereShouldIGoNext, MSGBOX_DEFAULT return -EventScript_PlayerPCFemale:: @ 81F9553 +LittlerootTown_MaysHouse_2F_EventScript_PC:: @ 81F9553 lockall checkplayergender compare VAR_RESULT, MALE - goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F956C + goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_CheckRivalsPC compare VAR_RESULT, FEMALE - goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9576 + goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_CheckPlayersPC end -LittlerootTown_MaysHouse_2F_EventScript_1F956C:: @ 81F956C +LittlerootTown_MaysHouse_2F_EventScript_CheckRivalsPC:: @ 81F956C msgbox gText_PokemonTrainerSchoolEmail, MSGBOX_DEFAULT releaseall end -LittlerootTown_MaysHouse_2F_EventScript_1F9576:: @ 81F9576 +LittlerootTown_MaysHouse_2F_EventScript_CheckPlayersPC:: @ 81F9576 setvar VAR_0x8004, 2 special DoPCTurnOnEffect playse SE_PC_ON @@ -321,14 +320,14 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9576:: @ 81F9576 releaseall end -LittlerootTown_MaysHouse_2F_EventScript_1F958F:: @ 81F958F +LittlerootTown_MaysHouse_2F_EventScript_TurnOffPlayerPC:: @ 81F958F setvar VAR_0x8004, 2 playse SE_PC_OFF special DoPCTurnOffEffect releaseall end -LittlerootTown_MaysHouse_2F_Text_1F959C: @ 81F959C +RivalsHouse_2F_Text_MayWhoAreYou: @ 81F959C .string "Huh?\n" .string "Who… Who are you?\p" .string "… … … … … … … …\n" @@ -352,11 +351,11 @@ LittlerootTown_MaysHouse_2F_Text_1F959C: @ 81F959C .string "some wild POKéMON!\p" .string "{PLAYER}{KUN}, I'll catch you later!$" -LittlerootTown_BrendansHouse_2F_Text_1F978A: @ 81F978A +RivalsHouse_2F_Text_MayGettingReady: @ 81F978A .string "POKéMON fully restored!\n" .string "Items ready, and…$" -LittlerootTown_BrendansHouse_2F_Text_1F97B4: @ 81F97B4 +RivalsHouse_2F_Text_BrendanWhoAreYou: @ 81F97B4 .string "Hey!\n" .string "You…\p" .string "Who are you?\p" @@ -376,16 +375,15 @@ LittlerootTown_BrendansHouse_2F_Text_1F97B4: @ 81F97B4 .string "some wild POKéMON.\p" .string "Some other time, okay?$" -LittlerootTown_BrendansHouse_2F_Text_1F9962: @ 81F9962 +RivalsHouse_2F_Text_BrendanGettingReady: @ 81F9962 .string "POKéMON fully restored…\n" .string "Items all packed, and…$" -LittlerootTown_BrendansHouse_2F_Text_1F9991: @ 81F9991 -LittlerootTown_MaysHouse_2F_Text_1F9991: @ 81F9991 +RivalsHouse_2F_Text_ItsRivalsPokeBall: @ 81F9991 .string "It's {RIVAL}'s POKé BALL!\p" .string "Better leave it right where it is.$" -LittlerootTown_BrendansHouse_2F_Text_1F99C9: @ 81F99C9 +RivalsHouse_2F_Text_MayJustCheckingMyPokedex: @ 81F99C9 .string "MAY: {PLAYER}{KUN}!\p" .string "I was just checking my POKéDEX.\p" .string "There's still a lot of POKéMON that\n" @@ -395,13 +393,13 @@ LittlerootTown_BrendansHouse_2F_Text_1F99C9: @ 81F99C9 .string "I wonder where I should go catch\n" .string "some POKéMON next?$" -LittlerootTown_BrendansHouse_2F_Text_1F9A9E: @ 81F9A9E +RivalsHouse_2F_Text_MayWhereShouldIGoNext: @ 81F9A9E .string "MAY: I wonder where I should go catch\n" .string "some POKéMON next?\p" .string "Wouldn't it be funny if we ran into each\n" .string "other, {PLAYER}{KUN}?$" -LittlerootTown_BrendansHouse_2F_Text_1F9B0D: @ 81F9B0D +RivalsHouse_2F_Text_BrendanJustCheckingMyPokedex: @ 81F9B0D .string "BRENDAN: Hey, it's {PLAYER}.\p" .string "I was just checking out my POKéDEX.\p" .string "There are still many POKéMON that\n" @@ -410,7 +408,7 @@ LittlerootTown_BrendansHouse_2F_Text_1F9B0D: @ 81F9B0D .string "Checking this POKéDEX out gives me\n" .string "the urge to hit the road again.$" -LittlerootTown_BrendansHouse_2F_Text_1F9BE7: @ 81F9BE7 +RivalsHouse_2F_Text_BrendanWhereShouldIGoNext: @ 81F9BE7 .string "BRENDAN: I'm having a hard time deciding\n" .string "where I should catch POKéMON next.\p" .string "Hey, {PLAYER}, if I see you while I'm out\n" diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index 283be0477..f9c4b46d7 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -366,7 +366,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA0CC:: @ 81FA0CC end LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2:: @ 81FA0F2 - call LittlerootTown_ProfessorBirchsLab_EventScript_2737A0 + call Common_EventScript_TransferredToPC goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD end @@ -411,7 +411,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA16D:: @ 81FA16D end LittlerootTown_ProfessorBirchsLab_EventScript_1FA193:: @ 81FA193 - call LittlerootTown_ProfessorBirchsLab_EventScript_2737A0 + call Common_EventScript_TransferredToPC goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E end @@ -456,7 +456,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA20E:: @ 81FA20E end LittlerootTown_ProfessorBirchsLab_EventScript_1FA234:: @ 81FA234 - call LittlerootTown_ProfessorBirchsLab_EventScript_2737A0 + call Common_EventScript_TransferredToPC goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F end diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/map.json b/data/maps/MauvilleCity_PokemonCenter_1F/map.json index c024c2cba..c5fd1b32f 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/map.json +++ b/data/maps/MauvilleCity_PokemonCenter_1F/map.json @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_PokemonCenter_1F_EventScript_28E066", + "script": "MauvilleCity_PokemonCenter_1F_EventScript_MauvilleOldMan", "flag": "0" }, { diff --git a/data/maps/MirageTower_2F/scripts.inc b/data/maps/MirageTower_2F/scripts.inc index 2ccf628c0..888288633 100644 --- a/data/maps/MirageTower_2F/scripts.inc +++ b/data/maps/MirageTower_2F/scripts.inc @@ -5,7 +5,7 @@ MirageTower_2F_MapScripts:: @ 823AD11 .byte 0 MirageTower_2F_SetHoleWarp: @ 823AD21 - setstepcallback 7 + setstepcallback STEP_CB_CRACKED_FLOOR setholewarp MAP_MIRAGE_TOWER_1F, 255, 0, 0 end diff --git a/data/maps/MirageTower_3F/scripts.inc b/data/maps/MirageTower_3F/scripts.inc index 854619f1c..a54b2ccca 100644 --- a/data/maps/MirageTower_3F/scripts.inc +++ b/data/maps/MirageTower_3F/scripts.inc @@ -5,7 +5,7 @@ MirageTower_3F_MapScripts:: @ 823AD2C .byte 0 MirageTower_3F_SetHoleWarp: @ 823AD3C - setstepcallback 7 + setstepcallback STEP_CB_CRACKED_FLOOR setholewarp MAP_MIRAGE_TOWER_2F, 255, 0, 0 end diff --git a/data/maps/MossdeepCity_Gym/map.json b/data/maps/MossdeepCity_Gym/map.json index 2d86ad9a8..33bd1d434 100644 --- a/data/maps/MossdeepCity_Gym/map.json +++ b/data/maps/MossdeepCity_Gym/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_Gym_EventScript_220898", + "script": "MossdeepCity_Gym_EventScript_TateAndLiza", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "MossdeepCity_Gym_EventScript_220AFD", + "script": "MossdeepCity_Gym_EventScript_Preston", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "MossdeepCity_Gym_EventScript_220B2B", + "script": "MossdeepCity_Gym_EventScript_Blake", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "MossdeepCity_Gym_EventScript_220B70", + "script": "MossdeepCity_Gym_EventScript_Maura", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "MossdeepCity_Gym_EventScript_220B59", + "script": "MossdeepCity_Gym_EventScript_Samantha", "flag": "0" }, { @@ -89,7 +89,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "MossdeepCity_Gym_EventScript_220B14", + "script": "MossdeepCity_Gym_EventScript_Virgil", "flag": "0" }, { @@ -102,7 +102,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "MossdeepCity_Gym_EventScript_220B42", + "script": "MossdeepCity_Gym_EventScript_Hannah", "flag": "0" }, { @@ -115,7 +115,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_Gym_EventScript_220C11", + "script": "MossdeepCity_Gym_EventScript_GymGuide", "flag": "0" }, { @@ -128,7 +128,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_Gym_EventScript_220898", + "script": "MossdeepCity_Gym_EventScript_TateAndLiza", "flag": "0" }, { @@ -232,7 +232,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "MossdeepCity_Gym_EventScript_220B9E", + "script": "MossdeepCity_Gym_EventScript_Nate", "flag": "0" }, { @@ -245,7 +245,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "MossdeepCity_Gym_EventScript_220B87", + "script": "MossdeepCity_Gym_EventScript_Sylvia", "flag": "0" }, { @@ -336,7 +336,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "MossdeepCity_Gym_EventScript_220BCC", + "script": "MossdeepCity_Gym_EventScript_Clifford", "flag": "0" }, { @@ -362,7 +362,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "MossdeepCity_Gym_EventScript_220BB5", + "script": "MossdeepCity_Gym_EventScript_Macey", "flag": "0" }, { @@ -375,7 +375,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "MossdeepCity_Gym_EventScript_220BFA", + "script": "MossdeepCity_Gym_EventScript_Kathleen", "flag": "0" }, { @@ -427,7 +427,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "MossdeepCity_Gym_EventScript_220BE3", + "script": "MossdeepCity_Gym_EventScript_Nicholas", "flag": "0" }, { @@ -591,7 +591,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "MossdeepCity_Gym_EventScript_220C67" + "script": "MossdeepCity_Gym_EventScript_YellowFloorSwitch" }, { "type": "trigger", @@ -600,7 +600,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "MossdeepCity_Gym_EventScript_220C7D" + "script": "MossdeepCity_Gym_EventScript_BlueFloorSwitch" }, { "type": "trigger", @@ -609,7 +609,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "MossdeepCity_Gym_EventScript_220C7D" + "script": "MossdeepCity_Gym_EventScript_BlueFloorSwitch" }, { "type": "trigger", @@ -618,7 +618,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "MossdeepCity_Gym_EventScript_220C93" + "script": "MossdeepCity_Gym_EventScript_GreenFloorSwitch" }, { "type": "trigger", @@ -627,7 +627,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "MossdeepCity_Gym_EventScript_220CA9" + "script": "MossdeepCity_Gym_EventScript_PurpleFloorSwitch" }, { "type": "trigger", @@ -636,7 +636,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "MossdeepCity_Gym_EventScript_220CA9" + "script": "MossdeepCity_Gym_EventScript_PurpleFloorSwitch" }, { "type": "trigger", @@ -645,7 +645,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "MossdeepCity_Gym_EventScript_220CBF" + "script": "MossdeepCity_Gym_EventScript_RedFloorSwitch" }, { "type": "trigger", @@ -654,7 +654,7 @@ "elevation": 0, "var": "VAR_TEMP_1", "var_value": "0", - "script": "MossdeepCity_Gym_EventScript_220AF1" + "script": "MossdeepCity_Gym_EventScript_WarpToEntrance" }, { "type": "trigger", @@ -663,7 +663,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "MossdeepCity_Gym_EventScript_220C67" + "script": "MossdeepCity_Gym_EventScript_YellowFloorSwitch" } ], "bg_events": [ @@ -673,7 +673,7 @@ "y": 34, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "MossdeepCity_Gym_EventScript_220C33" + "script": "MossdeepCity_Gym_EventScript_LeftGymStatue" }, { "type": "sign", @@ -681,7 +681,7 @@ "y": 34, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "MossdeepCity_Gym_EventScript_220C43" + "script": "MossdeepCity_Gym_EventScript_RightGymStatue" } ] }
\ No newline at end of file diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc index 0b0bed197..fc6a45d84 100644 --- a/data/maps/MossdeepCity_Gym/scripts.inc +++ b/data/maps/MossdeepCity_Gym/scripts.inc @@ -1,64 +1,68 @@ MossdeepCity_Gym_MapScripts:: @ 8220800 - map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_Gym_MapScript1_220806 + map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_Gym_OnLoad .byte 0 -MossdeepCity_Gym_MapScript1_220806: @ 8220806 - goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_1, MossdeepCity_Gym_EventScript_22083D - goto MossdeepCity_Gym_EventScript_220815 +@ NOTE: Mossdeep Gym was redesigned between R/S and E. Leftover (and now functionally unused) scripts are commented below + +@ All the below checks are leftover from RS. FLAG_MOSSDEEP_GYM_SWITCH_X is never set +MossdeepCity_Gym_OnLoad: @ 8220806 + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_1, MossdeepCity_Gym_EventScript_SetSwitch1Metatiles + goto MossdeepCity_Gym_EventScript_CheckSwitch2 end -MossdeepCity_Gym_EventScript_220815:: @ 8220815 - goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_2, MossdeepCity_Gym_EventScript_220855 - goto MossdeepCity_Gym_EventScript_220824 +MossdeepCity_Gym_EventScript_CheckSwitch2:: @ 8220815 + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_2, MossdeepCity_Gym_EventScript_SetSwitch2Metatiles + goto MossdeepCity_Gym_EventScript_CheckSwitch3 end -MossdeepCity_Gym_EventScript_220824:: @ 8220824 - goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_3, MossdeepCity_Gym_EventScript_22086D - goto MossdeepCity_Gym_EventScript_220833 +MossdeepCity_Gym_EventScript_CheckSwitch3:: @ 8220824 + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_3, MossdeepCity_Gym_EventScript_SetSwitch3Metatiles + goto MossdeepCity_Gym_EventScript_CheckSwitch4 end -MossdeepCity_Gym_EventScript_220833:: @ 8220833 - goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_4, MossdeepCity_Gym_EventScript_220885 +MossdeepCity_Gym_EventScript_CheckSwitch4:: @ 8220833 + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_4, MossdeepCity_Gym_EventScript_SetSwitch4Metatiles end -MossdeepCity_Gym_EventScript_22083D:: @ 822083D - setmetatile 5, 5, METATILE_MossdeepGym_Obelisk_Top, 0 - setmetatile 2, 7, METATILE_MossdeepGym_Empty1, 1 - goto MossdeepCity_Gym_EventScript_220815 +@ All the below set metatile scripts are leftover from RS and are functionally unused +MossdeepCity_Gym_EventScript_SetSwitch1Metatiles:: @ 822083D + setmetatile 5, 5, METATILE_RS_MossdeepGym_RedArrow_Right, 0 + setmetatile 2, 7, METATILE_RS_MossdeepGym_Switch_Down, 1 + goto MossdeepCity_Gym_EventScript_CheckSwitch2 end -MossdeepCity_Gym_EventScript_220855:: @ 8220855 - setmetatile 8, 14, METATILE_MossdeepGym_Obelisk_Top, 0 - setmetatile 8, 10, METATILE_MossdeepGym_Empty1, 1 - goto MossdeepCity_Gym_EventScript_220824 +MossdeepCity_Gym_EventScript_SetSwitch2Metatiles:: @ 8220855 + setmetatile 8, 14, METATILE_RS_MossdeepGym_RedArrow_Right, 0 + setmetatile 8, 10, METATILE_RS_MossdeepGym_Switch_Down, 1 + goto MossdeepCity_Gym_EventScript_CheckSwitch3 end -MossdeepCity_Gym_EventScript_22086D:: @ 822086D - setmetatile 15, 17, METATILE_MossdeepGym_Obelisk_Base, 0 - setmetatile 17, 15, METATILE_MossdeepGym_Empty1, 1 - goto MossdeepCity_Gym_EventScript_220833 +MossdeepCity_Gym_EventScript_SetSwitch3Metatiles:: @ 822086D + setmetatile 15, 17, METATILE_RS_MossdeepGym_RedArrow_Left, 0 + setmetatile 17, 15, METATILE_RS_MossdeepGym_Switch_Down, 1 + goto MossdeepCity_Gym_EventScript_CheckSwitch4 end -MossdeepCity_Gym_EventScript_220885:: @ 8220885 - setmetatile 1, 23, METATILE_MossdeepGym_Wall_LeftCorner, 0 - setmetatile 5, 24, METATILE_MossdeepGym_Empty1, 1 +MossdeepCity_Gym_EventScript_SetSwitch4Metatiles:: @ 8220885 + setmetatile 1, 23, METATILE_RS_MossdeepGym_RedArrow_Up, 0 + setmetatile 5, 24, METATILE_RS_MossdeepGym_Switch_Down, 1 end -MossdeepCity_Gym_EventScript_220898:: @ 8220898 - trainerbattle_double TRAINER_TATE_AND_LIZA_1, MossdeepCity_Gym_Text_221783, MossdeepCity_Gym_Text_2218EC, MossdeepCity_Gym_Text_221BCE, MossdeepCity_Gym_EventScript_2208D1, NO_MUSIC +MossdeepCity_Gym_EventScript_TateAndLiza:: @ 8220898 + trainerbattle_double TRAINER_TATE_AND_LIZA_1, MossdeepCity_Gym_Text_TateAndLizaPreBattle, MossdeepCity_Gym_Text_TateAndLizaDefeat, MossdeepCity_Gym_Text_TateAndLizaNeedTwoMons, MossdeepCity_Gym_EventScript_TateAndLizaDefeated, NO_MUSIC specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq MossdeepCity_Gym_EventScript_22097E - goto_if_unset FLAG_RECEIVED_TM04, MossdeepCity_Gym_EventScript_220937 - msgbox MossdeepCity_Gym_Text_221B1D, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq MossdeepCity_Gym_EventScript_TateAndLizaRematch + goto_if_unset FLAG_RECEIVED_TM04, MossdeepCity_Gym_EventScript_GiveCalmMind2 + msgbox MossdeepCity_Gym_Text_TateAndLizaPostBattle, MSGBOX_DEFAULT release end -MossdeepCity_Gym_EventScript_2208D1:: @ 82208D1 - message MossdeepCity_Gym_Text_22196A +MossdeepCity_Gym_EventScript_TateAndLizaDefeated:: @ 82208D1 + message MossdeepCity_Gym_Text_ReceivedMindBadge waitmessage call Common_EventScript_PlayGymBadgeFanfare - msgbox MossdeepCity_Gym_Text_221999, MSGBOX_DEFAULT + msgbox MossdeepCity_Gym_Text_ExplainMindBadgeTakeThis, MSGBOX_DEFAULT setflag FLAG_DEFEATED_MOSSDEEP_GYM setflag FLAG_BADGE07_GET setflag FLAG_HIDE_AQUA_HIDEOUT_GRUNTS @@ -74,11 +78,11 @@ MossdeepCity_Gym_EventScript_2208D1:: @ 82208D1 setvar VAR_MOSSDEEP_CITY_STATE, 1 setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_STEVEN setvar VAR_MOSSDEEP_SPACE_CENTER_STATE_2, 1 - call MossdeepCity_Gym_EventScript_22095B + call MossdeepCity_Gym_EventScript_GiveCalmMind closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox MossdeepCity_Gym_Text_221AEA, MSGBOX_DEFAULT + msgbox MossdeepCity_Gym_Text_RegisteredTateAndLiza, MSGBOX_DEFAULT waitfanfare closemessage delay 30 @@ -86,282 +90,284 @@ MossdeepCity_Gym_EventScript_2208D1:: @ 82208D1 release end -MossdeepCity_Gym_EventScript_220937:: @ 8220937 +MossdeepCity_Gym_EventScript_GiveCalmMind2:: @ 8220937 giveitem_std ITEM_TM04 compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull - msgbox MossdeepCity_Gym_Text_221A40, MSGBOX_DEFAULT + msgbox MossdeepCity_Gym_Text_ExplainCalmMind, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM04 release end -MossdeepCity_Gym_EventScript_22095B:: @ 822095B +MossdeepCity_Gym_EventScript_GiveCalmMind:: @ 822095B giveitem_std ITEM_TM04 compare VAR_RESULT, 0 goto_if_eq Common_EventScript_BagIsFull - msgbox MossdeepCity_Gym_Text_221A40, MSGBOX_DEFAULT + msgbox MossdeepCity_Gym_Text_ExplainCalmMind, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM04 return -MossdeepCity_Gym_EventScript_22097E:: @ 822097E - trainerbattle_rematch_double TRAINER_TATE_AND_LIZA_1, MossdeepCity_Gym_Text_221D0B, MossdeepCity_Gym_Text_221E05, MossdeepCity_Gym_Text_221EB8 - msgbox MossdeepCity_Gym_Text_221E45, MSGBOX_AUTOCLOSE +MossdeepCity_Gym_EventScript_TateAndLizaRematch:: @ 822097E + trainerbattle_rematch_double TRAINER_TATE_AND_LIZA_1, MossdeepCity_Gym_Text_TateAndLizaPreRematch, MossdeepCity_Gym_Text_TateAndLizaRematchDefeat, MossdeepCity_Gym_Text_TateAndLizaRematchNeedTwoMons + msgbox MossdeepCity_Gym_Text_TateAndLizaPostRematch, MSGBOX_AUTOCLOSE end -MossdeepCity_Gym_EventScript_220999:: @ 8220999 +@ All the below switch scripts are leftover from RS and are functionally unused +MossdeepCity_Gym_EventScript_Switch1:: @ 8220999 lockall - goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_1, MossdeepCity_Gym_EventScript_2209D0 + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_1, MossdeepCity_Gym_EventScript_ClearSwitch1 setflag FLAG_MOSSDEEP_GYM_SWITCH_1 - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30 + applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse waitmovement 0 - setmetatile 5, 5, METATILE_MossdeepGym_Obelisk_Top, 0 - setmetatile 2, 7, METATILE_MossdeepGym_Empty1, 1 - goto MossdeepCity_Gym_EventScript_2209C8 + setmetatile 5, 5, METATILE_RS_MossdeepGym_RedArrow_Right, 0 + setmetatile 2, 7, METATILE_RS_MossdeepGym_Switch_Down, 1 + goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed end -MossdeepCity_Gym_EventScript_2209C8:: @ 82209C8 +MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed:: @ 82209C8 special DrawWholeMapView playse SE_TK_KASYA releaseall end -MossdeepCity_Gym_EventScript_2209D0:: @ 82209D0 +MossdeepCity_Gym_EventScript_ClearSwitch1:: @ 82209D0 clearflag FLAG_MOSSDEEP_GYM_SWITCH_1 - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30 + applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse waitmovement 0 - setmetatile 5, 5, METATILE_MossdeepGym_Obelisk_Base, 0 - setmetatile 2, 7, METATILE_MossdeepGym_Empty0, 1 - goto MossdeepCity_Gym_EventScript_2209C8 + setmetatile 5, 5, METATILE_RS_MossdeepGym_RedArrow_Left, 0 + setmetatile 2, 7, METATILE_RS_MossdeepGym_Switch_Up, 1 + goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed end -MossdeepCity_Gym_EventScript_2209F5:: @ 82209F5 +MossdeepCity_Gym_EventScript_Switch2:: @ 82209F5 lockall - goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_2, MossdeepCity_Gym_EventScript_220A24 + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_2, MossdeepCity_Gym_EventScript_ClearSwitch2 setflag FLAG_MOSSDEEP_GYM_SWITCH_2 - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30 + applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse waitmovement 0 - setmetatile 8, 14, METATILE_MossdeepGym_Obelisk_Top, 0 - setmetatile 8, 10, METATILE_MossdeepGym_Empty1, 1 - goto MossdeepCity_Gym_EventScript_2209C8 + setmetatile 8, 14, METATILE_RS_MossdeepGym_RedArrow_Right, 0 + setmetatile 8, 10, METATILE_RS_MossdeepGym_Switch_Down, 1 + goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed end -MossdeepCity_Gym_EventScript_220A24:: @ 8220A24 +MossdeepCity_Gym_EventScript_ClearSwitch2:: @ 8220A24 clearflag FLAG_MOSSDEEP_GYM_SWITCH_2 - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30 + applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse waitmovement 0 - setmetatile 8, 14, METATILE_MossdeepGym_OuterWall_RightCorner, 0 - setmetatile 8, 10, METATILE_MossdeepGym_Empty0, 1 - goto MossdeepCity_Gym_EventScript_2209C8 + setmetatile 8, 14, METATILE_RS_MossdeepGym_RedArrow_Down, 0 + setmetatile 8, 10, METATILE_RS_MossdeepGym_Switch_Up, 1 + goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed end -MossdeepCity_Gym_EventScript_220A49:: @ 8220A49 +MossdeepCity_Gym_EventScript_Switch3:: @ 8220A49 lockall - goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_3, MossdeepCity_Gym_EventScript_220A78 + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_3, MossdeepCity_Gym_EventScript_ClearSwitch3 setflag FLAG_MOSSDEEP_GYM_SWITCH_3 - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30 + applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse waitmovement 0 - setmetatile 15, 17, METATILE_MossdeepGym_Obelisk_Base, 0 - setmetatile 17, 15, METATILE_MossdeepGym_Empty1, 1 - goto MossdeepCity_Gym_EventScript_2209C8 + setmetatile 15, 17, METATILE_RS_MossdeepGym_RedArrow_Left, 0 + setmetatile 17, 15, METATILE_RS_MossdeepGym_Switch_Down, 1 + goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed end -MossdeepCity_Gym_EventScript_220A78:: @ 8220A78 +MossdeepCity_Gym_EventScript_ClearSwitch3:: @ 8220A78 clearflag FLAG_MOSSDEEP_GYM_SWITCH_3 - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30 + applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse waitmovement 0 - setmetatile 15, 17, METATILE_MossdeepGym_Obelisk_Top, 0 - setmetatile 17, 15, METATILE_MossdeepGym_Empty0, 1 - goto MossdeepCity_Gym_EventScript_2209C8 + setmetatile 15, 17, METATILE_RS_MossdeepGym_RedArrow_Right, 0 + setmetatile 17, 15, METATILE_RS_MossdeepGym_Switch_Up, 1 + goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed end -MossdeepCity_Gym_EventScript_220A9D:: @ 8220A9D +MossdeepCity_Gym_EventScript_Switch4:: @ 8220A9D lockall - goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_4, MossdeepCity_Gym_EventScript_220ACC + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_4, MossdeepCity_Gym_EventScript_ClearSwitch4 setflag FLAG_MOSSDEEP_GYM_SWITCH_4 - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30 + applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse waitmovement 0 - setmetatile 1, 23, METATILE_MossdeepGym_Wall_LeftCorner, 0 - setmetatile 5, 24, METATILE_MossdeepGym_Empty1, 1 - goto MossdeepCity_Gym_EventScript_2209C8 + setmetatile 1, 23, METATILE_RS_MossdeepGym_RedArrow_Up, 0 + setmetatile 5, 24, METATILE_RS_MossdeepGym_Switch_Down, 1 + goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed end -MossdeepCity_Gym_EventScript_220ACC:: @ 8220ACC +MossdeepCity_Gym_EventScript_ClearSwitch4:: @ 8220ACC clearflag FLAG_MOSSDEEP_GYM_SWITCH_4 - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30 + applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse waitmovement 0 - setmetatile 1, 23, METATILE_MossdeepGym_Obelisk_Top, 0 - setmetatile 5, 24, METATILE_MossdeepGym_Empty0, 1 - goto MossdeepCity_Gym_EventScript_2209C8 + setmetatile 1, 23, METATILE_RS_MossdeepGym_RedArrow_Right, 0 + setmetatile 5, 24, METATILE_RS_MossdeepGym_Switch_Up, 1 + goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed end -MossdeepCity_Gym_EventScript_220AF1:: @ 8220AF1 +MossdeepCity_Gym_EventScript_WarpToEntrance:: @ 8220AF1 lockall - warp7 MAP_MOSSDEEP_CITY_GYM, 255, 7, 30 + warpmossdeepgym MAP_MOSSDEEP_CITY_GYM, 255, 7, 30 waitstate releaseall end -MossdeepCity_Gym_EventScript_220AFD:: @ 8220AFD - trainerbattle_single TRAINER_PRESTON, MossdeepCity_Gym_Text_220E5C, MossdeepCity_Gym_Text_220EAC - msgbox MossdeepCity_Gym_Text_220ED3, MSGBOX_AUTOCLOSE +MossdeepCity_Gym_EventScript_Preston:: @ 8220AFD + trainerbattle_single TRAINER_PRESTON, MossdeepCity_Gym_Text_PrestonPreBattle, MossdeepCity_Gym_Text_PrestonDefeat + msgbox MossdeepCity_Gym_Text_PrestonPostBattle, MSGBOX_AUTOCLOSE end -MossdeepCity_Gym_EventScript_220B14:: @ 8220B14 - trainerbattle_single TRAINER_VIRGIL, MossdeepCity_Gym_Text_220F02, MossdeepCity_Gym_Text_220F1A - msgbox MossdeepCity_Gym_Text_220F3A, MSGBOX_AUTOCLOSE +MossdeepCity_Gym_EventScript_Virgil:: @ 8220B14 + trainerbattle_single TRAINER_VIRGIL, MossdeepCity_Gym_Text_VirgilPreBattle, MossdeepCity_Gym_Text_VirgilDefeat + msgbox MossdeepCity_Gym_Text_VirgilPostBattle, MSGBOX_AUTOCLOSE end -MossdeepCity_Gym_EventScript_220B2B:: @ 8220B2B - trainerbattle_single TRAINER_BLAKE, MossdeepCity_Gym_Text_220FB0, MossdeepCity_Gym_Text_221024 - msgbox MossdeepCity_Gym_Text_221055, MSGBOX_AUTOCLOSE +MossdeepCity_Gym_EventScript_Blake:: @ 8220B2B + trainerbattle_single TRAINER_BLAKE, MossdeepCity_Gym_Text_BlakePreBattle, MossdeepCity_Gym_Text_BlakeDefeat + msgbox MossdeepCity_Gym_Text_BlakePostBattle, MSGBOX_AUTOCLOSE end -MossdeepCity_Gym_EventScript_220B42:: @ 8220B42 - trainerbattle_single TRAINER_HANNAH, MossdeepCity_Gym_Text_2210EE, MossdeepCity_Gym_Text_221152 - msgbox MossdeepCity_Gym_Text_22116A, MSGBOX_AUTOCLOSE +MossdeepCity_Gym_EventScript_Hannah:: @ 8220B42 + trainerbattle_single TRAINER_HANNAH, MossdeepCity_Gym_Text_HannahPreBattle, MossdeepCity_Gym_Text_HannahDefeat + msgbox MossdeepCity_Gym_Text_HannahPostBattle, MSGBOX_AUTOCLOSE end -MossdeepCity_Gym_EventScript_220B59:: @ 8220B59 - trainerbattle_single TRAINER_SAMANTHA, MossdeepCity_Gym_Text_2211E2, MossdeepCity_Gym_Text_221230 - msgbox MossdeepCity_Gym_Text_22123D, MSGBOX_AUTOCLOSE +MossdeepCity_Gym_EventScript_Samantha:: @ 8220B59 + trainerbattle_single TRAINER_SAMANTHA, MossdeepCity_Gym_Text_SamanthaPreBattle, MossdeepCity_Gym_Text_SamanthaDefeat + msgbox MossdeepCity_Gym_Text_SamanthaPostBattle, MSGBOX_AUTOCLOSE end -MossdeepCity_Gym_EventScript_220B70:: @ 8220B70 - trainerbattle_single TRAINER_MAURA, MossdeepCity_Gym_Text_2212A6, MossdeepCity_Gym_Text_221309 - msgbox MossdeepCity_Gym_Text_22132E, MSGBOX_AUTOCLOSE +MossdeepCity_Gym_EventScript_Maura:: @ 8220B70 + trainerbattle_single TRAINER_MAURA, MossdeepCity_Gym_Text_MauraPreBattle, MossdeepCity_Gym_Text_MauraDefeat + msgbox MossdeepCity_Gym_Text_MauraPostBattle, MSGBOX_AUTOCLOSE end -MossdeepCity_Gym_EventScript_220B87:: @ 8220B87 - trainerbattle_single TRAINER_SYLVIA, MossdeepCity_Gym_Text_2213C2, MossdeepCity_Gym_Text_2213F4 - msgbox MossdeepCity_Gym_Text_221412, MSGBOX_AUTOCLOSE +MossdeepCity_Gym_EventScript_Sylvia:: @ 8220B87 + trainerbattle_single TRAINER_SYLVIA, MossdeepCity_Gym_Text_SylviaPreBattle, MossdeepCity_Gym_Text_SylviaDefeat + msgbox MossdeepCity_Gym_Text_SylviaPostBattle, MSGBOX_AUTOCLOSE end -MossdeepCity_Gym_EventScript_220B9E:: @ 8220B9E - trainerbattle_single TRAINER_NATE, MossdeepCity_Gym_Text_221460, MossdeepCity_Gym_Text_2214A7 - msgbox MossdeepCity_Gym_Text_2214D3, MSGBOX_AUTOCLOSE +MossdeepCity_Gym_EventScript_Nate:: @ 8220B9E + trainerbattle_single TRAINER_NATE, MossdeepCity_Gym_Text_NatePreBattle, MossdeepCity_Gym_Text_NateDefeat + msgbox MossdeepCity_Gym_Text_NatePostBattle, MSGBOX_AUTOCLOSE end -MossdeepCity_Gym_EventScript_220BB5:: @ 8220BB5 - trainerbattle_single TRAINER_MACEY, MossdeepCity_Gym_Text_22161B, MossdeepCity_Gym_Text_221658 - msgbox MossdeepCity_Gym_Text_221680, MSGBOX_AUTOCLOSE +MossdeepCity_Gym_EventScript_Macey:: @ 8220BB5 + trainerbattle_single TRAINER_MACEY, MossdeepCity_Gym_Text_MaceyPreBattle, MossdeepCity_Gym_Text_MaceyDefeat + msgbox MossdeepCity_Gym_Text_MaceyPostBattle, MSGBOX_AUTOCLOSE end -MossdeepCity_Gym_EventScript_220BCC:: @ 8220BCC - trainerbattle_single TRAINER_CLIFFORD, MossdeepCity_Gym_Text_22157C, MossdeepCity_Gym_Text_2215B8 - msgbox MossdeepCity_Gym_Text_2215E2, MSGBOX_AUTOCLOSE +MossdeepCity_Gym_EventScript_Clifford:: @ 8220BCC + trainerbattle_single TRAINER_CLIFFORD, MossdeepCity_Gym_Text_CliffordPreBattle, MossdeepCity_Gym_Text_CliffordDefeat + msgbox MossdeepCity_Gym_Text_CliffordPostBattle, MSGBOX_AUTOCLOSE end -MossdeepCity_Gym_EventScript_220BE3:: @ 8220BE3 - trainerbattle_single TRAINER_NICHOLAS, MossdeepCity_Gym_Text_2216EE, MossdeepCity_Gym_Text_22172D - msgbox MossdeepCity_Gym_Text_22173A, MSGBOX_AUTOCLOSE +MossdeepCity_Gym_EventScript_Nicholas:: @ 8220BE3 + trainerbattle_single TRAINER_NICHOLAS, MossdeepCity_Gym_Text_NicholasPreBattle, MossdeepCity_Gym_Text_NicholasDefeat + msgbox MossdeepCity_Gym_Text_NicholasPostBattle, MSGBOX_AUTOCLOSE end -MossdeepCity_Gym_EventScript_220BFA:: @ 8220BFA - trainerbattle_single TRAINER_KATHLEEN, MossdeepCity_Gym_Text_221507, MossdeepCity_Gym_Text_22153B - msgbox MossdeepCity_Gym_Text_221545, MSGBOX_AUTOCLOSE +MossdeepCity_Gym_EventScript_Kathleen:: @ 8220BFA + trainerbattle_single TRAINER_KATHLEEN, MossdeepCity_Gym_Text_KathleenPreBattle, MossdeepCity_Gym_Text_KathleenDefeat + msgbox MossdeepCity_Gym_Text_KathleenPostBattle, MSGBOX_AUTOCLOSE end -MossdeepCity_Gym_EventScript_220C11:: @ 8220C11 +MossdeepCity_Gym_EventScript_GymGuide:: @ 8220C11 lock faceplayer - goto_if_set FLAG_DEFEATED_MOSSDEEP_GYM, MossdeepCity_Gym_EventScript_220C26 - msgbox MossdeepCity_Gym_Text_220CD5, MSGBOX_DEFAULT + goto_if_set FLAG_DEFEATED_MOSSDEEP_GYM, MossdeepCity_Gym_EventScript_GymGuidePostVictory + msgbox MossdeepCity_Gym_Text_GymGuideAdvice, MSGBOX_DEFAULT release end -MossdeepCity_Gym_EventScript_220C26:: @ 8220C26 - msgbox MossdeepCity_Gym_Text_220E2A, MSGBOX_DEFAULT +MossdeepCity_Gym_EventScript_GymGuidePostVictory:: @ 8220C26 + msgbox MossdeepCity_Gym_Text_GymGuidePostVictory, MSGBOX_DEFAULT release end -MossdeepCity_Gym_Movement_220C30: @ 8220C30 +@ Leftover from RS, functionally unused +MossdeepCity_Gym_Movement_WaitAfterSwitchUse: @ 8220C30 delay_16 delay_16 step_end -MossdeepCity_Gym_EventScript_220C33:: @ 8220C33 +MossdeepCity_Gym_EventScript_LeftGymStatue:: @ 8220C33 lockall - goto_if_set FLAG_BADGE07_GET, MossdeepCity_Gym_EventScript_220C53 - goto MossdeepCity_Gym_EventScript_220C5D + goto_if_set FLAG_BADGE07_GET, MossdeepCity_Gym_EventScript_GymStatueCertified + goto MossdeepCity_Gym_EventScript_GymStatue end -MossdeepCity_Gym_EventScript_220C43:: @ 8220C43 +MossdeepCity_Gym_EventScript_RightGymStatue:: @ 8220C43 lockall - goto_if_set FLAG_BADGE07_GET, MossdeepCity_Gym_EventScript_220C53 - goto MossdeepCity_Gym_EventScript_220C5D + goto_if_set FLAG_BADGE07_GET, MossdeepCity_Gym_EventScript_GymStatueCertified + goto MossdeepCity_Gym_EventScript_GymStatue end -MossdeepCity_Gym_EventScript_220C53:: @ 8220C53 - msgbox MossdeepCity_Gym_Text_221CCA, MSGBOX_DEFAULT +MossdeepCity_Gym_EventScript_GymStatueCertified:: @ 8220C53 + msgbox MossdeepCity_Gym_Text_GymStatueCertified, MSGBOX_DEFAULT releaseall end -MossdeepCity_Gym_EventScript_220C5D:: @ 8220C5D - msgbox MossdeepCity_Gym_Text_221CB0, MSGBOX_DEFAULT +MossdeepCity_Gym_EventScript_GymStatue:: @ 8220C5D + msgbox MossdeepCity_Gym_Text_GymStatue, MSGBOX_DEFAULT releaseall end -MossdeepCity_Gym_EventScript_220C67:: @ 8220C67 +MossdeepCity_Gym_EventScript_YellowFloorSwitch:: @ 8220C67 playse SE_MU_PACHI waitse playse SE_TU_SAA - mossdeepgym3 0 - mossdeepgym1 0 + initrotatingtilepuzzle FALSE + moverotatingtileobjects 0 waitmovement 0 - mossdeepgym2 + turnrotatingtileobjects waitmovement 0 - mossdeepgym4 + freerotatingtilepuzzle end -MossdeepCity_Gym_EventScript_220C7D:: @ 8220C7D +MossdeepCity_Gym_EventScript_BlueFloorSwitch:: @ 8220C7D playse SE_MU_PACHI waitse playse SE_TU_SAA - mossdeepgym3 0 - mossdeepgym1 1 + initrotatingtilepuzzle FALSE + moverotatingtileobjects 1 waitmovement 0 - mossdeepgym2 + turnrotatingtileobjects waitmovement 0 - mossdeepgym4 + freerotatingtilepuzzle end -MossdeepCity_Gym_EventScript_220C93:: @ 8220C93 +MossdeepCity_Gym_EventScript_GreenFloorSwitch:: @ 8220C93 playse SE_MU_PACHI waitse playse SE_TU_SAA - mossdeepgym3 0 - mossdeepgym1 2 + initrotatingtilepuzzle FALSE + moverotatingtileobjects 2 waitmovement 0 - mossdeepgym2 + turnrotatingtileobjects waitmovement 0 - mossdeepgym4 + freerotatingtilepuzzle end -MossdeepCity_Gym_EventScript_220CA9:: @ 8220CA9 +MossdeepCity_Gym_EventScript_PurpleFloorSwitch:: @ 8220CA9 playse SE_MU_PACHI waitse playse SE_TU_SAA - mossdeepgym3 0 - mossdeepgym1 3 + initrotatingtilepuzzle FALSE + moverotatingtileobjects 3 waitmovement 0 - mossdeepgym2 + turnrotatingtileobjects waitmovement 0 - mossdeepgym4 + freerotatingtilepuzzle end -MossdeepCity_Gym_EventScript_220CBF:: @ 8220CBF +MossdeepCity_Gym_EventScript_RedFloorSwitch:: @ 8220CBF playse SE_MU_PACHI waitse playse SE_TU_SAA - mossdeepgym3 0 - mossdeepgym1 4 + initrotatingtilepuzzle FALSE + moverotatingtileobjects 4 waitmovement 0 - mossdeepgym2 + turnrotatingtileobjects waitmovement 0 - mossdeepgym4 + freerotatingtilepuzzle end -MossdeepCity_Gym_Text_220CD5: @ 8220CD5 +MossdeepCity_Gym_Text_GymGuideAdvice: @ 8220CD5 .string "Yo, how's it going, CHAMPION-bound\n" .string "{PLAYER}?\p" .string "The GYM LEADERS here use\n" @@ -375,46 +381,46 @@ MossdeepCity_Gym_Text_220CD5: @ 8220CD5 .string "them how tight you are with your\l" .string "POKéMON. Go for it!$" -MossdeepCity_Gym_Text_220E2A: @ 8220E2A +MossdeepCity_Gym_Text_GymGuidePostVictory: @ 8220E2A .string "Wow, you're astounding!\n" .string "You're one great TRAINER!$" -MossdeepCity_Gym_Text_220E5C: @ 8220E5C +MossdeepCity_Gym_Text_PrestonPreBattle: @ 8220E5C .string "Battles hinge on the strength of your\n" .string "spirit! The weak-spirited will never win!$" -MossdeepCity_Gym_Text_220EAC: @ 8220EAC +MossdeepCity_Gym_Text_PrestonDefeat: @ 8220EAC .string "I lost!\n" .string "I must temper my spirit again!$" -MossdeepCity_Gym_Text_220ED3: @ 8220ED3 +MossdeepCity_Gym_Text_PrestonPostBattle: @ 8220ED3 .string "The indecisive lose.\n" .string "That's my warning to you.$" -MossdeepCity_Gym_Text_220F02: @ 8220F02 +MossdeepCity_Gym_Text_VirgilPreBattle: @ 8220F02 .string "Let me see your talent!$" -MossdeepCity_Gym_Text_220F1A: @ 8220F1A +MossdeepCity_Gym_Text_VirgilDefeat: @ 8220F1A .string "You possess spectacular talent!$" -MossdeepCity_Gym_Text_220F3A: @ 8220F3A +MossdeepCity_Gym_Text_VirgilPostBattle: @ 8220F3A .string "If there are prodigies in the world,\n" .string "then our GYM LEADERS are them!\p" .string "However, you may be even more talented\n" .string "than them…$" -MossdeepCity_Gym_Text_220FB0: @ 8220FB0 +MossdeepCity_Gym_Text_BlakePreBattle: @ 8220FB0 .string "Fufufufu… Watch me levitate a POKé\n" .string "BALL telekinetically!\p" .string "Wrooooooooaaaar!\n" .string "… … … … … … …\p" .string "Sometimes, I'm out of sync…$" -MossdeepCity_Gym_Text_221024: @ 8221024 +MossdeepCity_Gym_Text_BlakeDefeat: @ 8221024 .string "My POKéMON battling skills are out\n" .string "of sync, too!$" -MossdeepCity_Gym_Text_221055: @ 8221055 +MossdeepCity_Gym_Text_BlakePostBattle: @ 8221055 .string "A POKé BALL was too heavy to lift\n" .string "psychically. But this dust bunny…\p" .string "Whoooooooooooooooh!\n" @@ -422,127 +428,127 @@ MossdeepCity_Gym_Text_221055: @ 8221055 .string "No, I'm not cheating!\n" .string "I didn't blow on it! Honestly!$" -MossdeepCity_Gym_Text_2210EE: @ 82210EE +MossdeepCity_Gym_Text_HannahPreBattle: @ 82210EE .string "When you lose to me, don't be too hard\n" .string "on yourself.\p" .string "It's not that you're weak--I'm just\n" .string "too strong!$" -MossdeepCity_Gym_Text_221152: @ 8221152 +MossdeepCity_Gym_Text_HannahDefeat: @ 8221152 .string "You're just too strong!$" -MossdeepCity_Gym_Text_22116A: @ 822116A +MossdeepCity_Gym_Text_HannahPostBattle: @ 822116A .string "I'm not going to get down on myself for\n" .string "losing. I just need to train harder.\p" .string "Positive thinking--that's my strong\n" .string "point!$" -MossdeepCity_Gym_Text_2211E2: @ 82211E2 +MossdeepCity_Gym_Text_SamanthaPreBattle: @ 82211E2 .string "I see it…\n" .string "I see your future…\p" .string "If you can beat me, I will tell you\n" .string "your future!$" -MossdeepCity_Gym_Text_221230: @ 8221230 +MossdeepCity_Gym_Text_SamanthaDefeat: @ 8221230 .string "I surrender!$" -MossdeepCity_Gym_Text_22123D: @ 822123D +MossdeepCity_Gym_Text_SamanthaPostBattle: @ 822123D .string "You will wage a terrifically intense\n" .string "battle with our GYM LEADERS…\p" .string "The result…\n" .string "You won't hear it from me!$" -MossdeepCity_Gym_Text_2212A6: @ 82212A6 +MossdeepCity_Gym_Text_MauraPreBattle: @ 82212A6 .string "The roads you have traveled…\n" .string "What you have experienced…\p" .string "Come at me with everything you've\n" .string "learned!$" -MossdeepCity_Gym_Text_221309: @ 8221309 +MossdeepCity_Gym_Text_MauraDefeat: @ 8221309 .string "You've traveled a path of greatness!$" -MossdeepCity_Gym_Text_22132E: @ 822132E +MossdeepCity_Gym_Text_MauraPostBattle: @ 822132E .string "A bright future awaits those who have\n" .string "worked diligently.\p" .string "For those who lazed idly, there is\n" .string "only despair at the end.\p" .string "What goes around comes around…$" -MossdeepCity_Gym_Text_2213C2: @ 82213C2 +MossdeepCity_Gym_Text_SylviaPreBattle: @ 82213C2 .string "Even at the risk of life, I will win\n" .string "this battle!$" -MossdeepCity_Gym_Text_2213F4: @ 82213F4 +MossdeepCity_Gym_Text_SylviaDefeat: @ 82213F4 .string "What you do…\n" .string "It horrifies me…$" -MossdeepCity_Gym_Text_221412: @ 8221412 +MossdeepCity_Gym_Text_SylviaPostBattle: @ 8221412 .string "How dare you beat me…\p" .string "It won't be my fault if something\n" .string "horrible befalls you…$" -MossdeepCity_Gym_Text_221460: @ 8221460 +MossdeepCity_Gym_Text_NatePreBattle: @ 8221460 .string "Hohoho.\p" .string "You need me to show you how tenacious\n" .string "the PSYCHIC type can be.$" -MossdeepCity_Gym_Text_2214A7: @ 82214A7 +MossdeepCity_Gym_Text_NateDefeat: @ 82214A7 .string "Oh! My, my!\n" .string "Your battle style is fantastic!$" -MossdeepCity_Gym_Text_2214D3: @ 82214D3 +MossdeepCity_Gym_Text_NatePostBattle: @ 82214D3 .string "I… I don't let defeat rattle m-me,\n" .string "however b-badly.$" -MossdeepCity_Gym_Text_221507: @ 8221507 +MossdeepCity_Gym_Text_KathleenPreBattle: @ 8221507 .string "Let me show you a perfectly awful,\n" .string "horrifying time!$" -MossdeepCity_Gym_Text_22153B: @ 822153B +MossdeepCity_Gym_Text_KathleenDefeat: @ 822153B .string "N-nooooo!$" -MossdeepCity_Gym_Text_221545: @ 8221545 +MossdeepCity_Gym_Text_KathleenPostBattle: @ 8221545 .string "Your vitality is contagious!\n" .string "Get away from me quickly!$" -MossdeepCity_Gym_Text_22157C: @ 822157C +MossdeepCity_Gym_Text_CliffordPreBattle: @ 822157C .string "I may be past my prime, but I suggest\n" .string "you not patronize me.$" -MossdeepCity_Gym_Text_2215B8: @ 82215B8 +MossdeepCity_Gym_Text_CliffordDefeat: @ 82215B8 .string "Ah, you overflow with the power\n" .string "of youth!$" -MossdeepCity_Gym_Text_2215E2: @ 82215E2 +MossdeepCity_Gym_Text_CliffordPostBattle: @ 82215E2 .string "It seems that I could not overcome\n" .string "your youthful energy.$" -MossdeepCity_Gym_Text_22161B: @ 822161B +MossdeepCity_Gym_Text_MaceyPreBattle: @ 822161B .string "You're not getting through to the end!\n" .string "Not if I can help it!$" -MossdeepCity_Gym_Text_221658: @ 8221658 +MossdeepCity_Gym_Text_MaceyDefeat: @ 8221658 .string "How could you be so ludicrously\n" .string "strong?$" -MossdeepCity_Gym_Text_221680: @ 8221680 +MossdeepCity_Gym_Text_MaceyPostBattle: @ 8221680 .string "Humph! You may be strong, but you're\n" .string "not suitable for the PSYCHIC type!\p" .string "The way you battle is somehow brutal!$" -MossdeepCity_Gym_Text_2216EE: @ 82216EE +MossdeepCity_Gym_Text_NicholasPreBattle: @ 82216EE .string "Wroooar! Have a taste of my super\n" .string "POKéMON hard-battling power!$" -MossdeepCity_Gym_Text_22172D: @ 822172D +MossdeepCity_Gym_Text_NicholasDefeat: @ 822172D .string "Oh!\n" .string "Done in!$" -MossdeepCity_Gym_Text_22173A: @ 822173A +MossdeepCity_Gym_Text_NicholasPostBattle: @ 822173A .string "All right! I think I'll develop a special\n" .string "invincible POKéMON power next.$" -MossdeepCity_Gym_Text_221783: @ 8221783 +MossdeepCity_Gym_Text_TateAndLizaPreBattle: @ 8221783 .string "TATE: Hehehe… Were you surprised?\p" .string "LIZA: Fufufu… Were you surprised?\p" .string "TATE: That there are two GYM LEADERS?\n" @@ -556,24 +562,24 @@ MossdeepCity_Gym_Text_221783: @ 8221783 .string "TATE: This combination of ours…\n" .string "LIZA: Can you beat it?$" -MossdeepCity_Gym_Text_2218EC: @ 82218EC +MossdeepCity_Gym_Text_TateAndLizaDefeat: @ 82218EC .string "TATE: What?! Our combination…\n" .string "LIZA: Was shattered!\p" .string "TATE: It can't be helped. You've won…\n" .string "LIZA: So, in recognition, take this.$" -MossdeepCity_Gym_Text_22196A: @ 822196A +MossdeepCity_Gym_Text_ReceivedMindBadge: @ 822196A .string "{PLAYER} received the MIND BADGE\n" .string "from TATE and LIZA.$" -MossdeepCity_Gym_Text_221999: @ 8221999 +MossdeepCity_Gym_Text_ExplainMindBadgeTakeThis: @ 8221999 .string "TATE: The MIND BADGE enhances the\n" .string "SP. ATK and SP. DEF of POKéMON.\p" .string "LIZA: It also lets you use the HM move\n" .string "DIVE outside of battle.\p" .string "TATE: You should also take this, too.$" -MossdeepCity_Gym_Text_221A40: @ 8221A40 +MossdeepCity_Gym_Text_ExplainCalmMind: @ 8221A40 .string "TATE: That TM04 contains…\n" .string "LIZA: CALM MIND!\p" .string "TATE: It raises SP. ATK and…\n" @@ -582,18 +588,18 @@ MossdeepCity_Gym_Text_221A40: @ 8221A40 .string "LIZA: For PSYCHIC POKéMON!\p" .string "… … … … … …$" -MossdeepCity_Gym_Text_221AEA: @ 8221AEA +MossdeepCity_Gym_Text_RegisteredTateAndLiza: @ 8221AEA .string "Registered GYM LEADERS TATE & LIZA\n" .string "in the POKéNAV.$" -MossdeepCity_Gym_Text_221B1D: @ 8221B1D +MossdeepCity_Gym_Text_TateAndLizaPostBattle: @ 8221B1D .string "TATE: Looks like the bond between you\n" .string "and your POKéMON is far stronger than\l" .string "the bond that we share as twins.\p" .string "LIZA: You will become even stronger!\n" .string "We've battled you, so we know.$" -MossdeepCity_Gym_Text_221BCE: @ 8221BCE +MossdeepCity_Gym_Text_TateAndLizaNeedTwoMons: @ 8221BCE .string "TATE: Hehehe… Were you surprised?\p" .string "LIZA: That there are two GYM LEADERS?\p" .string "TATE: Oops, you have only one…\n" @@ -602,15 +608,15 @@ MossdeepCity_Gym_Text_221BCE: @ 8221BCE .string "LIZA: If you want to challenge us,\n" .string "bring some more POKéMON.$" -MossdeepCity_Gym_Text_221CB0: @ 8221CB0 +MossdeepCity_Gym_Text_GymStatue: @ 8221CB0 .string "MOSSDEEP CITY POKéMON GYM$" -MossdeepCity_Gym_Text_221CCA: @ 8221CCA +MossdeepCity_Gym_Text_GymStatueCertified: @ 8221CCA .string "MOSSDEEP CITY POKéMON GYM\p" .string "LIZA AND TATE'S CERTIFIED TRAINERS:\n" .string "{PLAYER}$" -MossdeepCity_Gym_Text_221D0B: @ 8221D0B +MossdeepCity_Gym_Text_TateAndLizaPreRematch: @ 8221D0B .string "TATE: POKéMON…\n" .string "LIZA: POKéMON…\p" .string "TATE: By changing the party's mix…\n" @@ -622,17 +628,17 @@ MossdeepCity_Gym_Text_221D0B: @ 8221D0B .string "TATE: Our combination…\n" .string "LIZA: We'll show you again and again!$" -MossdeepCity_Gym_Text_221E05: @ 8221E05 +MossdeepCity_Gym_Text_TateAndLizaRematchDefeat: @ 8221E05 .string "TATE: You and your POKéMON…\n" .string "LIZA: It's as if you were siblings!$" -MossdeepCity_Gym_Text_221E45: @ 8221E45 +MossdeepCity_Gym_Text_TateAndLizaPostRematch: @ 8221E45 .string "TATE: You can knock us down,\n" .string "but we'll never stay down!\p" .string "LIZA: Because the two of us,\n" .string "we always support each other!$" -MossdeepCity_Gym_Text_221EB8: @ 8221EB8 +MossdeepCity_Gym_Text_TateAndLizaRematchNeedTwoMons: @ 8221EB8 .string "TATE: You're back again…\n" .string "LIZA: You're back again…\p" .string "TATE: To give us a rematch.\n" diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc index 33b30e1d0..cc50ff37a 100644 --- a/data/maps/MossdeepCity_StevensHouse/scripts.inc +++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc @@ -113,7 +113,7 @@ MossdeepCity_StevensHouse_EventScript_2228BD:: @ 82228BD end MossdeepCity_StevensHouse_EventScript_2228E0:: @ 82228E0 - call MossdeepCity_StevensHouse_EventScript_2737A0 + call Common_EventScript_TransferredToPC goto MossdeepCity_StevensHouse_EventScript_222901 end diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc index 3316b653b..71ee724b5 100644 --- a/data/maps/MtChimney/scripts.inc +++ b/data/maps/MtChimney/scripts.inc @@ -8,7 +8,7 @@ MtChimney_OnTransition: @ 822EDCC end MtChimney_MapScript1_22EDD2: @ 822EDD2 - setstepcallback 1 + setstepcallback STEP_CB_ASH end MtChimney_EventScript_22EDD5:: @ 822EDD5 diff --git a/data/maps/MtPyre_2F/scripts.inc b/data/maps/MtPyre_2F/scripts.inc index f8efe996e..be98ac8e7 100644 --- a/data/maps/MtPyre_2F/scripts.inc +++ b/data/maps/MtPyre_2F/scripts.inc @@ -5,7 +5,7 @@ MtPyre_2F_MapScripts:: @ 82310FB .byte 0 MtPyre_2F_SetHoleWarp: @ 823110B - setstepcallback 7 + setstepcallback STEP_CB_CRACKED_FLOOR setholewarp MAP_MT_PYRE_1F, 255, 0, 0 end diff --git a/data/maps/OldaleTown/map.json b/data/maps/OldaleTown/map.json index 5f91e81ed..1644c76d6 100644 --- a/data/maps/OldaleTown/map.json +++ b/data/maps/OldaleTown/map.json @@ -40,7 +40,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "OldaleTown_EventScript_1E8EF3", + "script": "OldaleTown_EventScript_Girl", "flag": "0" }, { @@ -53,7 +53,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "OldaleTown_EventScript_1E8EFC", + "script": "OldaleTown_EventScript_MartEmployee", "flag": "0" }, { @@ -66,7 +66,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "OldaleTown_EventScript_1E901F", + "script": "OldaleTown_EventScript_FootprintsMan", "flag": "0" }, { @@ -79,7 +79,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "OldaleTown_EventScript_1E9070", + "script": "OldaleTown_EventScript_Rival", "flag": "FLAG_HIDE_OLDALE_TOWN_RIVAL" } ], @@ -121,7 +121,7 @@ "elevation": 3, "var": "VAR_OLDALE_TOWN_STATE", "var_value": "0", - "script": "OldaleTown_EventScript_1E903F" + "script": "OldaleTown_EventScript_BlockedPath" }, { "type": "trigger", @@ -130,7 +130,7 @@ "elevation": 3, "var": "VAR_OLDALE_RIVAL_STATE", "var_value": "1", - "script": "OldaleTown_EventScript_1E9086" + "script": "OldaleTown_EventScript_RivalTrigger1" }, { "type": "trigger", @@ -139,7 +139,7 @@ "elevation": 3, "var": "VAR_OLDALE_RIVAL_STATE", "var_value": "1", - "script": "OldaleTown_EventScript_1E90A6" + "script": "OldaleTown_EventScript_RivalTrigger2" }, { "type": "trigger", @@ -148,7 +148,7 @@ "elevation": 3, "var": "VAR_OLDALE_RIVAL_STATE", "var_value": "1", - "script": "OldaleTown_EventScript_1E90C6" + "script": "OldaleTown_EventScript_RivalTrigger3" } ], "bg_events": [ @@ -158,7 +158,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "OldaleTown_EventScript_1E8EEA" + "script": "OldaleTown_EventScript_CitySign" }, { "type": "sign", diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc index 8e3950cae..88f73d39b 100644 --- a/data/maps/OldaleTown/scripts.inc +++ b/data/maps/OldaleTown/scripts.inc @@ -5,92 +5,93 @@ OldaleTown_MapScripts:: @ 81E8EA2 OldaleTown_OnTransition: @ 81E8EA8 call Common_EventScript_SetupRivalGfxId setflag FLAG_VISITED_OLDALE_TOWN - call_if_unset FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_1E8ED2 - call_if_unset FLAG_RECEIVED_POTION_OLDALE, OldaleTown_EventScript_1E8EDE - call_if_set FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_1E8ECC + call_if_unset FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_BlockWestEntrance + call_if_unset FLAG_RECEIVED_POTION_OLDALE, OldaleTown_EventScript_MoveMartEmployee + call_if_set FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_SetOldaleState end -OldaleTown_EventScript_1E8ECC:: @ 81E8ECC +@ This script seems pointless because nothing uses VAR_OLDALE_TOWN_STATE +OldaleTown_EventScript_SetOldaleState:: @ 81E8ECC setvar VAR_OLDALE_TOWN_STATE, 1 return -OldaleTown_EventScript_1E8ED2:: @ 81E8ED2 +OldaleTown_EventScript_BlockWestEntrance:: @ 81E8ED2 setobjectxyperm 3, 1, 11 setobjectmovementtype 3, MOVEMENT_TYPE_FACE_LEFT return -OldaleTown_EventScript_1E8EDE:: @ 81E8EDE +OldaleTown_EventScript_MoveMartEmployee:: @ 81E8EDE setobjectxyperm 2, 13, 14 setobjectmovementtype 2, MOVEMENT_TYPE_FACE_DOWN return -OldaleTown_EventScript_1E8EEA:: @ 81E8EEA - msgbox OldaleTown_Text_1E94DA, MSGBOX_SIGN +OldaleTown_EventScript_CitySign:: @ 81E8EEA + msgbox OldaleTown_Text_CitySign, MSGBOX_SIGN end -OldaleTown_EventScript_1E8EF3:: @ 81E8EF3 - msgbox OldaleTown_Text_1E918E, MSGBOX_NPC +OldaleTown_EventScript_Girl:: @ 81E8EF3 + msgbox OldaleTown_Text_SavingMyProgress, MSGBOX_NPC end -OldaleTown_EventScript_1E8EFC:: @ 81E8EFC +OldaleTown_EventScript_MartEmployee:: @ 81E8EFC lock faceplayer - goto_if_set FLAG_RECEIVED_POTION_OLDALE, OldaleTown_EventScript_1E8FB9 - goto_if_set FLAG_TEMP_1, OldaleTown_EventScript_1E8FB9 + goto_if_set FLAG_RECEIVED_POTION_OLDALE, OldaleTown_EventScript_ExplainPotion + goto_if_set FLAG_TEMP_1, OldaleTown_EventScript_ExplainPotion setflag FLAG_TEMP_1 playbgm MUS_TSURETEK, 0 - msgbox OldaleTown_Text_1E91C0, MSGBOX_DEFAULT + msgbox OldaleTown_Text_IWorkAtPokemonMart, MSGBOX_DEFAULT closemessage switch VAR_FACING - case DIR_SOUTH, OldaleTown_EventScript_1E8F47 - case DIR_NORTH, OldaleTown_EventScript_1E8F5E - case DIR_EAST, OldaleTown_EventScript_1E8F75 + case DIR_SOUTH, OldaleTown_EventScript_GoToMartSouth + case DIR_NORTH, OldaleTown_EventScript_GoToMartNorth + case DIR_EAST, OldaleTown_EventScript_GoToMartEast end -OldaleTown_EventScript_1E8F47:: @ 81E8F47 - applymovement 2, OldaleTown_Movement_1E8FD7 - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_1E9001 +OldaleTown_EventScript_GoToMartSouth:: @ 81E8F47 + applymovement 2, OldaleTown_Movement_EmployeeSouth + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_PlayerSouth waitmovement 0 - goto OldaleTown_EventScript_1E8F8C + goto OldaleTown_EventScript_ExplainPokemonMart end -OldaleTown_EventScript_1E8F5E:: @ 81E8F5E - applymovement 2, OldaleTown_Movement_1E8FE2 - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_1E900B +OldaleTown_EventScript_GoToMartNorth:: @ 81E8F5E + applymovement 2, OldaleTown_Movement_EmployeeNorth + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_PlayerNorth waitmovement 0 - goto OldaleTown_EventScript_1E8F8C + goto OldaleTown_EventScript_ExplainPokemonMart end -OldaleTown_EventScript_1E8F75:: @ 81E8F75 - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_1E8FF9 - applymovement 2, OldaleTown_Movement_1E8FCE +OldaleTown_EventScript_GoToMartEast:: @ 81E8F75 + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_PlayerEast + applymovement 2, OldaleTown_Movement_EmployeeEast waitmovement 0 - goto OldaleTown_EventScript_1E8F8C + goto OldaleTown_EventScript_ExplainPokemonMart end -OldaleTown_EventScript_1E8F8C:: @ 81E8F8C - msgbox OldaleTown_Text_1E91FD, MSGBOX_DEFAULT +OldaleTown_EventScript_ExplainPokemonMart:: @ 81E8F8C + msgbox OldaleTown_Text_ThisIsAPokemonMart, MSGBOX_DEFAULT giveitem_std ITEM_POTION compare VAR_RESULT, 0 - goto_if_eq OldaleTown_EventScript_1E8FC3 - msgbox OldaleTown_Text_1E92AF, MSGBOX_DEFAULT + goto_if_eq OldaleTown_EventScript_BagIsFull + msgbox OldaleTown_Text_PotionExplanation, MSGBOX_DEFAULT setflag FLAG_RECEIVED_POTION_OLDALE fadedefaultbgm release end -OldaleTown_EventScript_1E8FB9:: @ 81E8FB9 - msgbox OldaleTown_Text_1E92AF, MSGBOX_DEFAULT +OldaleTown_EventScript_ExplainPotion:: @ 81E8FB9 + msgbox OldaleTown_Text_PotionExplanation, MSGBOX_DEFAULT release end -OldaleTown_EventScript_1E8FC3:: @ 81E8FC3 +OldaleTown_EventScript_BagIsFull:: @ 81E8FC3 msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT fadedefaultbgm release end -OldaleTown_Movement_1E8FCE: @ 81E8FCE +OldaleTown_Movement_EmployeeEast: @ 81E8FCE walk_up walk_up walk_up @@ -101,7 +102,7 @@ OldaleTown_Movement_1E8FCE: @ 81E8FCE walk_in_place_fastest_down step_end -OldaleTown_Movement_1E8FD7: @ 81E8FD7 +OldaleTown_Movement_EmployeeSouth: @ 81E8FD7 walk_left walk_up walk_up @@ -114,7 +115,7 @@ OldaleTown_Movement_1E8FD7: @ 81E8FD7 walk_in_place_fastest_down step_end -OldaleTown_Movement_1E8FE2: @ 81E8FE2 +OldaleTown_Movement_EmployeeNorth: @ 81E8FE2 walk_up walk_up walk_up @@ -125,7 +126,7 @@ OldaleTown_Movement_1E8FE2: @ 81E8FE2 walk_in_place_fastest_down step_end -OldaleTown_Movement_1E8FEB: @ 81E8FEB +OldaleTown_Movement_Unknown1: @ 81E8FEB walk_up walk_up walk_right @@ -141,7 +142,7 @@ OldaleTown_Movement_1E8FEB: @ 81E8FEB walk_in_place_fastest_down step_end -OldaleTown_Movement_1E8FF9: @ 81E8FF9 +OldaleTown_Movement_PlayerEast: @ 81E8FF9 walk_right walk_up walk_up @@ -151,7 +152,7 @@ OldaleTown_Movement_1E8FF9: @ 81E8FF9 walk_up step_end -OldaleTown_Movement_1E9001: @ 81E9001 +OldaleTown_Movement_PlayerSouth: @ 81E9001 delay_16 delay_16 delay_16 @@ -163,7 +164,7 @@ OldaleTown_Movement_1E9001: @ 81E9001 walk_up step_end -OldaleTown_Movement_1E900B: @ 81E900B +OldaleTown_Movement_PlayerNorth: @ 81E900B walk_up walk_up walk_up @@ -173,7 +174,7 @@ OldaleTown_Movement_1E900B: @ 81E900B walk_up step_end -OldaleTown_Movement_1E9013: @ 81E9013 +OldaleTown_Movement_Unknown2: @ 81E9013 walk_left walk_up walk_up @@ -187,97 +188,97 @@ OldaleTown_Movement_1E9013: @ 81E9013 walk_up step_end -OldaleTown_EventScript_1E901F:: @ 81E901F +OldaleTown_EventScript_FootprintsMan:: @ 81E901F lock faceplayer - goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_1E9066 - msgbox OldaleTown_Text_1E939A, MSGBOX_DEFAULT + goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_NotBlockingPath + msgbox OldaleTown_Text_DiscoveredFootprints, MSGBOX_DEFAULT closemessage applymovement 3, Common_Movement_FaceOriginalDirection waitmovement 0 release end -OldaleTown_EventScript_1E903F:: @ 81E903F +OldaleTown_EventScript_BlockedPath:: @ 81E903F lockall - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_1E9182 - applymovement 3, OldaleTown_Movement_1E9185 + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_PlayerStepBack + applymovement 3, OldaleTown_Movement_BackUp waitmovement 0 - msgbox OldaleTown_Text_1E9313, MSGBOX_DEFAULT + msgbox OldaleTown_Text_WaitDontComeInHere, MSGBOX_DEFAULT closemessage - applymovement 3, OldaleTown_Movement_1E918B + applymovement 3, OldaleTown_Movement_ReturnToOriginalPosition waitmovement 0 releaseall end -OldaleTown_EventScript_1E9066:: @ 81E9066 - msgbox OldaleTown_Text_1E93F8, MSGBOX_DEFAULT +OldaleTown_EventScript_NotBlockingPath:: @ 81E9066 + msgbox OldaleTown_Text_FinishedSketchingFootprints, MSGBOX_DEFAULT release end -OldaleTown_EventScript_1E9070:: @ 81E9070 +OldaleTown_EventScript_Rival:: @ 81E9070 lockall applymovement 4, Common_Movement_FacePlayer waitmovement 0 setvar VAR_0x8009, 0 - goto OldaleTown_EventScript_1E90E6 + goto OldaleTown_EventScript_ShowRivalMessage end -OldaleTown_EventScript_1E9086:: @ 81E9086 +OldaleTown_EventScript_RivalTrigger1:: @ 81E9086 lockall - applymovement 4, OldaleTown_Movement_1E9170 + applymovement 4, OldaleTown_Movement_RivalApproachPlayer1 waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 setvar VAR_0x8009, 1 - goto OldaleTown_EventScript_1E90E6 + goto OldaleTown_EventScript_ShowRivalMessage end -OldaleTown_EventScript_1E90A6:: @ 81E90A6 +OldaleTown_EventScript_RivalTrigger2:: @ 81E90A6 lockall - applymovement 4, OldaleTown_Movement_1E9173 + applymovement 4, OldaleTown_Movement_RivalApproachPlayer2 waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 setvar VAR_0x8009, 1 - goto OldaleTown_EventScript_1E90E6 + goto OldaleTown_EventScript_ShowRivalMessage end -OldaleTown_EventScript_1E90C6:: @ 81E90C6 +OldaleTown_EventScript_RivalTrigger3:: @ 81E90C6 lockall - applymovement 4, OldaleTown_Movement_1E9175 + applymovement 4, OldaleTown_Movement_RivalApproachPlayer3 waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 setvar VAR_0x8009, 1 - goto OldaleTown_EventScript_1E90E6 + goto OldaleTown_EventScript_ShowRivalMessage end -OldaleTown_EventScript_1E90E6:: @ 81E90E6 +OldaleTown_EventScript_ShowRivalMessage:: @ 81E90E6 checkplayergender compare VAR_RESULT, MALE - goto_if_eq OldaleTown_EventScript_1E90FE + goto_if_eq OldaleTown_EventScript_ShowMayMessage compare VAR_RESULT, FEMALE - goto_if_eq OldaleTown_EventScript_1E910C + goto_if_eq OldaleTown_EventScript_ShowBrendanMessage end -OldaleTown_EventScript_1E90FE:: @ 81E90FE - msgbox OldaleTown_Text_1E9462, MSGBOX_DEFAULT - goto OldaleTown_EventScript_1E911A +OldaleTown_EventScript_ShowMayMessage:: @ 81E90FE + msgbox OldaleTown_Text_MayLetsGoBack, MSGBOX_DEFAULT + goto OldaleTown_EventScript_RivalFinish end -OldaleTown_EventScript_1E910C:: @ 81E910C - msgbox OldaleTown_Text_1E948A, MSGBOX_DEFAULT - goto OldaleTown_EventScript_1E911A +OldaleTown_EventScript_ShowBrendanMessage:: @ 81E910C + msgbox OldaleTown_Text_BrendanLetsGoBack, MSGBOX_DEFAULT + goto OldaleTown_EventScript_RivalFinish end -OldaleTown_EventScript_1E911A:: @ 81E911A +OldaleTown_EventScript_RivalFinish:: @ 81E911A closemessage compare VAR_0x8009, 0 - call_if_eq OldaleTown_EventScript_1E9148 + call_if_eq OldaleTown_EventScript_DoExitMovement1 compare VAR_0x8009, 1 - call_if_eq OldaleTown_EventScript_1E915E - applymovement 4, OldaleTown_Movement_1E9177 + call_if_eq OldaleTown_EventScript_DoExitMovement2 + applymovement 4, OldaleTown_Movement_RivalExit waitmovement 0 removeobject 4 setvar VAR_OLDALE_RIVAL_STATE, 2 @@ -285,33 +286,33 @@ OldaleTown_EventScript_1E911A:: @ 81E911A releaseall end -OldaleTown_EventScript_1E9148:: @ 81E9148 +OldaleTown_EventScript_DoExitMovement1:: @ 81E9148 compare VAR_FACING, DIR_SOUTH - goto_if_ne OldaleTown_EventScript_1E915E - applymovement 4, OldaleTown_Movement_1E9177 + goto_if_ne OldaleTown_EventScript_DoExitMovement2 + applymovement 4, OldaleTown_Movement_RivalExit waitmovement 0 return -OldaleTown_EventScript_1E915E:: @ 81E915E - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_1E917E - applymovement 4, OldaleTown_Movement_1E9177 +OldaleTown_EventScript_DoExitMovement2:: @ 81E915E + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_WatchRivalExit + applymovement 4, OldaleTown_Movement_RivalExit waitmovement 0 return -OldaleTown_Movement_1E9170: @ 81E9170 +OldaleTown_Movement_RivalApproachPlayer1: @ 81E9170 walk_left walk_left step_end -OldaleTown_Movement_1E9173: @ 81E9173 +OldaleTown_Movement_RivalApproachPlayer2: @ 81E9173 walk_left step_end -OldaleTown_Movement_1E9175: @ 81E9175 +OldaleTown_Movement_RivalApproachPlayer3: @ 81E9175 face_left step_end -OldaleTown_Movement_1E9177: @ 81E9177 +OldaleTown_Movement_RivalExit: @ 81E9177 walk_down walk_down walk_down @@ -320,18 +321,18 @@ OldaleTown_Movement_1E9177: @ 81E9177 walk_down step_end -OldaleTown_Movement_1E917E: @ 81E917E +OldaleTown_Movement_WatchRivalExit: @ 81E917E delay_8 delay_4 walk_in_place_fastest_down step_end -OldaleTown_Movement_1E9182: @ 81E9182 +OldaleTown_Movement_PlayerStepBack: @ 81E9182 delay_8 walk_right step_end -OldaleTown_Movement_1E9185: @ 81E9185 +OldaleTown_Movement_BackUp: @ 81E9185 walk_fast_up walk_in_place_fastest_left lock_facing_direction @@ -339,21 +340,21 @@ OldaleTown_Movement_1E9185: @ 81E9185 unlock_facing_direction step_end -OldaleTown_Movement_1E918B: @ 81E918B +OldaleTown_Movement_ReturnToOriginalPosition: @ 81E918B walk_down walk_left step_end -OldaleTown_Text_1E918E: @ 81E918E +OldaleTown_Text_SavingMyProgress: @ 81E918E .string "I want to take a rest, so I'm saving my\n" .string "progress.$" -OldaleTown_Text_1E91C0: @ 81E91C0 +OldaleTown_Text_IWorkAtPokemonMart: @ 81E91C0 .string "Hi!\n" .string "I work at a POKéMON MART.\p" .string "Can I get you to come with me?$" -OldaleTown_Text_1E91FD: @ 81E91FD +OldaleTown_Text_ThisIsAPokemonMart: @ 81E91FD .string "This is a POKéMON MART.\n" .string "Just look for our blue roof.\p" .string "We sell a variety of goods including\n" @@ -361,12 +362,12 @@ OldaleTown_Text_1E91FD: @ 81E91FD .string "Here, I'd like you to have this as\n" .string "a promotional item.$" -OldaleTown_Text_1E92AF: @ 81E92AF +OldaleTown_Text_PotionExplanation: @ 81E92AF .string "A POTION can be used anytime, so it's\n" .string "even more useful than a POKéMON CENTER\l" .string "in certain situations.$" -OldaleTown_Text_1E9313: @ 81E9313 +OldaleTown_Text_WaitDontComeInHere: @ 81E9313 .string "Aaaaah! Wait!\n" .string "Please don't come in here.\p" .string "I just discovered the footprints of\n" @@ -374,29 +375,29 @@ OldaleTown_Text_1E9313: @ 81E9313 .string "Wait until I finish sketching\n" .string "them, okay?$" -OldaleTown_Text_1E939A: @ 81E939A +OldaleTown_Text_DiscoveredFootprints: @ 81E939A .string "I just discovered the footprints of\n" .string "a rare POKéMON!\p" .string "Wait until I finish sketching\n" .string "them, okay?$" -OldaleTown_Text_1E93F8: @ 81E93F8 +OldaleTown_Text_FinishedSketchingFootprints: @ 81E93F8 .string "I finished sketching the footprints of\n" .string "a rare POKéMON.\p" .string "But it turns out they were only my\n" .string "own footprints…$" -OldaleTown_Text_1E9462: @ 81E9462 +OldaleTown_Text_MayLetsGoBack: @ 81E9462 .string "MAY: {PLAYER}{KUN}!\n" .string "Over here!\l" .string "Let's hurry home!$" -OldaleTown_Text_1E948A: @ 81E948A +OldaleTown_Text_BrendanLetsGoBack: @ 81E948A .string "BRENDAN: I'm heading back to my dad's\n" .string "LAB now.\l" .string "{PLAYER}, you should hustle back, too.$" -OldaleTown_Text_1E94DA: @ 81E94DA +OldaleTown_Text_CitySign: @ 81E94DA .string "OLDALE TOWN\n" .string "“Where things start off scarce.”$" diff --git a/data/maps/OldaleTown_House1/map.json b/data/maps/OldaleTown_House1/map.json index aa837378c..03155a623 100644 --- a/data/maps/OldaleTown_House1/map.json +++ b/data/maps/OldaleTown_House1/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "OldaleTown_House1_EventScript_1FBE86", + "script": "OldaleTown_House1_EventScript_Woman", "flag": "0" } ], diff --git a/data/maps/OldaleTown_House1/scripts.inc b/data/maps/OldaleTown_House1/scripts.inc index 71010116e..1cb5622ef 100644 --- a/data/maps/OldaleTown_House1/scripts.inc +++ b/data/maps/OldaleTown_House1/scripts.inc @@ -1,11 +1,11 @@ OldaleTown_House1_MapScripts:: @ 81FBE85 .byte 0 -OldaleTown_House1_EventScript_1FBE86:: @ 81FBE86 - msgbox OldaleTown_House1_Text_1FBE8F, MSGBOX_NPC +OldaleTown_House1_EventScript_Woman:: @ 81FBE86 + msgbox OldaleTown_House1_Text_LeftPokemonGoesOutFirst, MSGBOX_NPC end -OldaleTown_House1_Text_1FBE8F: @ 81FBE8F +OldaleTown_House1_Text_LeftPokemonGoesOutFirst: @ 81FBE8F .string "When a POKéMON battle starts, the one\n" .string "at the left of the list goes out first.\p" .string "So, when you get more POKéMON in your\n" diff --git a/data/maps/OldaleTown_House2/map.json b/data/maps/OldaleTown_House2/map.json index fbcf968e7..754f98c49 100644 --- a/data/maps/OldaleTown_House2/map.json +++ b/data/maps/OldaleTown_House2/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "OldaleTown_House2_EventScript_1FBF5B", + "script": "OldaleTown_House2_EventScript_Woman", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "OldaleTown_House2_EventScript_1FBF64", + "script": "OldaleTown_House2_EventScript_Man", "flag": "0" } ], diff --git a/data/maps/OldaleTown_House2/scripts.inc b/data/maps/OldaleTown_House2/scripts.inc index 74a9a06d3..3259e319c 100644 --- a/data/maps/OldaleTown_House2/scripts.inc +++ b/data/maps/OldaleTown_House2/scripts.inc @@ -1,19 +1,19 @@ OldaleTown_House2_MapScripts:: @ 81FBF5A .byte 0 -OldaleTown_House2_EventScript_1FBF5B:: @ 81FBF5B - msgbox OldaleTown_House2_Text_1FBF6D, MSGBOX_NPC +OldaleTown_House2_EventScript_Woman:: @ 81FBF5B + msgbox OldaleTown_House2_Text_PokemonLevelUp, MSGBOX_NPC end -OldaleTown_House2_EventScript_1FBF64:: @ 81FBF64 - msgbox OldaleTown_House2_Text_1FBFB0, MSGBOX_NPC +OldaleTown_House2_EventScript_Man:: @ 81FBF64 + msgbox OldaleTown_House2_Text_YoullGoFurtherWithStrongPokemon, MSGBOX_NPC end -OldaleTown_House2_Text_1FBF6D: @ 81FBF6D +OldaleTown_House2_Text_PokemonLevelUp: @ 81FBF6D .string "When POKéMON battle, they eventually\n" .string "level up and become stronger.$" -OldaleTown_House2_Text_1FBFB0: @ 81FBFB0 +OldaleTown_House2_Text_YoullGoFurtherWithStrongPokemon: @ 81FBFB0 .string "If the POKéMON with you become\n" .string "stronger, you'll be able to go farther\l" .string "away from here.$" diff --git a/data/maps/OldaleTown_Mart/map.json b/data/maps/OldaleTown_Mart/map.json index 9f1f894ce..a27fad497 100644 --- a/data/maps/OldaleTown_Mart/map.json +++ b/data/maps/OldaleTown_Mart/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "OldaleTown_Mart_EventScript_1FC240", + "script": "OldaleTown_Mart_EventScript_Clerk", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "OldaleTown_Mart_EventScript_1FC28A", + "script": "OldaleTown_Mart_EventScript_Woman", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "OldaleTown_Mart_EventScript_1FC2A9", + "script": "OldaleTown_Mart_EventScript_Boy", "flag": "0" } ], diff --git a/data/maps/OldaleTown_Mart/scripts.inc b/data/maps/OldaleTown_Mart/scripts.inc index 38b978d45..33d26cbfb 100644 --- a/data/maps/OldaleTown_Mart/scripts.inc +++ b/data/maps/OldaleTown_Mart/scripts.inc @@ -1,18 +1,18 @@ OldaleTown_Mart_MapScripts:: @ 81FC23F .byte 0 -OldaleTown_Mart_EventScript_1FC240:: @ 81FC240 +OldaleTown_Mart_EventScript_Clerk:: @ 81FC240 lock faceplayer message gText_HowMayIServeYou waitmessage - goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_Mart_EventScript_1FC26C - pokemart OldaleTown_Mart_Pokemart_1FC260 + goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_Mart_ExpandedItems + pokemart OldaleTown_Mart_Pokemart_Basic msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end -OldaleTown_Mart_Pokemart_1FC260: @ 81FC260 +OldaleTown_Mart_Pokemart_Basic: @ 81FC260 .2byte ITEM_POTION .2byte ITEM_ANTIDOTE .2byte ITEM_PARALYZE_HEAL @@ -21,14 +21,14 @@ OldaleTown_Mart_Pokemart_1FC260: @ 81FC260 release end -OldaleTown_Mart_EventScript_1FC26C:: @ 81FC26C - pokemart OldaleTown_Mart_Pokemart_1FC27C +OldaleTown_Mart_ExpandedItems:: @ 81FC26C + pokemart OldaleTown_Mart_Pokemart_Expanded msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -OldaleTown_Mart_Pokemart_1FC27C: @ 81FC27C +OldaleTown_Mart_Pokemart_Expanded: @ 81FC27C .2byte ITEM_POKE_BALL .2byte ITEM_POTION .2byte ITEM_ANTIDOTE @@ -38,32 +38,32 @@ OldaleTown_Mart_Pokemart_1FC27C: @ 81FC27C release end -OldaleTown_Mart_EventScript_1FC28A:: @ 81FC28A +OldaleTown_Mart_EventScript_Woman:: @ 81FC28A lock faceplayer - goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_Mart_EventScript_1FC29F - msgbox OldaleTown_Mart_Text_1FC2B2, MSGBOX_DEFAULT + goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_Mart_EventScript_PokeBallsInStock + msgbox OldaleTown_Mart_Text_PokeBallsAreSoldOut, MSGBOX_DEFAULT release end -OldaleTown_Mart_EventScript_1FC29F:: @ 81FC29F - msgbox OldaleTown_Mart_Text_1FC2F3, MSGBOX_DEFAULT +OldaleTown_Mart_EventScript_PokeBallsInStock:: @ 81FC29F + msgbox OldaleTown_Mart_Text_ImGoingToBuyPokeBalls, MSGBOX_DEFAULT release end -OldaleTown_Mart_EventScript_1FC2A9:: @ 81FC2A9 - msgbox OldaleTown_Mart_Text_1FC338, MSGBOX_NPC +OldaleTown_Mart_EventScript_Boy:: @ 81FC2A9 + msgbox OldaleTown_Mart_Text_RestoreHPWithPotion, MSGBOX_NPC end -OldaleTown_Mart_Text_1FC2B2: @ 81FC2B2 +OldaleTown_Mart_Text_PokeBallsAreSoldOut: @ 81FC2B2 .string "The clerk says they're all sold out.\n" .string "I can't buy any POKé BALLS.$" -OldaleTown_Mart_Text_1FC2F3: @ 81FC2F3 +OldaleTown_Mart_Text_ImGoingToBuyPokeBalls: @ 81FC2F3 .string "I'm going to buy a bunch of POKé BALLS\n" .string "and catch a bunch of POKéMON!$" -OldaleTown_Mart_Text_1FC338: @ 81FC338 +OldaleTown_Mart_Text_RestoreHPWithPotion: @ 81FC338 .string "If a POKéMON gets hurt and loses its HP\n" .string "and faints, it won't be able to battle.\p" .string "To prevent your POKéMON from fainting,\n" diff --git a/data/maps/OldaleTown_PokemonCenter_1F/map.json b/data/maps/OldaleTown_PokemonCenter_1F/map.json index 7c9ed89a0..2f92a004c 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/map.json +++ b/data/maps/OldaleTown_PokemonCenter_1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "OldaleTown_PokemonCenter_1F_EventScript_1FC01A", + "script": "OldaleTown_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": "OldaleTown_PokemonCenter_1F_EventScript_1FC028", + "script": "OldaleTown_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": "OldaleTown_PokemonCenter_1F_EventScript_1FC031", + "script": "OldaleTown_PokemonCenter_1F_EventScript_Boy", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "OldaleTown_PokemonCenter_1F_EventScript_1FC03A", + "script": "OldaleTown_PokemonCenter_1F_EventScript_Girl", "flag": "0" } ], diff --git a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc index 9df202d09..4e54cc8e4 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc @@ -8,7 +8,7 @@ OldaleTown_PokemonCenter_1F_OnTransition: @ 81FC011 call Common_EventScript_UpdateBrineyLocation end -OldaleTown_PokemonCenter_1F_EventScript_1FC01A:: @ 81FC01A +OldaleTown_PokemonCenter_1F_EventScript_Nurse:: @ 81FC01A setvar VAR_0x800B, 1 call Common_EventScript_PkmnCenterNurse waitmessage @@ -16,46 +16,46 @@ OldaleTown_PokemonCenter_1F_EventScript_1FC01A:: @ 81FC01A release end -OldaleTown_PokemonCenter_1F_EventScript_1FC028:: @ 81FC028 - msgbox OldaleTown_PokemonCenter_1F_Text_1FC059, MSGBOX_NPC +OldaleTown_PokemonCenter_1F_EventScript_Gentleman:: @ 81FC028 + msgbox OldaleTown_PokemonCenter_1F_Text_TrainersCanUsePC, MSGBOX_NPC end -OldaleTown_PokemonCenter_1F_EventScript_1FC031:: @ 81FC031 - msgbox OldaleTown_PokemonCenter_1F_Text_1FC0CD, MSGBOX_NPC +OldaleTown_PokemonCenter_1F_EventScript_Boy:: @ 81FC031 + msgbox OldaleTown_PokemonCenter_1F_Text_PokemonCentersAreGreat, MSGBOX_NPC end -OldaleTown_PokemonCenter_1F_EventScript_1FC03A:: @ 81FC03A +OldaleTown_PokemonCenter_1F_EventScript_Girl:: @ 81FC03A lock faceplayer - goto_if_set FLAG_SYS_POKEDEX_GET, OldaleTown_PokemonCenter_1F_EventScript_1FC04F - msgbox OldaleTown_PokemonCenter_1F_Text_1FC148, MSGBOX_DEFAULT + goto_if_set FLAG_SYS_POKEDEX_GET, OldaleTown_PokemonCenter_1F_EventScript_WirelessClubAvailable + msgbox OldaleTown_PokemonCenter_1F_Text_WirelessClubNotAvailable, MSGBOX_DEFAULT release end -OldaleTown_PokemonCenter_1F_EventScript_1FC04F:: @ 81FC04F - msgbox OldaleTown_PokemonCenter_1F_Text_1FC1B9, MSGBOX_DEFAULT +OldaleTown_PokemonCenter_1F_EventScript_WirelessClubAvailable:: @ 81FC04F + msgbox OldaleTown_PokemonCenter_1F_Text_TradedInWirelessClub, MSGBOX_DEFAULT release end -OldaleTown_PokemonCenter_1F_Text_1FC059: @ 81FC059 +OldaleTown_PokemonCenter_1F_Text_TrainersCanUsePC: @ 81FC059 .string "That PC in the corner there is\n" .string "for any POKéMON TRAINER to use.\p" .string "Naturally, that means you're welcome\n" .string "to use it, too.$" -OldaleTown_PokemonCenter_1F_Text_1FC0CD: @ 81FC0CD +OldaleTown_PokemonCenter_1F_Text_PokemonCentersAreGreat: @ 81FC0CD .string "POKéMON CENTERS are great!\p" .string "You can use their services as much\n" .string "as you like, and it's all for free.\l" .string "You never have to worry!$" -OldaleTown_PokemonCenter_1F_Text_1FC148: @ 81FC148 +OldaleTown_PokemonCenter_1F_Text_WirelessClubNotAvailable: @ 81FC148 .string "The POKéMON WIRELESS CLUB on\n" .string "the second floor was built recently.\p" .string "But they say they're still making\n" .string "adjustments.$" -OldaleTown_PokemonCenter_1F_Text_1FC1B9: @ 81FC1B9 +OldaleTown_PokemonCenter_1F_Text_TradedInWirelessClub: @ 81FC1B9 .string "The POKéMON WIRELESS CLUB on\n" .string "the second floor was built recently.\p" .string "I traded POKéMON right away.$" diff --git a/data/maps/PacifidlogTown/scripts.inc b/data/maps/PacifidlogTown/scripts.inc index 1d1518c0a..26e9924ed 100644 --- a/data/maps/PacifidlogTown/scripts.inc +++ b/data/maps/PacifidlogTown/scripts.inc @@ -8,7 +8,7 @@ PacifidlogTown_OnTransition: @ 81EBABC end PacifidlogTown_MapScript1_1EBAC0: @ 81EBAC0 - setstepcallback 3 + setstepcallback STEP_CB_PACIFIDLOG_BRIDGE end PacifidlogTown_EventScript_1EBAC3:: @ 81EBAC3 diff --git a/data/maps/PetalburgCity/map.json b/data/maps/PetalburgCity/map.json index 44402aff5..721234bd5 100644 --- a/data/maps/PetalburgCity/map.json +++ b/data/maps/PetalburgCity/map.json @@ -35,7 +35,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_EventScript_1DC3FD", + "script": "PetalburgCity_EventScript_WallyAunt", "flag": "FLAG_HIDE_PETALBURG_CITY_WALLYS_AUNT" }, { @@ -61,7 +61,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_EventScript_1DC3E6", + "script": "PetalburgCity_EventScript_Boy1", "flag": "0" }, { @@ -74,7 +74,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_EventScript_1DC488", + "script": "PetalburgCity_EventScript_Gentleman", "flag": "0" }, { @@ -126,7 +126,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_EventScript_1DC82E", + "script": "PetalburgCity_EventScript_Boy2", "flag": "0" }, { @@ -195,7 +195,7 @@ "elevation": 3, "var": "VAR_PETALBURG_CITY_STATE", "var_value": "0", - "script": "PetalburgCity_EventScript_1DC49A" + "script": "PetalburgCity_EventScript_ShowGymToPlayer0" }, { "type": "trigger", @@ -204,7 +204,7 @@ "elevation": 3, "var": "VAR_PETALBURG_CITY_STATE", "var_value": "0", - "script": "PetalburgCity_EventScript_1DC4A6" + "script": "PetalburgCity_EventScript_ShowGymToPlayer1" }, { "type": "trigger", @@ -213,7 +213,7 @@ "elevation": 3, "var": "VAR_PETALBURG_CITY_STATE", "var_value": "0", - "script": "PetalburgCity_EventScript_1DC4B2" + "script": "PetalburgCity_EventScript_ShowGymToPlayer2" }, { "type": "trigger", @@ -222,7 +222,7 @@ "elevation": 3, "var": "VAR_PETALBURG_CITY_STATE", "var_value": "0", - "script": "PetalburgCity_EventScript_1DC4BE" + "script": "PetalburgCity_EventScript_ShowGymToPlayer3" }, { "type": "trigger", @@ -231,7 +231,7 @@ "elevation": 3, "var": "VAR_SCOTT_PETALBURG_ENCOUNTER", "var_value": "0", - "script": "PetalburgCity_EventScript_1DC691" + "script": "PetalburgCity_EventScript_Scott0" }, { "type": "trigger", @@ -240,7 +240,7 @@ "elevation": 3, "var": "VAR_SCOTT_PETALBURG_ENCOUNTER", "var_value": "0", - "script": "PetalburgCity_EventScript_1DC6A7" + "script": "PetalburgCity_EventScript_Scott1" }, { "type": "trigger", @@ -249,7 +249,7 @@ "elevation": 3, "var": "VAR_SCOTT_PETALBURG_ENCOUNTER", "var_value": "0", - "script": "PetalburgCity_EventScript_1DC6BD" + "script": "PetalburgCity_EventScript_Scott2" }, { "type": "trigger", @@ -258,7 +258,7 @@ "elevation": 3, "var": "VAR_SCOTT_PETALBURG_ENCOUNTER", "var_value": "0", - "script": "PetalburgCity_EventScript_1DC6D3" + "script": "PetalburgCity_EventScript_Scott3" } ], "bg_events": [ @@ -268,7 +268,7 @@ "y": 10, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "PetalburgCity_EventScript_1DC476" + "script": "PetalburgCity_EventScript_GymSign" }, { "type": "sign", @@ -292,7 +292,7 @@ "y": 16, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "PetalburgCity_EventScript_1DC47F" + "script": "PetalburgCity_EventScript_CitySign" }, { "type": "sign", @@ -316,7 +316,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "PetalburgCity_EventScript_1DC491" + "script": "PetalburgCity_EventScript_WallyHouseSign" }, { "type": "hidden_item", diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc index c20b3fa30..5d3bbf1ef 100644 --- a/data/maps/PetalburgCity/scripts.inc +++ b/data/maps/PetalburgCity/scripts.inc @@ -1,57 +1,57 @@ PetalburgCity_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_OnTransition - map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_MapScript2_1DC31C + map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_OnFrame .byte 0 PetalburgCity_OnTransition: @ 81DC2D7 setflag FLAG_VISITED_PETALBURG_CITY compare VAR_PETALBURG_CITY_STATE, 0 - call_if_eq PetalburgCity_EventScript_1DC307 + call_if_eq PetalburgCity_EventScript_MoveBoyToWestEntrance compare VAR_PETALBURG_CITY_STATE, 2 - call_if_eq PetalburgCity_EventScript_1DC30F + call_if_eq PetalburgCity_EventScript_DisableMapNameAndMusic compare VAR_PETALBURG_CITY_STATE, 4 - call_if_eq PetalburgCity_EventScript_1DC30F + call_if_eq PetalburgCity_EventScript_DisableMapNameAndMusic compare VAR_PETALBURG_GYM_STATE, 8 - call_if_eq PetalburgCity_EventScript_1DC316 + call_if_eq PetalburgCity_EventScript_SetGymDoorsUnlocked end -PetalburgCity_EventScript_1DC307:: @ 81DC307 +PetalburgCity_EventScript_MoveBoyToWestEntrance:: @ 81DC307 setobjectxyperm 8, 5, 11 return -PetalburgCity_EventScript_1DC30F:: @ 81DC30F +PetalburgCity_EventScript_DisableMapNameAndMusic:: @ 81DC30F setflag FLAG_HIDE_MAP_NAME_POPUP savebgm MUS_TSURETEK return -PetalburgCity_EventScript_1DC316:: @ 81DC316 +PetalburgCity_EventScript_SetGymDoorsUnlocked:: @ 81DC316 setvar VAR_PETALBURG_GYM_STATE, 7 return -PetalburgCity_MapScript2_1DC31C: @ 81DC31C - map_script_2 VAR_PETALBURG_CITY_STATE, 2, PetalburgCity_EventScript_1DC32E - map_script_2 VAR_PETALBURG_CITY_STATE, 4, PetalburgCity_EventScript_1DC390 +PetalburgCity_OnFrame: @ 81DC31C + map_script_2 VAR_PETALBURG_CITY_STATE, 2, PetalburgCity_EventScript_WallyTutorial + map_script_2 VAR_PETALBURG_CITY_STATE, 4, PetalburgCity_EventScript_WalkToWallyHouse .2byte 0 -PetalburgCity_EventScript_1DC32E:: @ 81DC32E +PetalburgCity_EventScript_WallyTutorial:: @ 81DC32E lockall special SavePlayerParty special PutZigzagoonInPlayerParty - applymovement 2, PetalburgCity_Movement_1DC451 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC430 + applymovement 2, PetalburgCity_Movement_WallyTutorialWally + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_WallyTutorialPlayer waitmovement 0 - msgbox PetalburgCity_Text_1EC1F8, MSGBOX_DEFAULT + msgbox Route102_Text_WatchMeCatchPokemon, MSGBOX_DEFAULT special StartWallyTutorialBattle waitstate - msgbox PetalburgCity_Text_1EC271, MSGBOX_DEFAULT + msgbox Route102_Text_WallyIDidIt, MSGBOX_DEFAULT applymovement 2, Common_Movement_WalkInPlaceFastestLeft, MAP_PETALBURG_CITY waitmovement 2, MAP_PETALBURG_CITY - msgbox PetalburgCity_Text_1EC297, MSGBOX_DEFAULT + msgbox Route102_Text_LetsGoBack, MSGBOX_DEFAULT closemessage clearflag FLAG_HIDE_MAP_NAME_POPUP setvar VAR_PETALBURG_CITY_STATE, 3 fadedefaultbgm - clearflag FLAG_SPECIAL_FLAG_0x4001 + clearflag FLAG_DONT_TRANSITION_MUSIC special LoadPlayerParty setvar VAR_PETALBURG_GYM_STATE, 1 warp MAP_PETALBURG_CITY_GYM, 255, 4, 108 @@ -59,18 +59,18 @@ PetalburgCity_EventScript_1DC32E:: @ 81DC32E releaseall end -PetalburgCity_EventScript_1DC390:: @ 81DC390 +PetalburgCity_EventScript_WalkToWallyHouse:: @ 81DC390 lockall setflag FLAG_HIDE_MAP_NAME_POPUP - applymovement 5, PetalburgCity_Movement_1DC41B - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC406 + applymovement 5, PetalburgCity_Movement_WalkToWallyHouseUncle + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_WalkToWallyHousePlayer waitmovement 0 setvar VAR_0x8004, 7 setvar VAR_0x8005, 5 opendoor VAR_0x8004, VAR_0x8005 waitdooranim - applymovement 5, PetalburgCity_Movement_1DC42D - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC418 + applymovement 5, PetalburgCity_Movement_WalkInsideHouseUncle + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_WalkInsideHousePlayer waitmovement 0 setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY @@ -78,27 +78,27 @@ PetalburgCity_EventScript_1DC390:: @ 81DC390 waitdooranim clearflag FLAG_HIDE_MAP_NAME_POPUP fadedefaultbgm - clearflag FLAG_SPECIAL_FLAG_0x4001 + clearflag FLAG_DONT_TRANSITION_MUSIC warp MAP_PETALBURG_CITY_WALLYS_HOUSE, 255, 2, 4 waitstate releaseall end -PetalburgCity_EventScript_1DC3E6:: @ 81DC3E6 +PetalburgCity_EventScript_Boy1:: @ 81DC3E6 lock faceplayer - msgbox PetalburgCity_Text_1DC985, MSGBOX_DEFAULT + msgbox PetalburgCity_Text_WaterReflection, MSGBOX_DEFAULT closemessage applymovement 3, Common_Movement_FaceOriginalDirection waitmovement 0 release end -PetalburgCity_EventScript_1DC3FD:: @ 81DC3FD - msgbox PetalburgCity_Text_1DC837, MSGBOX_NPC +PetalburgCity_EventScript_WallyAunt:: @ 81DC3FD + msgbox PetalburgCity_Text_WhereIsWally, MSGBOX_NPC end -PetalburgCity_Movement_1DC406: @ 81DC406 +PetalburgCity_Movement_WalkToWallyHousePlayer: @ 81DC406 delay_8 walk_down walk_down @@ -118,12 +118,12 @@ PetalburgCity_Movement_1DC406: @ 81DC406 walk_up step_end -PetalburgCity_Movement_1DC418: @ 81DC418 +PetalburgCity_Movement_WalkInsideHousePlayer: @ 81DC418 walk_up walk_up step_end -PetalburgCity_Movement_1DC41B: @ 81DC41B +PetalburgCity_Movement_WalkToWallyHouseUncle: @ 81DC41B delay_8 walk_down walk_down @@ -143,12 +143,12 @@ PetalburgCity_Movement_1DC41B: @ 81DC41B walk_up step_end -PetalburgCity_Movement_1DC42D: @ 81DC42D +PetalburgCity_Movement_WalkInsideHouseUncle: @ 81DC42D walk_up set_invisible step_end -PetalburgCity_Movement_1DC430: @ 81DC430 +PetalburgCity_Movement_WallyTutorialPlayer: @ 81DC430 delay_8 walk_down walk_down @@ -183,7 +183,7 @@ PetalburgCity_Movement_1DC430: @ 81DC430 walk_in_place_fastest_right step_end -PetalburgCity_Movement_1DC451: @ 81DC451 +PetalburgCity_Movement_WallyTutorialWally: @ 81DC451 delay_8 walk_down walk_down @@ -222,47 +222,47 @@ PetalburgCity_Movement_1DC451: @ 81DC451 walk_in_place_fastest_right step_end -PetalburgCity_EventScript_1DC476:: @ 81DC476 - msgbox PetalburgCity_Text_1DCAAA, MSGBOX_SIGN +PetalburgCity_EventScript_GymSign:: @ 81DC476 + msgbox PetalburgCity_Text_GymSign, MSGBOX_SIGN end -PetalburgCity_EventScript_1DC47F:: @ 81DC47F - msgbox PetalburgCity_Text_1DCAF1, MSGBOX_SIGN +PetalburgCity_EventScript_CitySign:: @ 81DC47F + msgbox PetalburgCity_Text_CitySign, MSGBOX_SIGN end -PetalburgCity_EventScript_1DC488:: @ 81DC488 - msgbox PetalburgCity_Text_1DCA30, MSGBOX_NPC +PetalburgCity_EventScript_Gentleman:: @ 81DC488 + msgbox PetalburgCity_Text_FullPartyExplanation, MSGBOX_NPC end -PetalburgCity_EventScript_1DC491:: @ 81DC491 - msgbox PetalburgCity_Text_1DCB23, MSGBOX_SIGN +PetalburgCity_EventScript_WallyHouseSign:: @ 81DC491 + msgbox PetalburgCity_Text_WallyHouseSign, MSGBOX_SIGN end -PetalburgCity_EventScript_1DC49A:: @ 81DC49A +PetalburgCity_EventScript_ShowGymToPlayer0:: @ 81DC49A lockall setvar VAR_0x8008, 0 - goto PetalburgCity_EventScript_1DC4CA + goto PetalburgCity_EventScript_ShowGymToPlayer end -PetalburgCity_EventScript_1DC4A6:: @ 81DC4A6 +PetalburgCity_EventScript_ShowGymToPlayer1:: @ 81DC4A6 lockall setvar VAR_0x8008, 1 - goto PetalburgCity_EventScript_1DC4CA + goto PetalburgCity_EventScript_ShowGymToPlayer end -PetalburgCity_EventScript_1DC4B2:: @ 81DC4B2 +PetalburgCity_EventScript_ShowGymToPlayer2:: @ 81DC4B2 lockall setvar VAR_0x8008, 2 - goto PetalburgCity_EventScript_1DC4CA + goto PetalburgCity_EventScript_ShowGymToPlayer end -PetalburgCity_EventScript_1DC4BE:: @ 81DC4BE +PetalburgCity_EventScript_ShowGymToPlayer3:: @ 81DC4BE lockall setvar VAR_0x8008, 3 - goto PetalburgCity_EventScript_1DC4CA + goto PetalburgCity_EventScript_ShowGymToPlayer end -PetalburgCity_EventScript_1DC4CA:: @ 81DC4CA +PetalburgCity_EventScript_ShowGymToPlayer:: @ 81DC4CA applymovement 8, Common_Movement_FacePlayer waitmovement 0 playbgm MUS_TSURETEK, 0 @@ -272,82 +272,82 @@ PetalburgCity_EventScript_1DC4CA:: @ 81DC4CA applymovement 8, Common_Movement_Delay48 waitmovement 0 compare VAR_0x8008, 0 - call_if_eq PetalburgCity_EventScript_1DC57F + call_if_eq PetalburgCity_EventScript_BoyApproachPlayer0 compare VAR_0x8008, 1 - call_if_eq PetalburgCity_EventScript_1DC594 + call_if_eq PetalburgCity_EventScript_BoyApproachPlayer1 compare VAR_0x8008, 2 - call_if_eq PetalburgCity_EventScript_1DC59F + call_if_eq PetalburgCity_EventScript_BoyApproachPlayer2 compare VAR_0x8008, 3 - call_if_eq PetalburgCity_EventScript_1DC5B4 - msgbox PetalburgCity_Text_1DC881, MSGBOX_DEFAULT + call_if_eq PetalburgCity_EventScript_BoyApproachPlayer3 + msgbox PetalburgCity_Text_AreYouRookieTrainer, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 0 - call_if_eq PetalburgCity_EventScript_1DC5C9 + call_if_eq PetalburgCity_EventScript_LeadPlayerToGym0 compare VAR_0x8008, 1 - call_if_eq PetalburgCity_EventScript_1DC5DB + call_if_eq PetalburgCity_EventScript_LeadPlayerToGym1 compare VAR_0x8008, 2 - call_if_eq PetalburgCity_EventScript_1DC5ED + call_if_eq PetalburgCity_EventScript_LeadPlayerToGym2 compare VAR_0x8008, 3 - call_if_eq PetalburgCity_EventScript_1DC5FF - msgbox PetalburgCity_Text_1DC91B, MSGBOX_DEFAULT + call_if_eq PetalburgCity_EventScript_LeadPlayerToGym3 + msgbox PetalburgCity_Text_ThisIsPetalburgGym, MSGBOX_DEFAULT applymovement 8, Common_Movement_WalkInPlaceFastestRight applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - msgbox PetalburgCity_Text_1DC93E, MSGBOX_DEFAULT + msgbox PetalburgCity_Text_ThisIsGymSign, MSGBOX_DEFAULT closemessage - applymovement 8, PetalburgCity_Movement_1DC658 + applymovement 8, PetalburgCity_Movement_BoyWalkAway waitmovement 0 fadedefaultbgm releaseall end -PetalburgCity_EventScript_1DC57F:: @ 81DC57F - applymovement 8, PetalburgCity_Movement_1DC615 +PetalburgCity_EventScript_BoyApproachPlayer0:: @ 81DC57F + applymovement 8, PetalburgCity_Movement_BoyApproachPlayer0 waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return -PetalburgCity_EventScript_1DC594:: @ 81DC594 - applymovement 8, PetalburgCity_Movement_1DC61A +PetalburgCity_EventScript_BoyApproachPlayer1:: @ 81DC594 + applymovement 8, PetalburgCity_Movement_BoyApproachPlayer1 waitmovement 0 return -PetalburgCity_EventScript_1DC59F:: @ 81DC59F - applymovement 8, PetalburgCity_Movement_1DC61D +PetalburgCity_EventScript_BoyApproachPlayer2:: @ 81DC59F + applymovement 8, PetalburgCity_Movement_BoyApproachPlayer2 waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return -PetalburgCity_EventScript_1DC5B4:: @ 81DC5B4 - applymovement 8, PetalburgCity_Movement_1DC622 +PetalburgCity_EventScript_BoyApproachPlayer3:: @ 81DC5B4 + applymovement 8, PetalburgCity_Movement_BoyApproachPlayer3 waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return -PetalburgCity_EventScript_1DC5C9:: @ 81DC5C9 - applymovement 8, PetalburgCity_Movement_1DC628 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC665 +PetalburgCity_EventScript_LeadPlayerToGym0:: @ 81DC5C9 + applymovement 8, PetalburgCity_Movement_BoyWalkToGym0 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_PlayerWalkToGym0 waitmovement 0 return -PetalburgCity_EventScript_1DC5DB:: @ 81DC5DB - applymovement 8, PetalburgCity_Movement_1DC633 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC66F +PetalburgCity_EventScript_LeadPlayerToGym1:: @ 81DC5DB + applymovement 8, PetalburgCity_Movement_BoyWalkToGym1 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_PlayerWalkToGym1 waitmovement 0 return -PetalburgCity_EventScript_1DC5ED:: @ 81DC5ED - applymovement 8, PetalburgCity_Movement_1DC641 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC67C +PetalburgCity_EventScript_LeadPlayerToGym2:: @ 81DC5ED + applymovement 8, PetalburgCity_Movement_BoyWalkToGym2 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_PlayerWalkToGym2 waitmovement 0 return -PetalburgCity_EventScript_1DC5FF:: @ 81DC5FF - applymovement 8, PetalburgCity_Movement_1DC64C - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC686 +PetalburgCity_EventScript_LeadPlayerToGym3:: @ 81DC5FF + applymovement 8, PetalburgCity_Movement_BoyWalkToGym3 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_PlayerWalkToGym3 waitmovement 0 return @@ -357,26 +357,26 @@ PetalburgCity_Movement_1DC611:: @ 81DC611 delay_16 step_end -PetalburgCity_Movement_1DC615: @ 81DC615 +PetalburgCity_Movement_BoyApproachPlayer0: @ 81DC615 walk_right walk_right walk_right walk_in_place_fastest_up step_end -PetalburgCity_Movement_1DC61A: @ 81DC61A +PetalburgCity_Movement_BoyApproachPlayer1: @ 81DC61A walk_right walk_right step_end -PetalburgCity_Movement_1DC61D: @ 81DC61D +PetalburgCity_Movement_BoyApproachPlayer2: @ 81DC61D walk_right walk_right walk_right walk_in_place_fastest_down step_end -PetalburgCity_Movement_1DC622: @ 81DC622 +PetalburgCity_Movement_BoyApproachPlayer3: @ 81DC622 walk_down walk_right walk_right @@ -384,7 +384,7 @@ PetalburgCity_Movement_1DC622: @ 81DC622 walk_in_place_fastest_down step_end -PetalburgCity_Movement_1DC628: @ 81DC628 +PetalburgCity_Movement_BoyWalkToGym0: @ 81DC628 walk_right walk_right walk_right @@ -397,7 +397,7 @@ PetalburgCity_Movement_1DC628: @ 81DC628 walk_in_place_fastest_up step_end -PetalburgCity_Movement_1DC633: @ 81DC633 +PetalburgCity_Movement_BoyWalkToGym1: @ 81DC633 walk_down walk_right walk_right @@ -413,7 +413,7 @@ PetalburgCity_Movement_1DC633: @ 81DC633 walk_in_place_fastest_up step_end -PetalburgCity_Movement_1DC641: @ 81DC641 +PetalburgCity_Movement_BoyWalkToGym2: @ 81DC641 walk_right walk_right walk_right @@ -426,7 +426,7 @@ PetalburgCity_Movement_1DC641: @ 81DC641 walk_in_place_fastest_up step_end -PetalburgCity_Movement_1DC64C: @ 81DC64C +PetalburgCity_Movement_BoyWalkToGym3: @ 81DC64C walk_right walk_right walk_right @@ -440,7 +440,7 @@ PetalburgCity_Movement_1DC64C: @ 81DC64C walk_in_place_fastest_up step_end -PetalburgCity_Movement_1DC658: @ 81DC658 +PetalburgCity_Movement_BoyWalkAway: @ 81DC658 walk_down walk_left walk_left @@ -455,7 +455,7 @@ PetalburgCity_Movement_1DC658: @ 81DC658 walk_left step_end -PetalburgCity_Movement_1DC665: @ 81DC665 +PetalburgCity_Movement_PlayerWalkToGym0: @ 81DC665 walk_down walk_right walk_right @@ -467,7 +467,7 @@ PetalburgCity_Movement_1DC665: @ 81DC665 walk_up step_end -PetalburgCity_Movement_1DC66F: @ 81DC66F +PetalburgCity_Movement_PlayerWalkToGym1: @ 81DC66F delay_16 delay_16 walk_down @@ -482,7 +482,7 @@ PetalburgCity_Movement_1DC66F: @ 81DC66F walk_up step_end -PetalburgCity_Movement_1DC67C: @ 81DC67C +PetalburgCity_Movement_PlayerWalkToGym2: @ 81DC67C walk_up walk_right walk_right @@ -494,7 +494,7 @@ PetalburgCity_Movement_1DC67C: @ 81DC67C walk_up step_end -PetalburgCity_Movement_1DC686: @ 81DC686 +PetalburgCity_Movement_PlayerWalkToGym3: @ 81DC686 walk_up walk_right walk_right @@ -507,115 +507,115 @@ PetalburgCity_Movement_1DC686: @ 81DC686 walk_up step_end -PetalburgCity_EventScript_1DC691:: @ 81DC691 +PetalburgCity_EventScript_Scott0:: @ 81DC691 lockall addobject 9 setvar VAR_0x8008, 0 setobjectxy 9, 13, 10 - goto PetalburgCity_EventScript_1DC6E9 + goto PetalburgCity_EventScript_Scott end -PetalburgCity_EventScript_1DC6A7:: @ 81DC6A7 +PetalburgCity_EventScript_Scott1:: @ 81DC6A7 lockall addobject 9 setvar VAR_0x8008, 1 setobjectxy 9, 13, 11 - goto PetalburgCity_EventScript_1DC6E9 + goto PetalburgCity_EventScript_Scott end -PetalburgCity_EventScript_1DC6BD:: @ 81DC6BD +PetalburgCity_EventScript_Scott2:: @ 81DC6BD lockall addobject 9 setvar VAR_0x8008, 2 setobjectxy 9, 13, 12 - goto PetalburgCity_EventScript_1DC6E9 + goto PetalburgCity_EventScript_Scott end -PetalburgCity_EventScript_1DC6D3:: @ 81DC6D3 +PetalburgCity_EventScript_Scott3:: @ 81DC6D3 lockall addobject 9 setvar VAR_0x8008, 3 setobjectxy 9, 13, 13 - goto PetalburgCity_EventScript_1DC6E9 + goto PetalburgCity_EventScript_Scott end -PetalburgCity_EventScript_1DC6E9:: @ 81DC6E9 - applymovement 9, PetalburgCity_Movement_1DC7D6 +PetalburgCity_EventScript_Scott:: @ 81DC6E9 + applymovement 9, PetalburgCity_Movement_ScottStartWalkLeft waitmovement 0 playse SE_PIN applymovement 9, Common_Movement_ExclamationMark waitmovement 0 applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement 9, PetalburgCity_Movement_1DC7DB + applymovement 9, PetalburgCity_Movement_ScottApproachPlayer waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 setvar VAR_SCOTT_STATE, 1 - msgbox PetalburgCity_Text_1DCB31, MSGBOX_DEFAULT + msgbox PetalburgCity_Text_AreYouATrainer, MSGBOX_DEFAULT closemessage applymovement 9, Common_Movement_WalkInPlaceFastestRight waitmovement 0 delay 30 - msgbox PetalburgCity_Text_1DCB82, MSGBOX_DEFAULT + msgbox PetalburgCity_Text_WellMaybeNot, MSGBOX_DEFAULT closemessage applymovement 9, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 delay 30 - msgbox PetalburgCity_Text_1DCC09, MSGBOX_DEFAULT + msgbox PetalburgCity_Text_ImLookingForTalentedTrainers, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 0 - call_if_eq PetalburgCity_EventScript_1DC78E + call_if_eq PetalburgCity_EventScript_ScottExit0 compare VAR_0x8008, 1 - call_if_eq PetalburgCity_EventScript_1DC7A0 + call_if_eq PetalburgCity_EventScript_ScottExit1 compare VAR_0x8008, 2 - call_if_eq PetalburgCity_EventScript_1DC7B2 + call_if_eq PetalburgCity_EventScript_ScottExit2 compare VAR_0x8008, 3 - call_if_eq PetalburgCity_EventScript_1DC7C4 + call_if_eq PetalburgCity_EventScript_ScottExit3 setvar VAR_SCOTT_PETALBURG_ENCOUNTER, 1 removeobject 9 releaseall end -PetalburgCity_EventScript_1DC78E:: @ 81DC78E - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC7EE - applymovement 9, PetalburgCity_Movement_1DC7E0 +PetalburgCity_EventScript_ScottExit0:: @ 81DC78E + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_PlayerWatchScottExit0 + applymovement 9, PetalburgCity_Movement_ScottExit0 waitmovement 0 return -PetalburgCity_EventScript_1DC7A0:: @ 81DC7A0 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC802 - applymovement 9, PetalburgCity_Movement_1DC7F5 +PetalburgCity_EventScript_ScottExit1:: @ 81DC7A0 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_PlayerWatchScottExit1 + applymovement 9, PetalburgCity_Movement_ScottExit1 waitmovement 0 return -PetalburgCity_EventScript_1DC7B2:: @ 81DC7B2 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC815 - applymovement 9, PetalburgCity_Movement_1DC808 +PetalburgCity_EventScript_ScottExit2:: @ 81DC7B2 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_PlayerWatchScottExit2 + applymovement 9, PetalburgCity_Movement_ScottExit2 waitmovement 0 return -PetalburgCity_EventScript_1DC7C4:: @ 81DC7C4 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC828 - applymovement 9, PetalburgCity_Movement_1DC81B +PetalburgCity_EventScript_ScottExit3:: @ 81DC7C4 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_PlayerWatchScottExit3 + applymovement 9, PetalburgCity_Movement_ScottExit3 waitmovement 0 return -PetalburgCity_Movement_1DC7D6: @ 81DC7D6 +PetalburgCity_Movement_ScottStartWalkLeft: @ 81DC7D6 walk_left walk_left walk_left walk_left step_end -PetalburgCity_Movement_1DC7DB: @ 81DC7DB +PetalburgCity_Movement_ScottApproachPlayer: @ 81DC7DB walk_left walk_left walk_left walk_left step_end -PetalburgCity_Movement_1DC7E0: @ 81DC7E0 +PetalburgCity_Movement_ScottExit0: @ 81DC7E0 walk_down walk_down walk_left @@ -631,7 +631,7 @@ PetalburgCity_Movement_1DC7E0: @ 81DC7E0 walk_left step_end -PetalburgCity_Movement_1DC7EE: @ 81DC7EE +PetalburgCity_Movement_PlayerWatchScottExit0: @ 81DC7EE delay_16 walk_in_place_fastest_down delay_16 @@ -640,7 +640,7 @@ PetalburgCity_Movement_1DC7EE: @ 81DC7EE walk_in_place_fastest_left step_end -PetalburgCity_Movement_1DC7F5: @ 81DC7F5 +PetalburgCity_Movement_ScottExit1: @ 81DC7F5 walk_down walk_left walk_left @@ -655,7 +655,7 @@ PetalburgCity_Movement_1DC7F5: @ 81DC7F5 walk_left step_end -PetalburgCity_Movement_1DC802: @ 81DC802 +PetalburgCity_Movement_PlayerWatchScottExit1: @ 81DC802 delay_16 walk_in_place_fastest_down delay_16 @@ -663,7 +663,7 @@ PetalburgCity_Movement_1DC802: @ 81DC802 walk_in_place_fastest_left step_end -PetalburgCity_Movement_1DC808: @ 81DC808 +PetalburgCity_Movement_ScottExit2: @ 81DC808 walk_down walk_left walk_left @@ -678,7 +678,7 @@ PetalburgCity_Movement_1DC808: @ 81DC808 walk_left step_end -PetalburgCity_Movement_1DC815: @ 81DC815 +PetalburgCity_Movement_PlayerWatchScottExit2: @ 81DC815 delay_16 walk_in_place_fastest_down delay_16 @@ -686,7 +686,7 @@ PetalburgCity_Movement_1DC815: @ 81DC815 walk_in_place_fastest_left step_end -PetalburgCity_Movement_1DC81B: @ 81DC81B +PetalburgCity_Movement_ScottExit3: @ 81DC81B walk_up walk_left walk_left @@ -701,7 +701,7 @@ PetalburgCity_Movement_1DC81B: @ 81DC81B walk_left step_end -PetalburgCity_Movement_1DC828: @ 81DC828 +PetalburgCity_Movement_PlayerWatchScottExit3: @ 81DC828 delay_16 walk_in_place_fastest_up delay_16 @@ -709,16 +709,16 @@ PetalburgCity_Movement_1DC828: @ 81DC828 walk_in_place_fastest_left step_end -PetalburgCity_EventScript_1DC82E:: @ 81DC82E - msgbox PetalburgCity_Text_1DC881, MSGBOX_NPC +PetalburgCity_EventScript_Boy2:: @ 81DC82E + msgbox PetalburgCity_Text_AreYouRookieTrainer, MSGBOX_NPC end -PetalburgCity_Text_1DC837: @ 81DC837 +PetalburgCity_Text_WhereIsWally: @ 81DC837 .string "Where has our WALLY gone?\p" .string "We have to leave for VERDANTURF TOWN\n" .string "very soon…$" -PetalburgCity_Text_1DC881: @ 81DC881 +PetalburgCity_Text_AreYouRookieTrainer: @ 81DC881 .string "Hiya! Are you maybe…\n" .string "A rookie TRAINER?\p" .string "Do you know what POKéMON TRAINERS\n" @@ -726,51 +726,51 @@ PetalburgCity_Text_1DC881: @ 81DC881 .string "They first check what kind of GYM\n" .string "is in the town.$" -PetalburgCity_Text_1DC91B: @ 81DC91B +PetalburgCity_Text_ThisIsPetalburgGym: @ 81DC91B .string "See? This is PETALBURG CITY's GYM.$" -PetalburgCity_Text_1DC93E: @ 81DC93E +PetalburgCity_Text_ThisIsGymSign: @ 81DC93E .string "This is the GYM's sign. Look for it\n" .string "whenever you're looking for a GYM.$" -PetalburgCity_Text_1DC985: @ 81DC985 +PetalburgCity_Text_WaterReflection: @ 81DC985 .string "My face is reflected in the water.\p" .string "It's a shining grin full of hope…\p" .string "Or it could be a look of somber silence\n" .string "struggling with fear…\p" .string "What do you see reflected in your face?$" -PetalburgCity_Text_1DCA30: @ 81DCA30 +PetalburgCity_Text_FullPartyExplanation: @ 81DCA30 .string "Let's say you have six POKéMON.\n" .string "If you catch another one…\p" .string "It is automatically sent to a STORAGE\n" .string "BOX over a PC connection.$" -PetalburgCity_Text_1DCAAA: @ 81DCAAA +PetalburgCity_Text_GymSign: @ 81DCAAA .string "PETALBURG CITY POKéMON GYM\n" .string "LEADER: NORMAN\l" .string "“A man in pursuit of power!”$" -PetalburgCity_Text_1DCAF1: @ 81DCAF1 +PetalburgCity_Text_CitySign: @ 81DCAF1 .string "PETALBURG CITY\n" .string "“Where people mingle with nature.”$" -PetalburgCity_Text_1DCB23: @ 81DCB23 +PetalburgCity_Text_WallyHouseSign: @ 81DCB23 .string "WALLY'S HOUSE$" -PetalburgCity_Text_1DCB31: @ 81DCB31 +PetalburgCity_Text_AreYouATrainer: @ 81DCB31 .string "Excuse me!\p" .string "Let me guess, from the way you're\n" .string "dressed, are you a POKéMON TRAINER?$" -PetalburgCity_Text_1DCB82: @ 81DCB82 +PetalburgCity_Text_WellMaybeNot: @ 81DCB82 .string "… … … … … …\p" .string "Well, maybe not.\n" .string "Your clothes aren't all that dirty.\p" .string "You're either a rookie TRAINER,\n" .string "or maybe you're just an ordinary kid.$" -PetalburgCity_Text_1DCC09: @ 81DCC09 +PetalburgCity_Text_ImLookingForTalentedTrainers: @ 81DCC09 .string "I'm roaming the land in search of\n" .string "talented TRAINERS.\p" .string "I'm sorry to have taken your time.$" diff --git a/data/maps/PetalburgCity_Gym/map.json b/data/maps/PetalburgCity_Gym/map.json index ff317c943..30cb6e209 100644 --- a/data/maps/PetalburgCity_Gym/map.json +++ b/data/maps/PetalburgCity_Gym/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_Gym_EventScript_2049F1", + "script": "PetalburgCity_Gym_EventScript_Norman", "flag": "FLAG_HIDE_PETALBURG_GYM_NORMAN" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_Gym_EventScript_2054AA", + "script": "PetalburgCity_Gym_EventScript_Mary", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_Gym_EventScript_2053BA", + "script": "PetalburgCity_Gym_EventScript_Randall", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_Gym_EventScript_2053F6", + "script": "PetalburgCity_Gym_EventScript_Parker", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_Gym_EventScript_2054E6", + "script": "PetalburgCity_Gym_EventScript_Alexia", "flag": "0" }, { @@ -89,7 +89,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_Gym_EventScript_205432", + "script": "PetalburgCity_Gym_EventScript_George", "flag": "0" }, { @@ -102,7 +102,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_Gym_EventScript_205522", + "script": "PetalburgCity_Gym_EventScript_Jody", "flag": "0" }, { @@ -115,7 +115,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_Gym_EventScript_20546E", + "script": "PetalburgCity_Gym_EventScript_Berke", "flag": "0" }, { @@ -128,7 +128,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_Gym_EventScript_20574F", + "script": "PetalburgCity_Gym_EventScript_GymGuide", "flag": "FLAG_HIDE_PETALBURG_GYM_GREETER" }, { @@ -434,7 +434,7 @@ "y": 105, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "PetalburgCity_Gym_EventScript_205137" + "script": "PetalburgCity_Gym_EventScript_SpeedRoomDoor" }, { "type": "sign", @@ -442,7 +442,7 @@ "y": 105, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "PetalburgCity_Gym_EventScript_205187" + "script": "PetalburgCity_Gym_EventScript_AccuracyRoomDoor" }, { "type": "sign", @@ -450,7 +450,7 @@ "y": 79, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "PetalburgCity_Gym_EventScript_2051BC" + "script": "PetalburgCity_Gym_EventScript_ConfusionRoomDoor" }, { "type": "sign", @@ -458,7 +458,7 @@ "y": 79, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "PetalburgCity_Gym_EventScript_2051EF" + "script": "PetalburgCity_Gym_EventScript_LeftDefenseRoomDoor" }, { "type": "sign", @@ -466,7 +466,7 @@ "y": 92, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "PetalburgCity_Gym_EventScript_205222" + "script": "PetalburgCity_Gym_EventScript_RightDefenseRoomDoor" }, { "type": "sign", @@ -474,7 +474,7 @@ "y": 92, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "PetalburgCity_Gym_EventScript_205255" + "script": "PetalburgCity_Gym_EventScript_RecoveryRoomDoor" }, { "type": "sign", @@ -482,7 +482,7 @@ "y": 40, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "PetalburgCity_Gym_EventScript_205288" + "script": "PetalburgCity_Gym_EventScript_LeftStrengthRoomDoor" }, { "type": "sign", @@ -490,7 +490,7 @@ "y": 53, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "PetalburgCity_Gym_EventScript_2052BB" + "script": "PetalburgCity_Gym_EventScript_RightStrengthRoomDoor" }, { "type": "sign", @@ -498,7 +498,7 @@ "y": 53, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "PetalburgCity_Gym_EventScript_2052EE" + "script": "PetalburgCity_Gym_EventScript_LeftOHKORoomDoor" }, { "type": "sign", @@ -506,7 +506,7 @@ "y": 66, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "PetalburgCity_Gym_EventScript_205321" + "script": "PetalburgCity_Gym_EventScript_RightOHKORoomDoor" }, { "type": "sign", @@ -514,7 +514,7 @@ "y": 14, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "PetalburgCity_Gym_EventScript_205354" + "script": "PetalburgCity_Gym_EventScript_LeftGymLeadersRoomDoor" }, { "type": "sign", @@ -522,7 +522,7 @@ "y": 27, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "PetalburgCity_Gym_EventScript_205387" + "script": "PetalburgCity_Gym_EventScript_RightGymLeadersRoomDoor" }, { "type": "sign", @@ -530,7 +530,7 @@ "y": 110, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "PetalburgCity_Gym_EventScript_20576E" + "script": "PetalburgCity_Gym_EventScript_LeftGymStatue" }, { "type": "sign", @@ -538,7 +538,7 @@ "y": 110, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "PetalburgCity_Gym_EventScript_20577E" + "script": "PetalburgCity_Gym_EventScript_RightGymStatue" } ] }
\ No newline at end of file diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index 4da701395..f6a21b0b8 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -1,97 +1,98 @@ PetalburgCity_Gym_MapScripts:: @ 8204889 - map_script MAP_SCRIPT_ON_LOAD, PetalburgCity_Gym_OnTransition - map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_Gym_MapScript1_20492D - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PetalburgCity_Gym_MapScript2_20498B - map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_Gym_MapScript2_20499A + map_script MAP_SCRIPT_ON_LOAD, PetalburgCity_Gym_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_Gym_OnTransition + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PetalburgCity_Gym_OnWarp + map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_Gym_OnFrame .byte 0 -PetalburgCity_Gym_OnTransition: @ 820489E +PetalburgCity_Gym_OnLoad: @ 820489E compare VAR_PETALBURG_GYM_STATE, 6 - goto_if_eq PetalburgCity_Gym_EventScript_2048B5 + goto_if_eq PetalburgCity_Gym_EventScript_OpenUnlockedDoors compare VAR_PETALBURG_GYM_STATE, 7 - call_if_ge PetalburgCity_Gym_EventScript_2048FF + call_if_ge PetalburgCity_Gym_EventScript_UnlockAllDoors end -PetalburgCity_Gym_EventScript_2048B5:: @ 82048B5 +@ NOTE: Strength and OHKO rooms are misleading. Both are more accurately Critical-Hit +PetalburgCity_Gym_EventScript_OpenUnlockedDoors:: @ 82048B5 setvar VAR_0x8005, 1 - call PetalburgCity_Gym_EventScript_20555E + call PetalburgCity_Gym_EventScript_OpenGymEntranceDoors checktrainerflag TRAINER_RANDALL - call_if_eq PetalburgCity_Gym_EventScript_20557F + call_if_eq PetalburgCity_Gym_EventScript_OpenSpeedRoomDoors checktrainerflag TRAINER_MARY - call_if_eq PetalburgCity_Gym_EventScript_2055A0 + call_if_eq PetalburgCity_Gym_EventScript_OpenAccuracyRoomDoors checktrainerflag TRAINER_PARKER - call_if_eq PetalburgCity_Gym_EventScript_2055C1 + call_if_eq PetalburgCity_Gym_EventScript_OpenConfusionRoomDoors checktrainerflag TRAINER_ALEXIA - call_if_eq PetalburgCity_Gym_EventScript_2055E2 + call_if_eq PetalburgCity_Gym_EventScript_OpenDefenseRoomDoors checktrainerflag TRAINER_GEORGE - call_if_eq PetalburgCity_Gym_EventScript_205603 + call_if_eq PetalburgCity_Gym_EventScript_OpenRecoveryRoomDoors checktrainerflag TRAINER_JODY - call_if_eq PetalburgCity_Gym_EventScript_205624 + call_if_eq PetalburgCity_Gym_EventScript_OpenStrengthRoomDoors checktrainerflag TRAINER_BERKE - call_if_eq PetalburgCity_Gym_EventScript_205645 + call_if_eq PetalburgCity_Gym_EventScript_OpenOHKORoomDoors end -PetalburgCity_Gym_EventScript_2048FF:: @ 82048FF +PetalburgCity_Gym_EventScript_UnlockAllDoors:: @ 82048FF setvar VAR_0x8005, 1 - call PetalburgCity_Gym_EventScript_20555E - call PetalburgCity_Gym_EventScript_20557F - call PetalburgCity_Gym_EventScript_2055A0 - call PetalburgCity_Gym_EventScript_2055C1 - call PetalburgCity_Gym_EventScript_2055E2 - call PetalburgCity_Gym_EventScript_205603 - call PetalburgCity_Gym_EventScript_205624 - call PetalburgCity_Gym_EventScript_205645 + call PetalburgCity_Gym_EventScript_OpenGymEntranceDoors + call PetalburgCity_Gym_EventScript_OpenSpeedRoomDoors + call PetalburgCity_Gym_EventScript_OpenAccuracyRoomDoors + call PetalburgCity_Gym_EventScript_OpenConfusionRoomDoors + call PetalburgCity_Gym_EventScript_OpenDefenseRoomDoors + call PetalburgCity_Gym_EventScript_OpenRecoveryRoomDoors + call PetalburgCity_Gym_EventScript_OpenStrengthRoomDoors + call PetalburgCity_Gym_EventScript_OpenOHKORoomDoors return -PetalburgCity_Gym_MapScript1_20492D: @ 820492D +PetalburgCity_Gym_OnTransition: @ 820492D compare VAR_PETALBURG_GYM_STATE, 1 - call_if_eq PetalburgCity_Gym_EventScript_20494D + call_if_eq PetalburgCity_Gym_EventScript_MoveWallyToEntrance compare VAR_PETALBURG_GYM_STATE, 6 - call_if_lt PetalburgCity_Gym_EventScript_204955 - call_if_set FLAG_SYS_GAME_CLEAR, PetalburgCity_Gym_EventScript_20495D + call_if_lt PetalburgCity_Gym_EventScript_MoveNormanToEntrance + call_if_set FLAG_SYS_GAME_CLEAR, PetalburgCity_Gym_EventScript_CheckNormanForRematch end -PetalburgCity_Gym_EventScript_20494D:: @ 820494D +PetalburgCity_Gym_EventScript_MoveWallyToEntrance:: @ 820494D setobjectxyperm 10, 5, 108 return -PetalburgCity_Gym_EventScript_204955:: @ 8204955 +PetalburgCity_Gym_EventScript_MoveNormanToEntrance:: @ 8204955 setobjectxyperm 1, 4, 107 return -PetalburgCity_Gym_EventScript_20495D:: @ 820495D - setorcopyvar VAR_TRAINER_BATTLE_OPPONENT_A, 269 +PetalburgCity_Gym_EventScript_CheckNormanForRematch:: @ 820495D + setorcopyvar VAR_TRAINER_BATTLE_OPPONENT_A, TRAINER_NORMAN_1 specialvar VAR_RESULT, IsTrainerReadyForRematch - compare VAR_RESULT, 1 - goto_if_eq PetalburgCity_Gym_EventScript_204985 + compare VAR_RESULT, TRUE + goto_if_eq PetalburgCity_Gym_EventScript_DontMoveNormanToFront compare VAR_PETALBURG_GYM_STATE, 8 - goto_if_eq PetalburgCity_Gym_EventScript_204985 + goto_if_eq PetalburgCity_Gym_EventScript_DontMoveNormanToFront setobjectxyperm 1, 4, 107 return -PetalburgCity_Gym_EventScript_204985:: @ 8204985 +PetalburgCity_Gym_EventScript_DontMoveNormanToFront:: @ 8204985 setvar VAR_PETALBURG_GYM_STATE, 8 end -PetalburgCity_Gym_MapScript2_20498B: @ 820498B - map_script_2 VAR_PETALBURG_GYM_STATE, 1, PetalburgCity_Gym_EventScript_204995 +PetalburgCity_Gym_OnWarp: @ 820498B + map_script_2 VAR_PETALBURG_GYM_STATE, 1, PetalburgCity_Gym_EventScript_TurnPlayerNorth .2byte 0 -PetalburgCity_Gym_EventScript_204995:: @ 8204995 +PetalburgCity_Gym_EventScript_TurnPlayerNorth:: @ 8204995 turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH end -PetalburgCity_Gym_MapScript2_20499A: @ 820499A - map_script_2 VAR_PETALBURG_GYM_STATE, 1, PetalburgCity_Gym_EventScript_2049A4 +PetalburgCity_Gym_OnFrame: @ 820499A + map_script_2 VAR_PETALBURG_GYM_STATE, 1, PetalburgCity_Gym_EventScript_ReturnFromWallyTutorial .2byte 0 -PetalburgCity_Gym_EventScript_2049A4:: @ 82049A4 +PetalburgCity_Gym_EventScript_ReturnFromWallyTutorial:: @ 82049A4 lockall - msgbox PetalburgCity_Gym_Text_205B32, MSGBOX_DEFAULT - msgbox PetalburgCity_Gym_Text_205B4C, MSGBOX_DEFAULT + msgbox PetalburgCity_Gym_Text_DadSoDidItWorkOut, MSGBOX_DEFAULT + msgbox PetalburgCity_Gym_Text_WallyThankYouBye, MSGBOX_DEFAULT closemessage applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown - applymovement 10, PetalburgCity_Gym_Movement_2049EC + applymovement 10, PetalburgCity_Gym_Movement_WallyExitGym waitmovement 0 playse SE_KAIDAN removeobject 10 @@ -99,121 +100,121 @@ PetalburgCity_Gym_EventScript_2049A4:: @ 82049A4 delay 30 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - msgbox PetalburgCity_Gym_Text_205C40, MSGBOX_DEFAULT + msgbox PetalburgCity_Gym_Text_DadGoCollectBadges, MSGBOX_DEFAULT setvar VAR_PETALBURG_GYM_STATE, 2 releaseall end -PetalburgCity_Gym_Movement_2049EC: @ 82049EC +PetalburgCity_Gym_Movement_WallyExitGym: @ 82049EC walk_down walk_down walk_down delay_16 step_end -PetalburgCity_Gym_EventScript_2049F1:: @ 82049F1 +PetalburgCity_Gym_EventScript_Norman:: @ 82049F1 lock faceplayer switch VAR_PETALBURG_GYM_STATE - case 2, PetalburgCity_Gym_EventScript_204D4A - case 3, PetalburgCity_Gym_EventScript_204D54 - case 4, PetalburgCity_Gym_EventScript_204D5E - case 5, PetalburgCity_Gym_EventScript_204D68 - case 6, PetalburgCity_Gym_EventScript_204E3B - case 7, PetalburgCity_Gym_EventScript_204D80 - case 8, PetalburgCity_Gym_EventScript_204DB3 - msgbox PetalburgCity_Gym_Text_2057A2, MSGBOX_DEFAULT + case 2, PetalburgCity_Gym_EventScript_NormanNoBadges + case 3, PetalburgCity_Gym_EventScript_NormanOneBadge + case 4, PetalburgCity_Gym_EventScript_NormanTwoBadges + case 5, PetalburgCity_Gym_EventScript_NormanThreeBadges + case 6, PetalburgCity_Gym_EventScript_NormanBattle + case 7, PetalburgCity_Gym_EventScript_NormanPostBattle + case 8, PetalburgCity_Gym_EventScript_NormanRematch + msgbox PetalburgCity_Gym_Text_DadYoureHereWithYourPokemon, MSGBOX_DEFAULT closemessage switch VAR_FACING - case DIR_SOUTH, PetalburgCity_Gym_EventScript_204A80 - case DIR_NORTH, PetalburgCity_Gym_EventScript_204A8B - case DIR_WEST, PetalburgCity_Gym_EventScript_204A96 - case DIR_EAST, PetalburgCity_Gym_EventScript_204AA1 + case DIR_SOUTH, PetalburgCity_Gym_EventScript_BeginWallyTutorialSouth + case DIR_NORTH, PetalburgCity_Gym_EventScript_BeginWallyTutorialNorth + case DIR_WEST, PetalburgCity_Gym_EventScript_BeginWallyTutorialWest + case DIR_EAST, PetalburgCity_Gym_EventScript_BeginWallyTutorialEast end -PetalburgCity_Gym_EventScript_204A80:: @ 8204A80 +PetalburgCity_Gym_EventScript_BeginWallyTutorialSouth:: @ 8204A80 setvar VAR_0x8008, 0 - goto PetalburgCity_Gym_EventScript_204AAC + goto PetalburgCity_Gym_EventScript_BeginWallyTutorial end -PetalburgCity_Gym_EventScript_204A8B:: @ 8204A8B +PetalburgCity_Gym_EventScript_BeginWallyTutorialNorth:: @ 8204A8B setvar VAR_0x8008, 1 - goto PetalburgCity_Gym_EventScript_204AAC + goto PetalburgCity_Gym_EventScript_BeginWallyTutorial end -PetalburgCity_Gym_EventScript_204A96:: @ 8204A96 +PetalburgCity_Gym_EventScript_BeginWallyTutorialWest:: @ 8204A96 setvar VAR_0x8008, 2 - goto PetalburgCity_Gym_EventScript_204AAC + goto PetalburgCity_Gym_EventScript_BeginWallyTutorial end -PetalburgCity_Gym_EventScript_204AA1:: @ 8204AA1 +PetalburgCity_Gym_EventScript_BeginWallyTutorialEast:: @ 8204AA1 setvar VAR_0x8008, 3 - goto PetalburgCity_Gym_EventScript_204AAC + goto PetalburgCity_Gym_EventScript_BeginWallyTutorial end -PetalburgCity_Gym_EventScript_204AAC:: @ 8204AAC - addobject 10 +PetalburgCity_Gym_EventScript_BeginWallyTutorial:: @ 8204AAC + addobject 10 @ Wally playse SE_DOOR compare VAR_0x8008, 0 - call_if_eq PetalburgCity_Gym_EventScript_204C31 + call_if_eq PetalburgCity_Gym_EventScript_WallyArriveSouth compare VAR_0x8008, 1 - call_if_eq PetalburgCity_Gym_EventScript_204C43 + call_if_eq PetalburgCity_Gym_EventScript_WallyArriveNorth compare VAR_0x8008, 2 - call_if_eq PetalburgCity_Gym_EventScript_204C5F + call_if_eq PetalburgCity_Gym_EventScript_WallyArriveWestEast compare VAR_0x8008, 3 - call_if_eq PetalburgCity_Gym_EventScript_204C5F - msgbox PetalburgCity_Gym_Text_2058B1, MSGBOX_DEFAULT - msgbox PetalburgCity_Gym_Text_2058DB, MSGBOX_DEFAULT - msgbox PetalburgCity_Gym_Text_205910, MSGBOX_DEFAULT - msgbox PetalburgCity_Gym_Text_2059D8, MSGBOX_DEFAULT + call_if_eq PetalburgCity_Gym_EventScript_WallyArriveWestEast + msgbox PetalburgCity_Gym_Text_WallyIdLikeAPokemon, MSGBOX_DEFAULT + msgbox PetalburgCity_Gym_Text_DadOhYoureWallyRight, MSGBOX_DEFAULT + msgbox PetalburgCity_Gym_Text_WallyIveNeverCaughtAPokemon, MSGBOX_DEFAULT + msgbox PetalburgCity_Gym_Text_DadHmISee, MSGBOX_DEFAULT compare VAR_0x8008, 0 - call_if_eq PetalburgCity_Gym_EventScript_204CC7 + call_if_eq PetalburgCity_Gym_EventScript_NormanAddressPlayerSouth compare VAR_0x8008, 1 - call_if_eq PetalburgCity_Gym_EventScript_204CD2 + call_if_eq PetalburgCity_Gym_EventScript_NormanAddressPlayerNorth compare VAR_0x8008, 2 - call_if_eq PetalburgCity_Gym_EventScript_204CE4 + call_if_eq PetalburgCity_Gym_EventScript_NormanAddressPlayerWest compare VAR_0x8008, 3 - call_if_eq PetalburgCity_Gym_EventScript_204CF6 - msgbox PetalburgCity_Gym_Text_2059E8, MSGBOX_DEFAULT + call_if_eq PetalburgCity_Gym_EventScript_NormanAddressPlayerEast + msgbox PetalburgCity_Gym_Text_DadPlayerGoWithWally, MSGBOX_DEFAULT compare VAR_0x8008, 0 - call_if_eq PetalburgCity_Gym_EventScript_204D08 + call_if_eq PetalburgCity_Gym_EventScript_NormanAddressWallySouth compare VAR_0x8008, 1 - call_if_eq PetalburgCity_Gym_EventScript_204D13 + call_if_eq PetalburgCity_Gym_EventScript_NormanAddressWallyNorth compare VAR_0x8008, 2 - call_if_eq PetalburgCity_Gym_EventScript_204D1E + call_if_eq PetalburgCity_Gym_EventScript_NormanAddressWallyWest compare VAR_0x8008, 3 - call_if_eq PetalburgCity_Gym_EventScript_204D29 - msgbox PetalburgCity_Gym_Text_205A46, MSGBOX_DEFAULT - msgbox PetalburgCity_Gym_Text_205A89, MSGBOX_DEFAULT - msgbox PetalburgCity_Gym_Text_205AF4, MSGBOX_DEFAULT + call_if_eq PetalburgCity_Gym_EventScript_NormanAddressWallyEast + msgbox PetalburgCity_Gym_Text_IllLoanYouMyZigzagoon, MSGBOX_DEFAULT + msgbox PetalburgCity_Gym_Text_WallyThankYouAndDadGivesPokeBall, MSGBOX_DEFAULT + msgbox PetalburgCity_Gym_Text_WallyOhWowThankYou, MSGBOX_DEFAULT compare VAR_0x8008, 0 - call_if_eq PetalburgCity_Gym_EventScript_204D72 + call_if_eq PetalburgCity_Gym_EventScript_NormanFaceDoorSouth compare VAR_0x8008, 1 - call_if_eq PetalburgCity_Gym_EventScript_204D73 + call_if_eq PetalburgCity_Gym_EventScript_NormanFaceDoorNorth compare VAR_0x8008, 2 - call_if_eq PetalburgCity_Gym_EventScript_204D7E + call_if_eq PetalburgCity_Gym_EventScript_NormanFaceDoorWest compare VAR_0x8008, 3 - call_if_eq PetalburgCity_Gym_EventScript_204D7F + call_if_eq PetalburgCity_Gym_EventScript_NormanFaceDoorEast compare VAR_0x8008, 0 - call_if_eq PetalburgCity_Gym_EventScript_204D34 + call_if_eq PetalburgCity_Gym_EventScript_WallyFacePlayer compare VAR_0x8008, 1 - call_if_eq PetalburgCity_Gym_EventScript_204D3F + call_if_eq PetalburgCity_Gym_EventScript_WallyFaceDown compare VAR_0x8008, 2 - call_if_eq PetalburgCity_Gym_EventScript_204D34 + call_if_eq PetalburgCity_Gym_EventScript_WallyFacePlayer compare VAR_0x8008, 3 - call_if_eq PetalburgCity_Gym_EventScript_204D34 - msgbox PetalburgCity_Gym_Text_205B0F, MSGBOX_DEFAULT + call_if_eq PetalburgCity_Gym_EventScript_WallyFacePlayer + msgbox PetalburgCity_Gym_Text_WouldYouReallyComeWithMe, MSGBOX_DEFAULT closemessage - setflag FLAG_SPECIAL_FLAG_0x4001 + setflag FLAG_DONT_TRANSITION_MUSIC playbgm MUS_TSURETEK, 0 compare VAR_0x8008, 0 - call_if_eq PetalburgCity_Gym_EventScript_204C78 + call_if_eq PetalburgCity_Gym_EventScript_ExitGymWithWallySouth compare VAR_0x8008, 1 - call_if_eq PetalburgCity_Gym_EventScript_204C91 + call_if_eq PetalburgCity_Gym_EventScript_ExitGymWithWallyNorth compare VAR_0x8008, 2 - call_if_eq PetalburgCity_Gym_EventScript_204CA3 + call_if_eq PetalburgCity_Gym_EventScript_ExitGymWithWallyWest compare VAR_0x8008, 3 - call_if_eq PetalburgCity_Gym_EventScript_204CB5 + call_if_eq PetalburgCity_Gym_EventScript_ExitGymWithWallyEast removeobject 10 setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_AUNT setvar VAR_PETALBURG_GYM_STATE, 1 @@ -227,180 +228,181 @@ PetalburgCity_Gym_EventScript_204AAC:: @ 8204AAC release end -PetalburgCity_Gym_EventScript_204C31:: @ 8204C31 +PetalburgCity_Gym_EventScript_WallyArriveSouth:: @ 8204C31 applymovement 1, Common_Movement_WalkInPlaceFastestDown - applymovement 10, PetalburgCity_Gym_Movement_2050EB + applymovement 10, PetalburgCity_Gym_Movement_WallyArrive waitmovement 0 return -PetalburgCity_Gym_EventScript_204C43:: @ 8204C43 - applymovement 10, PetalburgCity_Gym_Movement_2050E1 +PetalburgCity_Gym_EventScript_WallyArriveNorth:: @ 8204C43 + applymovement 10, PetalburgCity_Gym_Movement_WallyArriveNorth waitmovement 0 applymovement 1, Common_Movement_WalkInPlaceFastestRight applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return -PetalburgCity_Gym_EventScript_204C5F:: @ 8204C5F +PetalburgCity_Gym_EventScript_WallyArriveWestEast:: @ 8204C5F applymovement 1, Common_Movement_WalkInPlaceFastestDown applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown - applymovement 10, PetalburgCity_Gym_Movement_2050EB + applymovement 10, PetalburgCity_Gym_Movement_WallyArrive waitmovement 0 return -PetalburgCity_Gym_EventScript_204C78:: @ 8204C78 +PetalburgCity_Gym_EventScript_ExitGymWithWallySouth:: @ 8204C78 applymovement 1, Common_Movement_WalkInPlaceFastestDown - applymovement 10, PetalburgCity_Gym_Movement_205102 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_205111 + applymovement 10, PetalburgCity_Gym_Movement_WallyExitSouthWest + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallySouth waitmovement 0 return -PetalburgCity_Gym_EventScript_204C91:: @ 8204C91 - applymovement 10, PetalburgCity_Gym_Movement_2050F2 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_205109 +PetalburgCity_Gym_EventScript_ExitGymWithWallyNorth:: @ 8204C91 + applymovement 10, PetalburgCity_Gym_Movement_WallyExitNorth + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallyNorth waitmovement 0 return -PetalburgCity_Gym_EventScript_204CA3:: @ 8204CA3 - applymovement 10, PetalburgCity_Gym_Movement_205102 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_20511B +PetalburgCity_Gym_EventScript_ExitGymWithWallyWest:: @ 8204CA3 + applymovement 10, PetalburgCity_Gym_Movement_WallyExitSouthWest + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallyWest waitmovement 0 return -PetalburgCity_Gym_EventScript_204CB5:: @ 8204CB5 - applymovement 10, PetalburgCity_Gym_Movement_2050FA - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_205123 +PetalburgCity_Gym_EventScript_ExitGymWithWallyEast:: @ 8204CB5 + applymovement 10, PetalburgCity_Gym_Movement_WallyExitEast + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallyEast waitmovement 0 return -PetalburgCity_Gym_EventScript_204CC7:: @ 8204CC7 +PetalburgCity_Gym_EventScript_NormanAddressPlayerSouth:: @ 8204CC7 applymovement 1, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return -PetalburgCity_Gym_EventScript_204CD2:: @ 8204CD2 +PetalburgCity_Gym_EventScript_NormanAddressPlayerNorth:: @ 8204CD2 applymovement 1, Common_Movement_WalkInPlaceFastestDown applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return -PetalburgCity_Gym_EventScript_204CE4:: @ 8204CE4 +PetalburgCity_Gym_EventScript_NormanAddressPlayerWest:: @ 8204CE4 applymovement 1, Common_Movement_WalkInPlaceFastestRight applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return -PetalburgCity_Gym_EventScript_204CF6:: @ 8204CF6 +PetalburgCity_Gym_EventScript_NormanAddressPlayerEast:: @ 8204CF6 applymovement 1, Common_Movement_WalkInPlaceFastestLeft applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return -PetalburgCity_Gym_EventScript_204D08:: @ 8204D08 +PetalburgCity_Gym_EventScript_NormanAddressWallySouth:: @ 8204D08 applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return -PetalburgCity_Gym_EventScript_204D13:: @ 8204D13 +PetalburgCity_Gym_EventScript_NormanAddressWallyNorth:: @ 8204D13 applymovement 1, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return -PetalburgCity_Gym_EventScript_204D1E:: @ 8204D1E +PetalburgCity_Gym_EventScript_NormanAddressWallyWest:: @ 8204D1E applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return -PetalburgCity_Gym_EventScript_204D29:: @ 8204D29 +PetalburgCity_Gym_EventScript_NormanAddressWallyEast:: @ 8204D29 applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return -PetalburgCity_Gym_EventScript_204D34:: @ 8204D34 +PetalburgCity_Gym_EventScript_WallyFacePlayer:: @ 8204D34 applymovement 10, Common_Movement_FacePlayer waitmovement 0 return -PetalburgCity_Gym_EventScript_204D3F:: @ 8204D3F +PetalburgCity_Gym_EventScript_WallyFaceDown:: @ 8204D3F applymovement 10, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return -PetalburgCity_Gym_EventScript_204D4A:: @ 8204D4A - msgbox PetalburgCity_Gym_Text_205DB4, MSGBOX_DEFAULT +PetalburgCity_Gym_EventScript_NormanNoBadges:: @ 8204D4A + msgbox PetalburgCity_Gym_Text_NormanGoToRustboro, MSGBOX_DEFAULT release end -PetalburgCity_Gym_EventScript_204D54:: @ 8204D54 - msgbox PetalburgCity_Gym_Text_205EAE, MSGBOX_DEFAULT +PetalburgCity_Gym_EventScript_NormanOneBadge:: @ 8204D54 + msgbox PetalburgCity_Gym_Text_NormanGoToDewford, MSGBOX_DEFAULT release end -PetalburgCity_Gym_EventScript_204D5E:: @ 8204D5E - msgbox PetalburgCity_Gym_Text_205F87, MSGBOX_DEFAULT +PetalburgCity_Gym_EventScript_NormanTwoBadges:: @ 8204D5E + msgbox PetalburgCity_Gym_Text_YouHaveGottenStronger, MSGBOX_DEFAULT release end -PetalburgCity_Gym_EventScript_204D68:: @ 8204D68 - msgbox PetalburgCity_Gym_Text_205F87, MSGBOX_DEFAULT +PetalburgCity_Gym_EventScript_NormanThreeBadges:: @ 8204D68 + msgbox PetalburgCity_Gym_Text_YouHaveGottenStronger, MSGBOX_DEFAULT release end -PetalburgCity_Gym_EventScript_204D72:: @ 8204D72 +PetalburgCity_Gym_EventScript_NormanFaceDoorSouth:: @ 8204D72 return -PetalburgCity_Gym_EventScript_204D73:: @ 8204D73 +@ For all other NormanFaceDoorX, Norman is already facing the door from NormanAddressWallyX +PetalburgCity_Gym_EventScript_NormanFaceDoorNorth:: @ 8204D73 applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return -PetalburgCity_Gym_EventScript_204D7E:: @ 8204D7E +PetalburgCity_Gym_EventScript_NormanFaceDoorWest:: @ 8204D7E return -PetalburgCity_Gym_EventScript_204D7F:: @ 8204D7F +PetalburgCity_Gym_EventScript_NormanFaceDoorEast:: @ 8204D7F return -PetalburgCity_Gym_EventScript_204D80:: @ 8204D80 - call PetalburgCity_Gym_EventScript_204DCE - compare VAR_RESULT, 1 - goto_if_eq PetalburgCity_Gym_EventScript_204E1D - goto_if_unset FLAG_RECEIVED_TM42, PetalburgCity_Gym_EventScript_204DAC - goto_if_set FLAG_SYS_GAME_CLEAR, PetalburgCity_Gym_EventScript_20512D - msgbox PetalburgCity_Gym_Text_206417, MSGBOX_DEFAULT +PetalburgCity_Gym_EventScript_NormanPostBattle:: @ 8204D80 + call PetalburgCity_Gym_EventScript_ShouldGiveEnigmaBerry + compare VAR_RESULT, TRUE + goto_if_eq PetalburgCity_Gym_EventScript_GiveEnigmaBerry + goto_if_unset FLAG_RECEIVED_TM42, PetalburgCity_Gym_EventScript_GiveFacade2 + goto_if_set FLAG_SYS_GAME_CLEAR, PetalburgCity_Gym_EventScript_NoAmountOfTrainingIsEnough + msgbox PetalburgCity_Gym_Text_DadGoingToKeepTraining, MSGBOX_DEFAULT release end -PetalburgCity_Gym_EventScript_204DAC:: @ 8204DAC - call PetalburgCity_Gym_EventScript_204ED2 +PetalburgCity_Gym_EventScript_GiveFacade2:: @ 8204DAC + call PetalburgCity_Gym_EventScript_GiveFacade release end -PetalburgCity_Gym_EventScript_204DB3:: @ 8204DB3 - trainerbattle_rematch_double TRAINER_NORMAN_1, PetalburgCity_Gym_Text_2074A2, PetalburgCity_Gym_Text_2075CE, PetalburgCity_Gym_Text_20764A - msgbox PetalburgCity_Gym_Text_2075F7, MSGBOX_AUTOCLOSE +PetalburgCity_Gym_EventScript_NormanRematch:: @ 8204DB3 + trainerbattle_rematch_double TRAINER_NORMAN_1, PetalburgCity_Gym_Text_NormanPreRematch, PetalburgCity_Gym_Text_NormanRematchDefeat, PetalburgCity_Gym_Text_NormanRematchNeedTwoMons + msgbox PetalburgCity_Gym_Text_NormanPostRematch, MSGBOX_AUTOCLOSE end -PetalburgCity_Gym_EventScript_204DCE:: @ 8204DCE +PetalburgCity_Gym_EventScript_ShouldGiveEnigmaBerry:: @ 8204DCE specialvar VAR_RESULT, IsEnigmaBerryValid - compare VAR_RESULT, 0 - goto_if_eq PetalburgCity_Gym_EventScript_204E17 + compare VAR_RESULT, FALSE + goto_if_eq PetalburgCity_Gym_EventScript_DontGiveEnigmaBerry checkitem ITEM_ENIGMA_BERRY, 1 - compare VAR_RESULT, 1 - goto_if_eq PetalburgCity_Gym_EventScript_204E17 + compare VAR_RESULT, TRUE + goto_if_eq PetalburgCity_Gym_EventScript_DontGiveEnigmaBerry checkpcitem ITEM_ENIGMA_BERRY, 1 - compare VAR_RESULT, 1 - goto_if_eq PetalburgCity_Gym_EventScript_204E17 + compare VAR_RESULT, TRUE + goto_if_eq PetalburgCity_Gym_EventScript_DontGiveEnigmaBerry compare VAR_ENIGMA_BERRY_AVAILABLE, 0 - goto_if_eq PetalburgCity_Gym_EventScript_204E17 - msgbox PetalburgCity_Gym_Text_2A6D3D, MSGBOX_DEFAULT - setvar VAR_RESULT, 1 + goto_if_eq PetalburgCity_Gym_EventScript_DontGiveEnigmaBerry + msgbox PetalburgCity_Gym_Text_GiveEnigmaBerry, MSGBOX_DEFAULT + setvar VAR_RESULT, TRUE return -PetalburgCity_Gym_EventScript_204E17:: @ 8204E17 - setvar VAR_RESULT, 0 +PetalburgCity_Gym_EventScript_DontGiveEnigmaBerry:: @ 8204E17 + setvar VAR_RESULT, FALSE return -PetalburgCity_Gym_EventScript_204E1D:: @ 8204E1D +PetalburgCity_Gym_EventScript_GiveEnigmaBerry:: @ 8204E1D giveitem_std ITEM_ENIGMA_BERRY compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull @@ -408,61 +410,61 @@ PetalburgCity_Gym_EventScript_204E1D:: @ 8204E1D release end -PetalburgCity_Gym_EventScript_204E3B:: @ 8204E3B - msgbox PetalburgCity_Gym_Text_205FE5, MSGBOX_DEFAULT - trainerbattle_no_intro TRAINER_NORMAN_1, PetalburgCity_Gym_Text_206107 - message PetalburgCity_Gym_Text_206162 +PetalburgCity_Gym_EventScript_NormanBattle:: @ 8204E3B + msgbox PetalburgCity_Gym_Text_NormanPreBattle, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_NORMAN_1, PetalburgCity_Gym_Text_NormanDefeat + message PetalburgCity_Gym_Text_ReceivedBalanceBadge waitmessage call Common_EventScript_PlayGymBadgeFanfare - msgbox PetalburgCity_Gym_Text_20618A, MSGBOX_DEFAULT + msgbox PetalburgCity_Gym_Text_ExplainBalanceBadgeTakeThis, MSGBOX_DEFAULT setflag FLAG_DEFEATED_PETALBURG_GYM setvar VAR_PETALBURG_GYM_STATE, 7 setflag FLAG_BADGE05_GET special ResetHealLocationFromDewford - call PetalburgCity_Gym_EventScript_2721F8 + call EventScript_HideMrBriney setflag FLAG_HIDE_MAUVILLE_GYM_WATTSON clearflag FLAG_HIDE_MAUVILLE_CITY_WATTSON setvar VAR_0x8008, 5 call Common_EventScript_SetGymTrainers clearflag FLAG_HIDE_DEWFORD_HALL_SLUDGE_BOMB_MAN - call PetalburgCity_Gym_EventScript_2048FF + call PetalburgCity_Gym_EventScript_UnlockAllDoors special DrawWholeMapView - call PetalburgCity_Gym_EventScript_204ED2 + call PetalburgCity_Gym_EventScript_GiveFacade delay 30 - msgbox PetalburgCity_Gym_Text_2062FB, MSGBOX_DEFAULT + msgbox PetalburgCity_Gym_Text_DadHappyAndSad, MSGBOX_DEFAULT closemessage delay 40 playse SE_DOOR delay 10 - addobject 11 + addobject 11 @ Wallys Uncle switch VAR_FACING - case DIR_NORTH, PetalburgCity_Gym_EventScript_204EF5 - case DIR_WEST, PetalburgCity_Gym_EventScript_204F09 - case DIR_EAST, PetalburgCity_Gym_EventScript_204EFF + case DIR_NORTH, PetalburgCity_Gym_EventScript_WallysUncleArrivesNorth + case DIR_WEST, PetalburgCity_Gym_EventScript_WallysUncleArrivesWest + case DIR_EAST, PetalburgCity_Gym_EventScript_WallysUncleArrivesEast end -PetalburgCity_Gym_EventScript_204ED2:: @ 8204ED2 +PetalburgCity_Gym_EventScript_GiveFacade:: @ 8204ED2 giveitem_std ITEM_TM42 compare VAR_RESULT, 0 goto_if_eq Common_EventScript_BagIsFull setflag FLAG_RECEIVED_TM42 - msgbox PetalburgCity_Gym_Text_206254, MSGBOX_DEFAULT + msgbox PetalburgCity_Gym_Text_ExplainFacade, MSGBOX_DEFAULT return -PetalburgCity_Gym_EventScript_204EF5:: @ 8204EF5 +PetalburgCity_Gym_EventScript_WallysUncleArrivesNorth:: @ 8204EF5 setvar VAR_0x8008, 1 - goto PetalburgCity_Gym_EventScript_204F13 + goto PetalburgCity_Gym_EventScript_WallysUncleArrives -PetalburgCity_Gym_EventScript_204EFF:: @ 8204EFF +PetalburgCity_Gym_EventScript_WallysUncleArrivesEast:: @ 8204EFF setvar VAR_0x8008, 2 - goto PetalburgCity_Gym_EventScript_204F13 + goto PetalburgCity_Gym_EventScript_WallysUncleArrives -PetalburgCity_Gym_EventScript_204F09:: @ 8204F09 +PetalburgCity_Gym_EventScript_WallysUncleArrivesWest:: @ 8204F09 setvar VAR_0x8008, 3 - goto PetalburgCity_Gym_EventScript_204F13 + goto PetalburgCity_Gym_EventScript_WallysUncleArrives -PetalburgCity_Gym_EventScript_204F13:: @ 8204F13 - applymovement 11, PetalburgCity_Gym_Movement_2050BB +PetalburgCity_Gym_EventScript_WallysUncleArrives:: @ 8204F13 + applymovement 11, PetalburgCity_Gym_Movement_WallysUncleEnterGym waitmovement 0 playse SE_PIN applymovement 11, Common_Movement_ExclamationMark @@ -471,30 +473,30 @@ PetalburgCity_Gym_EventScript_204F13:: @ 8204F13 waitmovement 0 delay 10 compare VAR_0x8008, 1 - call_if_eq PetalburgCity_Gym_EventScript_204FED + call_if_eq PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerNorth compare VAR_0x8008, 2 - call_if_eq PetalburgCity_Gym_EventScript_205009 + call_if_eq PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerEast compare VAR_0x8008, 3 - call_if_eq PetalburgCity_Gym_EventScript_205025 - msgbox PetalburgCity_Gym_Text_206377, MSGBOX_DEFAULT + call_if_eq PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerWest + msgbox PetalburgCity_Gym_Text_PleaseComeWithMe, MSGBOX_DEFAULT closemessage delay 20 compare VAR_0x8008, 1 - call_if_eq PetalburgCity_Gym_EventScript_204FCC + call_if_eq PetalburgCity_Gym_EventScript_WallysUncleFaceNormanNorth compare VAR_0x8008, 2 - call_if_eq PetalburgCity_Gym_EventScript_204FD7 + call_if_eq PetalburgCity_Gym_EventScript_WallysUncleFaceNormanEast compare VAR_0x8008, 3 - call_if_eq PetalburgCity_Gym_EventScript_204FE2 - msgbox PetalburgCity_Gym_Text_2063CA, MSGBOX_DEFAULT + call_if_eq PetalburgCity_Gym_EventScript_WallysUncleFaceNormanWest + msgbox PetalburgCity_Gym_Text_LetMeBorrowPlayer, MSGBOX_DEFAULT closemessage - setflag FLAG_SPECIAL_FLAG_0x4001 + setflag FLAG_DONT_TRANSITION_MUSIC playbgm MUS_TSURETEK, 0 compare VAR_0x8008, 1 - call_if_eq PetalburgCity_Gym_EventScript_205041 + call_if_eq PetalburgCity_Gym_EventScript_ExitGymWithWallysUncleNorth compare VAR_0x8008, 2 - call_if_eq PetalburgCity_Gym_EventScript_20505A + call_if_eq PetalburgCity_Gym_EventScript_ExitGymWithWallysUncleEast compare VAR_0x8008, 3 - call_if_eq PetalburgCity_Gym_EventScript_20506C + call_if_eq PetalburgCity_Gym_EventScript_ExitGymWithWallysUncleWest removeobject 11 setvar VAR_PETALBURG_CITY_STATE, 4 clearflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE @@ -503,65 +505,65 @@ PetalburgCity_Gym_EventScript_204F13:: @ 8204F13 release end -PetalburgCity_Gym_EventScript_204FCC:: @ 8204FCC +PetalburgCity_Gym_EventScript_WallysUncleFaceNormanNorth:: @ 8204FCC applymovement 11, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return -PetalburgCity_Gym_EventScript_204FD7:: @ 8204FD7 +PetalburgCity_Gym_EventScript_WallysUncleFaceNormanEast:: @ 8204FD7 applymovement 11, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return -PetalburgCity_Gym_EventScript_204FE2:: @ 8204FE2 +PetalburgCity_Gym_EventScript_WallysUncleFaceNormanWest:: @ 8204FE2 applymovement 11, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return -PetalburgCity_Gym_EventScript_204FED:: @ 8204FED - applymovement 11, PetalburgCity_Gym_Movement_2050C3 +PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerNorth:: @ 8204FED + applymovement 11, PetalburgCity_Gym_Movement_WallysUncleApproachPlayerNorth waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft applymovement 1, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return -PetalburgCity_Gym_EventScript_205009:: @ 8205009 - applymovement 11, PetalburgCity_Gym_Movement_2050CA +PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerEast:: @ 8205009 + applymovement 11, PetalburgCity_Gym_Movement_WallysUncleApproachPlayerEast waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return -PetalburgCity_Gym_EventScript_205025:: @ 8205025 - applymovement 11, PetalburgCity_Gym_Movement_2050D0 +PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerWest:: @ 8205025 + applymovement 11, PetalburgCity_Gym_Movement_WallysUncleApproachPlayerWest waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return -PetalburgCity_Gym_EventScript_205041:: @ 8205041 - applymovement 11, PetalburgCity_Gym_Movement_20507E +PetalburgCity_Gym_EventScript_ExitGymWithWallysUncleNorth:: @ 8205041 + applymovement 11, PetalburgCity_Gym_Movement_WallysUncleExitNorth applymovement 1, Common_Movement_WalkInPlaceFastestDown - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2050A1 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleNorth waitmovement 0 return -PetalburgCity_Gym_EventScript_20505A:: @ 820505A - applymovement 11, PetalburgCity_Gym_Movement_205089 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2050A9 +PetalburgCity_Gym_EventScript_ExitGymWithWallysUncleEast:: @ 820505A + applymovement 11, PetalburgCity_Gym_Movement_WallysUncleExitEast + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleEast waitmovement 0 return -PetalburgCity_Gym_EventScript_20506C:: @ 820506C - applymovement 11, PetalburgCity_Gym_Movement_205094 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2050B1 +PetalburgCity_Gym_EventScript_ExitGymWithWallysUncleWest:: @ 820506C + applymovement 11, PetalburgCity_Gym_Movement_WallysUncleExitWest + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleWest waitmovement 0 return -PetalburgCity_Gym_Movement_20507E: @ 820507E +PetalburgCity_Gym_Movement_WallysUncleExitNorth: @ 820507E walk_down walk_down walk_left @@ -574,7 +576,7 @@ PetalburgCity_Gym_Movement_20507E: @ 820507E set_invisible step_end -PetalburgCity_Gym_Movement_205089: @ 8205089 +PetalburgCity_Gym_Movement_WallysUncleExitEast: @ 8205089 walk_down walk_down walk_left @@ -587,7 +589,7 @@ PetalburgCity_Gym_Movement_205089: @ 8205089 set_invisible step_end -PetalburgCity_Gym_Movement_205094: @ 8205094 +PetalburgCity_Gym_Movement_WallysUncleExitWest: @ 8205094 walk_down walk_down walk_left @@ -602,7 +604,7 @@ PetalburgCity_Gym_Movement_205094: @ 8205094 set_invisible step_end -PetalburgCity_Gym_Movement_2050A1: @ 82050A1 +PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleNorth: @ 82050A1 delay_16 walk_down walk_down @@ -612,7 +614,7 @@ PetalburgCity_Gym_Movement_2050A1: @ 82050A1 walk_down step_end -PetalburgCity_Gym_Movement_2050A9: @ 82050A9 +PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleEast: @ 82050A9 delay_16 walk_down walk_down @@ -622,7 +624,7 @@ PetalburgCity_Gym_Movement_2050A9: @ 82050A9 walk_down step_end -PetalburgCity_Gym_Movement_2050B1: @ 82050B1 +PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleWest: @ 82050B1 delay_16 walk_down walk_down @@ -634,7 +636,7 @@ PetalburgCity_Gym_Movement_2050B1: @ 82050B1 walk_down step_end -PetalburgCity_Gym_Movement_2050BB: @ 82050BB +PetalburgCity_Gym_Movement_WallysUncleEnterGym: @ 82050BB walk_up delay_8 walk_in_place_fastest_right @@ -644,7 +646,7 @@ PetalburgCity_Gym_Movement_2050BB: @ 82050BB walk_in_place_fastest_up step_end -PetalburgCity_Gym_Movement_2050C3: @ 82050C3 +PetalburgCity_Gym_Movement_WallysUncleApproachPlayerNorth: @ 82050C3 walk_right walk_right walk_up @@ -653,7 +655,7 @@ PetalburgCity_Gym_Movement_2050C3: @ 82050C3 walk_in_place_fastest_right step_end -PetalburgCity_Gym_Movement_2050CA: @ 82050CA +PetalburgCity_Gym_Movement_WallysUncleApproachPlayerEast: @ 82050CA walk_right walk_right walk_up @@ -661,7 +663,7 @@ PetalburgCity_Gym_Movement_2050CA: @ 82050CA walk_up step_end -PetalburgCity_Gym_Movement_2050D0: @ 82050D0 +PetalburgCity_Gym_Movement_WallysUncleApproachPlayerWest: @ 82050D0 walk_right walk_right walk_up @@ -671,6 +673,7 @@ PetalburgCity_Gym_Movement_2050D0: @ 82050D0 walk_up step_end +@ Unused PetalburgCity_Gym_Movement_2050D8: @ 82050D8 walk_in_place_fastest_up delay_16 @@ -682,7 +685,7 @@ PetalburgCity_Gym_Movement_2050D8: @ 82050D8 walk_in_place_fastest_down step_end -PetalburgCity_Gym_Movement_2050E1: @ 82050E1 +PetalburgCity_Gym_Movement_WallyArriveNorth: @ 82050E1 delay_16 walk_up delay_16 @@ -694,7 +697,7 @@ PetalburgCity_Gym_Movement_2050E1: @ 82050E1 walk_in_place_fastest_left step_end -PetalburgCity_Gym_Movement_2050EB: @ 82050EB +PetalburgCity_Gym_Movement_WallyArrive: @ 82050EB delay_16 walk_up delay_16 @@ -703,7 +706,7 @@ PetalburgCity_Gym_Movement_2050EB: @ 82050EB walk_up step_end -PetalburgCity_Gym_Movement_2050F2: @ 82050F2 +PetalburgCity_Gym_Movement_WallyExitNorth: @ 82050F2 walk_down walk_down walk_down @@ -713,7 +716,7 @@ PetalburgCity_Gym_Movement_2050F2: @ 82050F2 walk_in_place_down step_end -PetalburgCity_Gym_Movement_2050FA: @ 82050FA +PetalburgCity_Gym_Movement_WallyExitEast: @ 82050FA walk_down walk_down walk_right @@ -723,7 +726,7 @@ PetalburgCity_Gym_Movement_2050FA: @ 82050FA walk_in_place_down step_end -PetalburgCity_Gym_Movement_205102: @ 8205102 +PetalburgCity_Gym_Movement_WallyExitSouthWest: @ 8205102 walk_down walk_down walk_down @@ -732,7 +735,7 @@ PetalburgCity_Gym_Movement_205102: @ 8205102 walk_in_place_down step_end -PetalburgCity_Gym_Movement_205109: @ 8205109 +PetalburgCity_Gym_Movement_PlayerExitWithWallyNorth: @ 8205109 delay_16 delay_16 delay_16 @@ -742,7 +745,7 @@ PetalburgCity_Gym_Movement_205109: @ 8205109 delay_8 step_end -PetalburgCity_Gym_Movement_205111: @ 8205111 +PetalburgCity_Gym_Movement_PlayerExitWithWallySouth: @ 8205111 delay_16 delay_16 walk_right @@ -754,7 +757,7 @@ PetalburgCity_Gym_Movement_205111: @ 8205111 delay_8 step_end -PetalburgCity_Gym_Movement_20511B: @ 820511B +PetalburgCity_Gym_Movement_PlayerExitWithWallyWest: @ 820511B delay_16 delay_16 walk_down @@ -764,7 +767,7 @@ PetalburgCity_Gym_Movement_20511B: @ 820511B delay_8 step_end -PetalburgCity_Gym_Movement_205123: @ 8205123 +PetalburgCity_Gym_Movement_PlayerExitWithWallyEast: @ 8205123 walk_in_place_fastest_down delay_16 delay_16 @@ -776,468 +779,471 @@ PetalburgCity_Gym_Movement_205123: @ 8205123 delay_8 step_end -PetalburgCity_Gym_EventScript_20512D:: @ 820512D - msgbox PetalburgCity_Gym_Text_2064C3, MSGBOX_DEFAULT +PetalburgCity_Gym_EventScript_NoAmountOfTrainingIsEnough:: @ 820512D + msgbox PetalburgCity_Gym_Text_DadNoAmountOfTrainingIsEnough, MSGBOX_DEFAULT release end -PetalburgCity_Gym_EventScript_205137:: @ 8205137 +PetalburgCity_Gym_EventScript_SpeedRoomDoor:: @ 8205137 lockall compare VAR_PETALBURG_GYM_STATE, 6 - goto_if_lt PetalburgCity_Gym_EventScript_20517D + goto_if_lt PetalburgCity_Gym_EventScript_DoorLocked setvar VAR_0x8008, 7 setvar VAR_0x8009, 85 - msgbox PetalburgCity_Gym_Text_20721E, MSGBOX_YESNO + msgbox PetalburgCity_Gym_Text_EnterSpeedRoom, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq PetalburgCity_Gym_EventScript_20516C + goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom compare VAR_RESULT, 0 - goto_if_eq PetalburgCity_Gym_EventScript_20517B + goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom end -PetalburgCity_Gym_EventScript_20516C:: @ 820516C +PetalburgCity_Gym_EventScript_EnterRoom:: @ 820516C closemessage delay 30 - warpdoor MAP_PETALBURG_CITY_GYM, 255, 32776, 32777 + warpdoor MAP_PETALBURG_CITY_GYM, 255, VAR_0x8008, VAR_0x8009 waitstate releaseall end -PetalburgCity_Gym_EventScript_20517B:: @ 820517B +PetalburgCity_Gym_EventScript_DontEnterRoom:: @ 820517B releaseall end -PetalburgCity_Gym_EventScript_20517D:: @ 820517D - msgbox PetalburgCity_Gym_Text_2071F4, MSGBOX_DEFAULT +PetalburgCity_Gym_EventScript_DoorLocked:: @ 820517D + msgbox PetalburgCity_Gym_Text_DoorAppearsLocked, MSGBOX_DEFAULT releaseall end -PetalburgCity_Gym_EventScript_205187:: @ 8205187 +@ VAR_0x8008 and VAR_0x8009 below are the x and y coordinates of the warp +PetalburgCity_Gym_EventScript_AccuracyRoomDoor:: @ 8205187 lockall compare VAR_PETALBURG_GYM_STATE, 6 - goto_if_lt PetalburgCity_Gym_EventScript_20517D + goto_if_lt PetalburgCity_Gym_EventScript_DoorLocked setvar VAR_0x8008, 1 setvar VAR_0x8009, 98 - msgbox PetalburgCity_Gym_Text_207280, MSGBOX_YESNO + msgbox PetalburgCity_Gym_Text_EnterAccuracyRoom, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq PetalburgCity_Gym_EventScript_20516C + goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom compare VAR_RESULT, 0 - goto_if_eq PetalburgCity_Gym_EventScript_20517B + goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom end -PetalburgCity_Gym_EventScript_2051BC:: @ 82051BC +PetalburgCity_Gym_EventScript_ConfusionRoomDoor:: @ 82051BC lockall checktrainerflag TRAINER_RANDALL - goto_if_lt PetalburgCity_Gym_EventScript_20517D + goto_if_lt PetalburgCity_Gym_EventScript_DoorLocked setvar VAR_0x8008, 7 setvar VAR_0x8009, 46 - msgbox PetalburgCity_Gym_Text_2072BB, MSGBOX_YESNO + msgbox PetalburgCity_Gym_Text_EnterConfusionRoom, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq PetalburgCity_Gym_EventScript_20516C + goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom compare VAR_RESULT, 0 - goto_if_eq PetalburgCity_Gym_EventScript_20517B + goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom end -PetalburgCity_Gym_EventScript_2051EF:: @ 82051EF +PetalburgCity_Gym_EventScript_LeftDefenseRoomDoor:: @ 82051EF lockall checktrainerflag TRAINER_RANDALL - goto_if_lt PetalburgCity_Gym_EventScript_20517D + goto_if_lt PetalburgCity_Gym_EventScript_DoorLocked setvar VAR_0x8008, 1 setvar VAR_0x8009, 59 - msgbox PetalburgCity_Gym_Text_2072F7, MSGBOX_YESNO + msgbox PetalburgCity_Gym_Text_EnterDefenseRoom, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq PetalburgCity_Gym_EventScript_20516C + goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom compare VAR_RESULT, 0 - goto_if_eq PetalburgCity_Gym_EventScript_20517B + goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom end -PetalburgCity_Gym_EventScript_205222:: @ 8205222 +PetalburgCity_Gym_EventScript_RightDefenseRoomDoor:: @ 8205222 lockall checktrainerflag TRAINER_MARY - goto_if_lt PetalburgCity_Gym_EventScript_20517D + goto_if_lt PetalburgCity_Gym_EventScript_DoorLocked setvar VAR_0x8008, 7 setvar VAR_0x8009, 59 - msgbox PetalburgCity_Gym_Text_2072F7, MSGBOX_YESNO + msgbox PetalburgCity_Gym_Text_EnterDefenseRoom, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq PetalburgCity_Gym_EventScript_20516C + goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom compare VAR_RESULT, 0 - goto_if_eq PetalburgCity_Gym_EventScript_20517B + goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom end -PetalburgCity_Gym_EventScript_205255:: @ 8205255 +PetalburgCity_Gym_EventScript_RecoveryRoomDoor:: @ 8205255 lockall checktrainerflag TRAINER_MARY - goto_if_lt PetalburgCity_Gym_EventScript_20517D + goto_if_lt PetalburgCity_Gym_EventScript_DoorLocked setvar VAR_0x8008, 1 setvar VAR_0x8009, 72 - msgbox PetalburgCity_Gym_Text_207331, MSGBOX_YESNO + msgbox PetalburgCity_Gym_Text_EnterRecoveryRoom, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq PetalburgCity_Gym_EventScript_20516C + goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom compare VAR_RESULT, 0 - goto_if_eq PetalburgCity_Gym_EventScript_20517B + goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom end -PetalburgCity_Gym_EventScript_205288:: @ 8205288 +PetalburgCity_Gym_EventScript_LeftStrengthRoomDoor:: @ 8205288 lockall checktrainerflag TRAINER_PARKER - goto_if_lt PetalburgCity_Gym_EventScript_20517D + goto_if_lt PetalburgCity_Gym_EventScript_DoorLocked setvar VAR_0x8008, 1 setvar VAR_0x8009, 20 - msgbox PetalburgCity_Gym_Text_20736C, MSGBOX_YESNO + msgbox PetalburgCity_Gym_Text_EnterStrengthRoom, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq PetalburgCity_Gym_EventScript_20516C + goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom compare VAR_RESULT, 0 - goto_if_eq PetalburgCity_Gym_EventScript_20517B + goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom end -PetalburgCity_Gym_EventScript_2052BB:: @ 82052BB +PetalburgCity_Gym_EventScript_RightStrengthRoomDoor:: @ 82052BB lockall checktrainerflag TRAINER_ALEXIA - goto_if_lt PetalburgCity_Gym_EventScript_20517D + goto_if_lt PetalburgCity_Gym_EventScript_DoorLocked setvar VAR_0x8008, 7 setvar VAR_0x8009, 20 - msgbox PetalburgCity_Gym_Text_20736C, MSGBOX_YESNO + msgbox PetalburgCity_Gym_Text_EnterStrengthRoom, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq PetalburgCity_Gym_EventScript_20516C + goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom compare VAR_RESULT, 0 - goto_if_eq PetalburgCity_Gym_EventScript_20517B + goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom end -PetalburgCity_Gym_EventScript_2052EE:: @ 82052EE +PetalburgCity_Gym_EventScript_LeftOHKORoomDoor:: @ 82052EE lockall checktrainerflag TRAINER_ALEXIA - goto_if_lt PetalburgCity_Gym_EventScript_20517D + goto_if_lt PetalburgCity_Gym_EventScript_DoorLocked setvar VAR_0x8008, 1 setvar VAR_0x8009, 33 - msgbox PetalburgCity_Gym_Text_2073A7, MSGBOX_YESNO + msgbox PetalburgCity_Gym_Text_EnterOHKORoom, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq PetalburgCity_Gym_EventScript_20516C + goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom compare VAR_RESULT, 0 - goto_if_eq PetalburgCity_Gym_EventScript_20517B + goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom end -PetalburgCity_Gym_EventScript_205321:: @ 8205321 +PetalburgCity_Gym_EventScript_RightOHKORoomDoor:: @ 8205321 lockall checktrainerflag TRAINER_GEORGE - goto_if_lt PetalburgCity_Gym_EventScript_20517D + goto_if_lt PetalburgCity_Gym_EventScript_DoorLocked setvar VAR_0x8008, 7 setvar VAR_0x8009, 33 - msgbox PetalburgCity_Gym_Text_2073A7, MSGBOX_YESNO + msgbox PetalburgCity_Gym_Text_EnterOHKORoom, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq PetalburgCity_Gym_EventScript_20516C + goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom compare VAR_RESULT, 0 - goto_if_eq PetalburgCity_Gym_EventScript_20517B + goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom end -PetalburgCity_Gym_EventScript_205354:: @ 8205354 +PetalburgCity_Gym_EventScript_LeftGymLeadersRoomDoor:: @ 8205354 lockall checktrainerflag TRAINER_JODY - goto_if_lt PetalburgCity_Gym_EventScript_20517D + goto_if_lt PetalburgCity_Gym_EventScript_DoorLocked setvar VAR_0x8008, 1 setvar VAR_0x8009, 7 - msgbox PetalburgCity_Gym_Text_2073E4, MSGBOX_YESNO + msgbox PetalburgCity_Gym_Text_EnterGymLeadersRoom, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq PetalburgCity_Gym_EventScript_20516C + goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom compare VAR_RESULT, 0 - goto_if_eq PetalburgCity_Gym_EventScript_20517B + goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom end -PetalburgCity_Gym_EventScript_205387:: @ 8205387 +PetalburgCity_Gym_EventScript_RightGymLeadersRoomDoor:: @ 8205387 lockall checktrainerflag TRAINER_BERKE - goto_if_lt PetalburgCity_Gym_EventScript_20517D + goto_if_lt PetalburgCity_Gym_EventScript_DoorLocked setvar VAR_0x8008, 7 setvar VAR_0x8009, 7 - msgbox PetalburgCity_Gym_Text_2073E4, MSGBOX_YESNO + msgbox PetalburgCity_Gym_Text_EnterGymLeadersRoom, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq PetalburgCity_Gym_EventScript_20516C + goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom compare VAR_RESULT, 0 - goto_if_eq PetalburgCity_Gym_EventScript_20517B + goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom end -PetalburgCity_Gym_EventScript_2053BA:: @ 82053BA - trainerbattle_single TRAINER_RANDALL, PetalburgCity_Gym_Text_20674F, PetalburgCity_Gym_Text_2067B9, PetalburgCity_Gym_EventScript_2053DE - goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_2053ED - msgbox PetalburgCity_Gym_Text_2067D8, MSGBOX_AUTOCLOSE +PetalburgCity_Gym_EventScript_Randall:: @ 82053BA + trainerbattle_single TRAINER_RANDALL, PetalburgCity_Gym_Text_RandallPreBattle, PetalburgCity_Gym_Text_RandallDefeat, PetalburgCity_Gym_EventScript_SlideOpenSpeedRoomDoors + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_RandallPostBadge + msgbox PetalburgCity_Gym_Text_RandallPostBattle, MSGBOX_AUTOCLOSE end -PetalburgCity_Gym_EventScript_2053DE:: @ 82053DE +PetalburgCity_Gym_EventScript_SlideOpenSpeedRoomDoors:: @ 82053DE setvar VAR_0x8005, 0 - call PetalburgCity_Gym_EventScript_20557F + call PetalburgCity_Gym_EventScript_OpenSpeedRoomDoors special DrawWholeMapView release end -PetalburgCity_Gym_EventScript_2053ED:: @ 82053ED - msgbox PetalburgCity_Gym_Text_20685E, MSGBOX_NPC +PetalburgCity_Gym_EventScript_RandallPostBadge:: @ 82053ED + msgbox PetalburgCity_Gym_Text_RandallPostBadge, MSGBOX_NPC end -PetalburgCity_Gym_EventScript_2053F6:: @ 82053F6 - trainerbattle_single TRAINER_PARKER, PetalburgCity_Gym_Text_2068FD, PetalburgCity_Gym_Text_20694F, PetalburgCity_Gym_EventScript_20541A - goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_205429 - msgbox PetalburgCity_Gym_Text_206996, MSGBOX_AUTOCLOSE +PetalburgCity_Gym_EventScript_Parker:: @ 82053F6 + trainerbattle_single TRAINER_PARKER, PetalburgCity_Gym_Text_ParkerPreBattle, PetalburgCity_Gym_Text_ParkerDefeat, PetalburgCity_Gym_EventScript_SlideOpenConfusionRoomDoors + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_ParkerPostBadge + msgbox PetalburgCity_Gym_Text_ParkerPostBattle, MSGBOX_AUTOCLOSE end -PetalburgCity_Gym_EventScript_20541A:: @ 820541A +PetalburgCity_Gym_EventScript_SlideOpenConfusionRoomDoors:: @ 820541A setvar VAR_0x8005, 0 - call PetalburgCity_Gym_EventScript_2055C1 + call PetalburgCity_Gym_EventScript_OpenConfusionRoomDoors special DrawWholeMapView release end -PetalburgCity_Gym_EventScript_205429:: @ 8205429 - msgbox PetalburgCity_Gym_Text_2069D9, MSGBOX_NPC +PetalburgCity_Gym_EventScript_ParkerPostBadge:: @ 8205429 + msgbox PetalburgCity_Gym_Text_ParkerPostBadge, MSGBOX_NPC end -PetalburgCity_Gym_EventScript_205432:: @ 8205432 - trainerbattle_single TRAINER_GEORGE, PetalburgCity_Gym_Text_206A1B, PetalburgCity_Gym_Text_206AB8, PetalburgCity_Gym_EventScript_205456 - goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_205465 - msgbox PetalburgCity_Gym_Text_206AE9, MSGBOX_AUTOCLOSE +PetalburgCity_Gym_EventScript_George:: @ 8205432 + trainerbattle_single TRAINER_GEORGE, PetalburgCity_Gym_Text_GeorgePreBattle, PetalburgCity_Gym_Text_GeorgeDefeat, PetalburgCity_Gym_EventScript_SlideOpenRecoveryRoomDoors + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_GeorgePostBadge + msgbox PetalburgCity_Gym_Text_GeorgePostBattle, MSGBOX_AUTOCLOSE end -PetalburgCity_Gym_EventScript_205456:: @ 8205456 +PetalburgCity_Gym_EventScript_SlideOpenRecoveryRoomDoors:: @ 8205456 setvar VAR_0x8005, 0 - call PetalburgCity_Gym_EventScript_205603 + call PetalburgCity_Gym_EventScript_OpenRecoveryRoomDoors special DrawWholeMapView release end -PetalburgCity_Gym_EventScript_205465:: @ 8205465 - msgbox PetalburgCity_Gym_Text_206BB1, MSGBOX_NPC +PetalburgCity_Gym_EventScript_GeorgePostBadge:: @ 8205465 + msgbox PetalburgCity_Gym_Text_GeorgePostBadge, MSGBOX_NPC end -PetalburgCity_Gym_EventScript_20546E:: @ 820546E - trainerbattle_single TRAINER_BERKE, PetalburgCity_Gym_Text_206BF4, PetalburgCity_Gym_Text_206C7D, PetalburgCity_Gym_EventScript_205492 - goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_2054A1 - msgbox PetalburgCity_Gym_Text_206C9F, MSGBOX_AUTOCLOSE +PetalburgCity_Gym_EventScript_Berke:: @ 820546E + trainerbattle_single TRAINER_BERKE, PetalburgCity_Gym_Text_BerkePreBattle, PetalburgCity_Gym_Text_BerkeDefeat, PetalburgCity_Gym_EventScript_SlideOpenOHKORoomDoors + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_BerkePostBadge + msgbox PetalburgCity_Gym_Text_BerkePostBattle, MSGBOX_AUTOCLOSE end -PetalburgCity_Gym_EventScript_205492:: @ 8205492 +PetalburgCity_Gym_EventScript_SlideOpenOHKORoomDoors:: @ 8205492 setvar VAR_0x8005, 0 - call PetalburgCity_Gym_EventScript_205645 + call PetalburgCity_Gym_EventScript_OpenOHKORoomDoors special DrawWholeMapView release end -PetalburgCity_Gym_EventScript_2054A1:: @ 82054A1 - msgbox PetalburgCity_Gym_Text_206D56, MSGBOX_NPC +PetalburgCity_Gym_EventScript_BerkePostBadge:: @ 82054A1 + msgbox PetalburgCity_Gym_Text_BerkePostBadge, MSGBOX_NPC end -PetalburgCity_Gym_EventScript_2054AA:: @ 82054AA - trainerbattle_single TRAINER_MARY, PetalburgCity_Gym_Text_206DB2, PetalburgCity_Gym_Text_206E0D, PetalburgCity_Gym_EventScript_2054CE - goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_2054DD - msgbox PetalburgCity_Gym_Text_206E26, MSGBOX_AUTOCLOSE +PetalburgCity_Gym_EventScript_Mary:: @ 82054AA + trainerbattle_single TRAINER_MARY, PetalburgCity_Gym_Text_MaryPreBattle, PetalburgCity_Gym_Text_MaryDefeat, PetalburgCity_Gym_EventScript_SlideOpenAccuracyRoomDoors + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_MaryPostBadge + msgbox PetalburgCity_Gym_Text_MaryPostBattle, MSGBOX_AUTOCLOSE end -PetalburgCity_Gym_EventScript_2054CE:: @ 82054CE +PetalburgCity_Gym_EventScript_SlideOpenAccuracyRoomDoors:: @ 82054CE setvar VAR_0x8005, 0 - call PetalburgCity_Gym_EventScript_2055A0 + call PetalburgCity_Gym_EventScript_OpenAccuracyRoomDoors special DrawWholeMapView release end -PetalburgCity_Gym_EventScript_2054DD:: @ 82054DD - msgbox PetalburgCity_Gym_Text_206ED8, MSGBOX_NPC +PetalburgCity_Gym_EventScript_MaryPostBadge:: @ 82054DD + msgbox PetalburgCity_Gym_Text_MaryPostBadge, MSGBOX_NPC end -PetalburgCity_Gym_EventScript_2054E6:: @ 82054E6 - trainerbattle_single TRAINER_ALEXIA, PetalburgCity_Gym_Text_206F44, PetalburgCity_Gym_Text_206F82, PetalburgCity_Gym_EventScript_20550A - goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_205519 - msgbox PetalburgCity_Gym_Text_206F9F, MSGBOX_AUTOCLOSE +PetalburgCity_Gym_EventScript_Alexia:: @ 82054E6 + trainerbattle_single TRAINER_ALEXIA, PetalburgCity_Gym_Text_AlexiaPreBattle, PetalburgCity_Gym_Text_AlexiaDefeat, PetalburgCity_Gym_EventScript_SlideOpenDefenseRoomDoors + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_AlexiaPostBadge + msgbox PetalburgCity_Gym_Text_AlexiaPostBattle, MSGBOX_AUTOCLOSE end -PetalburgCity_Gym_EventScript_20550A:: @ 820550A +PetalburgCity_Gym_EventScript_SlideOpenDefenseRoomDoors:: @ 820550A setvar VAR_0x8005, 0 - call PetalburgCity_Gym_EventScript_2055E2 + call PetalburgCity_Gym_EventScript_OpenDefenseRoomDoors special DrawWholeMapView release end -PetalburgCity_Gym_EventScript_205519:: @ 8205519 - msgbox PetalburgCity_Gym_Text_207069, MSGBOX_NPC +PetalburgCity_Gym_EventScript_AlexiaPostBadge:: @ 8205519 + msgbox PetalburgCity_Gym_Text_AlexiaPostBadge, MSGBOX_NPC end -PetalburgCity_Gym_EventScript_205522:: @ 8205522 - trainerbattle_single TRAINER_JODY, PetalburgCity_Gym_Text_207088, PetalburgCity_Gym_Text_2070E6, PetalburgCity_Gym_EventScript_205546 - goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_205555 - msgbox PetalburgCity_Gym_Text_2070FB, MSGBOX_AUTOCLOSE +PetalburgCity_Gym_EventScript_Jody:: @ 8205522 + trainerbattle_single TRAINER_JODY, PetalburgCity_Gym_Text_JodyPreBattle, PetalburgCity_Gym_Text_JodyDefeat, PetalburgCity_Gym_EventScript_SlideOpenStrengthRoomDoors + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_JodyPostBadge + msgbox PetalburgCity_Gym_Text_JodyPostBattle, MSGBOX_AUTOCLOSE end -PetalburgCity_Gym_EventScript_205546:: @ 8205546 +PetalburgCity_Gym_EventScript_SlideOpenStrengthRoomDoors:: @ 8205546 setvar VAR_0x8005, 0 - call PetalburgCity_Gym_EventScript_205624 + call PetalburgCity_Gym_EventScript_OpenStrengthRoomDoors special DrawWholeMapView release end -PetalburgCity_Gym_EventScript_205555:: @ 8205555 - msgbox PetalburgCity_Gym_Text_207170, MSGBOX_NPC +PetalburgCity_Gym_EventScript_JodyPostBadge:: @ 8205555 + msgbox PetalburgCity_Gym_Text_JodyPostBadge, MSGBOX_NPC end -PetalburgCity_Gym_EventScript_20555E:: @ 820555E +@ VAR_0x8004 below is the room number +@ VAR_0x8005 below is 0 when the door should be slid open and 1 when it should be unlocked immediately +PetalburgCity_Gym_EventScript_OpenGymEntranceDoors:: @ 820555E setvar VAR_0x8004, 1 compare VAR_0x8005, 0 - call_if_eq PetalburgCity_Gym_EventScript_205746 + call_if_eq PetalburgCity_Gym_EventScript_SlideOpenRoomDoors compare VAR_0x8005, 1 - call_if_eq PetalburgCity_Gym_EventScript_20574B - call PetalburgCity_Gym_EventScript_205666 + call_if_eq PetalburgCity_Gym_EventScript_UnlockRoomDoors + call PetalburgCity_Gym_EventScript_SetEntranceRoomDoorMetatiles return -PetalburgCity_Gym_EventScript_20557F:: @ 820557F +PetalburgCity_Gym_EventScript_OpenSpeedRoomDoors:: @ 820557F setvar VAR_0x8004, 2 compare VAR_0x8005, 0 - call_if_eq PetalburgCity_Gym_EventScript_205746 + call_if_eq PetalburgCity_Gym_EventScript_SlideOpenRoomDoors compare VAR_0x8005, 1 - call_if_eq PetalburgCity_Gym_EventScript_20574B - call PetalburgCity_Gym_EventScript_20568B + call_if_eq PetalburgCity_Gym_EventScript_UnlockRoomDoors + call PetalburgCity_Gym_EventScript_SetSpeedRoomDoorMetatiles return -PetalburgCity_Gym_EventScript_2055A0:: @ 82055A0 +PetalburgCity_Gym_EventScript_OpenAccuracyRoomDoors:: @ 82055A0 setvar VAR_0x8004, 3 compare VAR_0x8005, 0 - call_if_eq PetalburgCity_Gym_EventScript_205746 + call_if_eq PetalburgCity_Gym_EventScript_SlideOpenRoomDoors compare VAR_0x8005, 1 - call_if_eq PetalburgCity_Gym_EventScript_20574B - call PetalburgCity_Gym_EventScript_2056B0 + call_if_eq PetalburgCity_Gym_EventScript_UnlockRoomDoors + call PetalburgCity_Gym_EventScript_SetAccuracyRoomDoorMetatiles return -PetalburgCity_Gym_EventScript_2055C1:: @ 82055C1 +PetalburgCity_Gym_EventScript_OpenConfusionRoomDoors:: @ 82055C1 setvar VAR_0x8004, 4 compare VAR_0x8005, 0 - call_if_eq PetalburgCity_Gym_EventScript_205746 + call_if_eq PetalburgCity_Gym_EventScript_SlideOpenRoomDoors compare VAR_0x8005, 1 - call_if_eq PetalburgCity_Gym_EventScript_20574B - call PetalburgCity_Gym_EventScript_2056D5 + call_if_eq PetalburgCity_Gym_EventScript_UnlockRoomDoors + call PetalburgCity_Gym_EventScript_SetConfusionRoomDoorMetatiles return -PetalburgCity_Gym_EventScript_2055E2:: @ 82055E2 +PetalburgCity_Gym_EventScript_OpenDefenseRoomDoors:: @ 82055E2 setvar VAR_0x8004, 5 compare VAR_0x8005, 0 - call_if_eq PetalburgCity_Gym_EventScript_205746 + call_if_eq PetalburgCity_Gym_EventScript_SlideOpenRoomDoors compare VAR_0x8005, 1 - call_if_eq PetalburgCity_Gym_EventScript_20574B - call PetalburgCity_Gym_EventScript_2056E8 + call_if_eq PetalburgCity_Gym_EventScript_UnlockRoomDoors + call PetalburgCity_Gym_EventScript_SetDefenseRoomDoorMetatiles return -PetalburgCity_Gym_EventScript_205603:: @ 8205603 +PetalburgCity_Gym_EventScript_OpenRecoveryRoomDoors:: @ 8205603 setvar VAR_0x8004, 6 compare VAR_0x8005, 0 - call_if_eq PetalburgCity_Gym_EventScript_205746 + call_if_eq PetalburgCity_Gym_EventScript_SlideOpenRoomDoors compare VAR_0x8005, 1 - call_if_eq PetalburgCity_Gym_EventScript_20574B - call PetalburgCity_Gym_EventScript_20570D + call_if_eq PetalburgCity_Gym_EventScript_UnlockRoomDoors + call PetalburgCity_Gym_EventScript_SetRecoveryRoomDoorMetatiles return -PetalburgCity_Gym_EventScript_205624:: @ 8205624 +PetalburgCity_Gym_EventScript_OpenStrengthRoomDoors:: @ 8205624 setvar VAR_0x8004, 7 compare VAR_0x8005, 0 - call_if_eq PetalburgCity_Gym_EventScript_205746 + call_if_eq PetalburgCity_Gym_EventScript_SlideOpenRoomDoors compare VAR_0x8005, 1 - call_if_eq PetalburgCity_Gym_EventScript_20574B - call PetalburgCity_Gym_EventScript_205720 + call_if_eq PetalburgCity_Gym_EventScript_UnlockRoomDoors + call PetalburgCity_Gym_EventScript_SetStrengthRoomDoorMetatiles return -PetalburgCity_Gym_EventScript_205645:: @ 8205645 +PetalburgCity_Gym_EventScript_OpenOHKORoomDoors:: @ 8205645 setvar VAR_0x8004, 8 compare VAR_0x8005, 0 - call_if_eq PetalburgCity_Gym_EventScript_205746 + call_if_eq PetalburgCity_Gym_EventScript_SlideOpenRoomDoors compare VAR_0x8005, 1 - call_if_eq PetalburgCity_Gym_EventScript_20574B - call PetalburgCity_Gym_EventScript_205733 + call_if_eq PetalburgCity_Gym_EventScript_UnlockRoomDoors + call PetalburgCity_Gym_EventScript_SetOHKORoomDoorMetatiles return -PetalburgCity_Gym_EventScript_205666:: @ 8205666 +PetalburgCity_Gym_EventScript_SetEntranceRoomDoorMetatiles:: @ 8205666 setmetatile 6, 85, METATILE_PetalburgGym_RoomEntrance_Left, 0 setmetatile 7, 85, METATILE_PetalburgGym_RoomEntrance_Right, 0 setmetatile 1, 98, METATILE_PetalburgGym_RoomEntrance_Left, 0 setmetatile 2, 98, METATILE_PetalburgGym_RoomEntrance_Right, 0 return -PetalburgCity_Gym_EventScript_20568B:: @ 820568B +PetalburgCity_Gym_EventScript_SetSpeedRoomDoorMetatiles:: @ 820568B setmetatile 6, 46, METATILE_PetalburgGym_RoomEntrance_Left, 0 setmetatile 7, 46, METATILE_PetalburgGym_RoomEntrance_Right, 0 setmetatile 1, 59, METATILE_PetalburgGym_RoomEntrance_Left, 0 setmetatile 2, 59, METATILE_PetalburgGym_RoomEntrance_Right, 0 return -PetalburgCity_Gym_EventScript_2056B0:: @ 82056B0 +PetalburgCity_Gym_EventScript_SetAccuracyRoomDoorMetatiles:: @ 82056B0 setmetatile 6, 59, METATILE_PetalburgGym_RoomEntrance_Left, 0 setmetatile 7, 59, METATILE_PetalburgGym_RoomEntrance_Right, 0 setmetatile 1, 72, METATILE_PetalburgGym_RoomEntrance_Left, 0 setmetatile 2, 72, METATILE_PetalburgGym_RoomEntrance_Right, 0 return -PetalburgCity_Gym_EventScript_2056D5:: @ 82056D5 +PetalburgCity_Gym_EventScript_SetConfusionRoomDoorMetatiles:: @ 82056D5 setmetatile 1, 20, METATILE_PetalburgGym_RoomEntrance_Left, 0 setmetatile 2, 20, METATILE_PetalburgGym_RoomEntrance_Right, 0 return -PetalburgCity_Gym_EventScript_2056E8:: @ 82056E8 +PetalburgCity_Gym_EventScript_SetDefenseRoomDoorMetatiles:: @ 82056E8 setmetatile 6, 20, METATILE_PetalburgGym_RoomEntrance_Left, 0 setmetatile 7, 20, METATILE_PetalburgGym_RoomEntrance_Right, 0 setmetatile 1, 33, METATILE_PetalburgGym_RoomEntrance_Left, 0 setmetatile 2, 33, METATILE_PetalburgGym_RoomEntrance_Right, 0 return -PetalburgCity_Gym_EventScript_20570D:: @ 820570D +PetalburgCity_Gym_EventScript_SetRecoveryRoomDoorMetatiles:: @ 820570D setmetatile 6, 33, METATILE_PetalburgGym_RoomEntrance_Left, 0 setmetatile 7, 33, METATILE_PetalburgGym_RoomEntrance_Right, 0 return -PetalburgCity_Gym_EventScript_205720:: @ 8205720 +PetalburgCity_Gym_EventScript_SetStrengthRoomDoorMetatiles:: @ 8205720 setmetatile 1, 7, METATILE_PetalburgGym_RoomEntrance_Left, 0 setmetatile 2, 7, METATILE_PetalburgGym_RoomEntrance_Right, 0 return -PetalburgCity_Gym_EventScript_205733:: @ 8205733 +PetalburgCity_Gym_EventScript_SetOHKORoomDoorMetatiles:: @ 8205733 setmetatile 6, 7, METATILE_PetalburgGym_RoomEntrance_Left, 0 setmetatile 7, 7, METATILE_PetalburgGym_RoomEntrance_Right, 0 return -PetalburgCity_Gym_EventScript_205746:: @ 8205746 - special PetalburgGymSpecial1 +PetalburgCity_Gym_EventScript_SlideOpenRoomDoors:: @ 8205746 + special PetalburgGymSlideOpenRoomDoors waitstate return -PetalburgCity_Gym_EventScript_20574B:: @ 820574B - special PetalburgGymSpecial2 +PetalburgCity_Gym_EventScript_UnlockRoomDoors:: @ 820574B + special PetalburgGymUnlockRoomDoors return -PetalburgCity_Gym_EventScript_20574F:: @ 820574F +PetalburgCity_Gym_EventScript_GymGuide:: @ 820574F lock faceplayer - goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_205764 - msgbox PetalburgCity_Gym_Text_206542, MSGBOX_DEFAULT + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_GymGuidePostVictory + msgbox PetalburgCity_Gym_Text_GymGuideAdvice, MSGBOX_DEFAULT release end -PetalburgCity_Gym_EventScript_205764:: @ 8205764 - msgbox PetalburgCity_Gym_Text_2066F3, MSGBOX_DEFAULT +PetalburgCity_Gym_EventScript_GymGuidePostVictory:: @ 8205764 + msgbox PetalburgCity_Gym_Text_GymGuidePostVictory, MSGBOX_DEFAULT release end -PetalburgCity_Gym_EventScript_20576E:: @ 820576E +PetalburgCity_Gym_EventScript_LeftGymStatue:: @ 820576E lockall - goto_if_set FLAG_BADGE05_GET, PetalburgCity_Gym_EventScript_20578E - goto PetalburgCity_Gym_EventScript_205798 + goto_if_set FLAG_BADGE05_GET, PetalburgCity_Gym_EventScript_GymStatueCertified + goto PetalburgCity_Gym_EventScript_GymStatue end -PetalburgCity_Gym_EventScript_20577E:: @ 820577E +PetalburgCity_Gym_EventScript_RightGymStatue:: @ 820577E lockall - goto_if_set FLAG_BADGE05_GET, PetalburgCity_Gym_EventScript_20578E - goto PetalburgCity_Gym_EventScript_205798 + goto_if_set FLAG_BADGE05_GET, PetalburgCity_Gym_EventScript_GymStatueCertified + goto PetalburgCity_Gym_EventScript_GymStatue end -PetalburgCity_Gym_EventScript_20578E:: @ 820578E - msgbox PetalburgCity_Gym_Text_207467, MSGBOX_DEFAULT +PetalburgCity_Gym_EventScript_GymStatueCertified:: @ 820578E + msgbox PetalburgCity_Gym_Text_GymStatueCertified, MSGBOX_DEFAULT releaseall end -PetalburgCity_Gym_EventScript_205798:: @ 8205798 - msgbox PetalburgCity_Gym_Text_20744C, MSGBOX_DEFAULT +PetalburgCity_Gym_EventScript_GymStatue:: @ 8205798 + msgbox PetalburgCity_Gym_Text_GymStatue, MSGBOX_DEFAULT releaseall end -PetalburgCity_Gym_Text_2057A2: @ 82057A2 +PetalburgCity_Gym_Text_DadYoureHereWithYourPokemon: @ 82057A2 .string "DAD: Hm?\p" .string "Well, if it isn't {PLAYER}!\n" .string "So you're all finished moving in?\p" @@ -1250,15 +1256,15 @@ PetalburgCity_Gym_Text_2057A2: @ 82057A2 .string "That's great news!\n" .string "I'll be looking forward to it!$" -PetalburgCity_Gym_Text_2058B1: @ 82058B1 +PetalburgCity_Gym_Text_WallyIdLikeAPokemon: @ 82058B1 .string "Um… I…\n" .string "I'd like to get a POKéMON, please…$" -PetalburgCity_Gym_Text_2058DB: @ 82058DB +PetalburgCity_Gym_Text_DadOhYoureWallyRight: @ 82058DB .string "DAD: Hm? You're… Uh… Oh, right.\n" .string "You're WALLY, right?$" -PetalburgCity_Gym_Text_205910: @ 8205910 +PetalburgCity_Gym_Text_WallyIveNeverCaughtAPokemon: @ 8205910 .string "WALLY: I'm going to go stay with my\n" .string "relatives in VERDANTURF TOWN.\p" .string "I thought I would be lonely by myself,\n" @@ -1266,38 +1272,38 @@ PetalburgCity_Gym_Text_205910: @ 8205910 .string "But I've never caught a POKéMON before.\n" .string "I don't know how…$" -PetalburgCity_Gym_Text_2059D8: @ 82059D8 +PetalburgCity_Gym_Text_DadHmISee: @ 82059D8 .string "DAD: Hm. I see.$" -PetalburgCity_Gym_Text_2059E8: @ 82059E8 +PetalburgCity_Gym_Text_DadPlayerGoWithWally: @ 82059E8 .string "DAD: {PLAYER}, you heard that,\n" .string "right?\p" .string "Go with WALLY and make sure that he\n" .string "safely catches a POKéMON.$" -PetalburgCity_Gym_Text_205A46: @ 8205A46 +PetalburgCity_Gym_Text_IllLoanYouMyZigzagoon: @ 8205A46 .string "WALLY, here, I'll loan you my POKéMON.\p" .string "WALLY received a ZIGZAGOON!$" -PetalburgCity_Gym_Text_205A89: @ 8205A89 +PetalburgCity_Gym_Text_WallyThankYouAndDadGivesPokeBall: @ 8205A89 .string "WALLY: Oh, wow!\n" .string "A POKéMON!\p" .string "DAD: Hm. I'll give you a POKé BALL, too.\n" .string "Go for it!\p" .string "WALLY received a POKé BALL!$" -PetalburgCity_Gym_Text_205AF4: @ 8205AF4 +PetalburgCity_Gym_Text_WallyOhWowThankYou: @ 8205AF4 .string "WALLY: Oh, wow!\n" .string "Thank you!$" -PetalburgCity_Gym_Text_205B0F: @ 8205B0F +PetalburgCity_Gym_Text_WouldYouReallyComeWithMe: @ 8205B0F .string "{PLAYER}… Would you really come\n" .string "with me?$" -PetalburgCity_Gym_Text_205B32: @ 8205B32 +PetalburgCity_Gym_Text_DadSoDidItWorkOut: @ 8205B32 .string "DAD: So, did it work out?$" -PetalburgCity_Gym_Text_205B4C: @ 8205B4C +PetalburgCity_Gym_Text_WallyThankYouBye: @ 8205B4C .string "WALLY: Thank you, yes, it did.\n" .string "Here's your POKéMON back.\p" .string "{PLAYER}, thank you for coming along\n" @@ -1310,7 +1316,7 @@ PetalburgCity_Gym_Text_205B4C: @ 8205B4C .string "so I have to go!\p" .string "Bye, {PLAYER}!$" -PetalburgCity_Gym_Text_205C40: @ 8205C40 +PetalburgCity_Gym_Text_DadGoCollectBadges: @ 8205C40 .string "DAD: Now…\p" .string "{PLAYER}, if you want to become a\n" .string "strong TRAINER, here's my advice.\p" @@ -1327,7 +1333,7 @@ PetalburgCity_Gym_Text_205C40: @ 8205C40 .string "But that's only after you become\n" .string "stronger.$" -PetalburgCity_Gym_Text_205DB4: @ 8205DB4 +PetalburgCity_Gym_Text_NormanGoToRustboro: @ 8205DB4 .string "DAD: Hm? Aren't you going to the\n" .string "POKéMON GYM in RUSTBORO CITY?\p" .string "There's no challenge for me to\n" @@ -1337,7 +1343,7 @@ PetalburgCity_Gym_Text_205DB4: @ 8205DB4 .string "I'll battle you, {PLAYER}, when you\n" .string "can show me four GYM BADGES, okay?$" -PetalburgCity_Gym_Text_205EAE: @ 8205EAE +PetalburgCity_Gym_Text_NormanGoToDewford: @ 8205EAE .string "DAD: I see… So, you've beaten\n" .string "the GYM LEADER in RUSTBORO CITY.\p" .string "But there are many more TRAINERS\n" @@ -1346,13 +1352,13 @@ PetalburgCity_Gym_Text_205EAE: @ 8205EAE .string "GYM LEADER named BRAWLY.\p" .string "You should go challenge him.$" -PetalburgCity_Gym_Text_205F87: @ 8205F87 +PetalburgCity_Gym_Text_YouHaveGottenStronger: @ 8205F87 .string "DAD: Hm… {PLAYER}, you have gotten\n" .string "stronger.\p" .string "I can tell by the number of BADGES\n" .string "that you've earned.$" -PetalburgCity_Gym_Text_205FE5: @ 8205FE5 +PetalburgCity_Gym_Text_NormanPreBattle: @ 8205FE5 .string "DAD: Hm…\n" .string "So, you did get four GYM BADGES.\p" .string "Fine, as I promised, we will have\n" @@ -1366,7 +1372,7 @@ PetalburgCity_Gym_Text_205FE5: @ 8205FE5 .string "{PLAYER}, you'd better give it your\n" .string "best shot, too!$" -PetalburgCity_Gym_Text_206107: @ 8206107 +PetalburgCity_Gym_Text_NormanDefeat: @ 8206107 .string "…\p" .string "I… I can't…\p" .string "I can't believe it. {PLAYER}…\p" @@ -1374,11 +1380,11 @@ PetalburgCity_Gym_Text_206107: @ 8206107 .string "But, rules are rules!\n" .string "Here, take this.$" -PetalburgCity_Gym_Text_206162: @ 8206162 +PetalburgCity_Gym_Text_ReceivedBalanceBadge: @ 8206162 .string "{PLAYER} received the BALANCE BADGE\n" .string "from DAD!$" -PetalburgCity_Gym_Text_20618A: @ 820618A +PetalburgCity_Gym_Text_ExplainBalanceBadgeTakeThis: @ 820618A .string "DAD: With that BADGE, the DEFENSE\n" .string "of all your POKéMON will increase.\p" .string "POKéMON that know the HM move SURF\n" @@ -1386,7 +1392,7 @@ PetalburgCity_Gym_Text_20618A: @ 820618A .string "This is my gift to you. {PLAYER}, I'm\n" .string "sure you can use it correctly.$" -PetalburgCity_Gym_Text_206254: @ 8206254 +PetalburgCity_Gym_Text_ExplainFacade: @ 8206254 .string "DAD: TM42 contains FACADE.\p" .string "It doubles the power of moves if\n" .string "the POKéMON is poisoned, paralyzed,\l" @@ -1394,23 +1400,23 @@ PetalburgCity_Gym_Text_206254: @ 8206254 .string "It might be able to turn a bad\n" .string "situation into an advantage.$" -PetalburgCity_Gym_Text_2062FB: @ 82062FB +PetalburgCity_Gym_Text_DadHappyAndSad: @ 82062FB .string "DAD: As the GYM LEADER, I can't\n" .string "express how upset I am…\p" .string "But as a father, it makes me both\n" .string "happy and a little sad. It's odd…$" -PetalburgCity_Gym_Text_206377: @ 8206377 +PetalburgCity_Gym_Text_PleaseComeWithMe: @ 8206377 .string "Ah, there you are, {PLAYER}{KUN}!\p" .string "Please come with me.\n" .string "I have something I want you to have.$" -PetalburgCity_Gym_Text_2063CA: @ 82063CA +PetalburgCity_Gym_Text_LetMeBorrowPlayer: @ 82063CA .string "NORMAN, you don't mind, do you?\p" .string "Let me borrow your {PLAYER}{KUN} for\n" .string "a minute or two.$" -PetalburgCity_Gym_Text_206417: @ 8206417 +PetalburgCity_Gym_Text_DadGoingToKeepTraining: @ 8206417 .string "DAD: {PLAYER}, you should go visit\n" .string "your mother every so often.\p" .string "I'm going to stay here and redouble\n" @@ -1418,13 +1424,13 @@ PetalburgCity_Gym_Text_206417: @ 8206417 .string "It would bother me as a TRAINER to\n" .string "not avenge my loss to you, {PLAYER}!$" -PetalburgCity_Gym_Text_2064C3: @ 82064C3 +PetalburgCity_Gym_Text_DadNoAmountOfTrainingIsEnough: @ 82064C3 .string "DAD: {PLAYER}, how are things going?\p" .string "The world of POKéMON is deep.\p" .string "I honestly think that no amount of\n" .string "training would ever be enough.$" -PetalburgCity_Gym_Text_206542: @ 8206542 +PetalburgCity_Gym_Text_GymGuideAdvice: @ 8206542 .string "Hey, how's it going, CHAMPION-\n" .string "bound {PLAYER}?\p" .string "The doors in this GYM open when you\n" @@ -1442,53 +1448,53 @@ PetalburgCity_Gym_Text_206542: @ 8206542 .string "Once you've chosen the door…\n" .string "Well, hey, go for it!$" -PetalburgCity_Gym_Text_2066F3: @ 82066F3 +PetalburgCity_Gym_Text_GymGuidePostVictory: @ 82066F3 .string "{PLAYER}! Whoa! You've overcome even\n" .string "your own father!\p" .string "Like, whoa!\n" .string "What a stunning turn of events!$" -PetalburgCity_Gym_Text_20674F: @ 820674F +PetalburgCity_Gym_Text_RandallPreBattle: @ 820674F .string "The ability to attack before the\n" .string "opponent…\p" .string "Just that alone puts me at a great\n" .string "advantage, don't you agree?$" -PetalburgCity_Gym_Text_2067B9: @ 82067B9 +PetalburgCity_Gym_Text_RandallDefeat: @ 82067B9 .string "That was a magnificent battle!$" -PetalburgCity_Gym_Text_2067D8: @ 82067D8 +PetalburgCity_Gym_Text_RandallPostBattle: @ 82067D8 .string "Go on to the next room where a new\n" .string "challenge awaits you.\p" .string "At the left is the CONFUSION ROOM.\p" .string "The right door leads to the DEFENSE\n" .string "ROOM.$" -PetalburgCity_Gym_Text_20685E: @ 820685E +PetalburgCity_Gym_Text_RandallPostBadge: @ 820685E .string "Whomever you beat, and whomever you\n" .string "may lose to, you never shirk from\l" .string "training yourself and your POKéMON.\p" .string "That's what I think being a\n" .string "GYM LEADER is all about.$" -PetalburgCity_Gym_Text_2068FD: @ 82068FD +PetalburgCity_Gym_Text_ParkerPreBattle: @ 82068FD .string "This is the CONFUSION ROOM.\p" .string "Let me see how well bonded you are\n" .string "with your POKéMON!$" -PetalburgCity_Gym_Text_20694F: @ 820694F +PetalburgCity_Gym_Text_ParkerDefeat: @ 820694F .string "I couldn't confuse your team enough…\n" .string "You share a strong bond together.$" -PetalburgCity_Gym_Text_206996: @ 8206996 +PetalburgCity_Gym_Text_ParkerPostBattle: @ 8206996 .string "The next room is the STRENGTH ROOM.\n" .string "Can you withstand brute force?$" -PetalburgCity_Gym_Text_2069D9: @ 82069D9 +PetalburgCity_Gym_Text_ParkerPostBadge: @ 82069D9 .string "After you beat our LEADER, the\n" .string "training has become a lot tougher.$" -PetalburgCity_Gym_Text_206A1B: @ 8206A1B +PetalburgCity_Gym_Text_GeorgePreBattle: @ 8206A1B .string "Just when you think you're going to\n" .string "win, your opponent restores HP…\p" .string "Can you just imagine how awful that\n" @@ -1496,11 +1502,11 @@ PetalburgCity_Gym_Text_206A1B: @ 8206A1B .string "I'll show you exactly how awful it\n" .string "feels!$" -PetalburgCity_Gym_Text_206AB8: @ 8206AB8 +PetalburgCity_Gym_Text_GeorgeDefeat: @ 8206AB8 .string "I couldn't restore HP enough…\n" .string "What ATTACK power…$" -PetalburgCity_Gym_Text_206AE9: @ 8206AE9 +PetalburgCity_Gym_Text_GeorgePostBattle: @ 8206AE9 .string "I should have expected no less from\n" .string "our LEADER's kid.\p" .string "No, wait! A TRAINER's abilities are\n" @@ -1509,21 +1515,21 @@ PetalburgCity_Gym_Text_206AE9: @ 8206AE9 .string "weren't enough.\p" .string "Go on! The ONE-HIT KO ROOM is next.$" -PetalburgCity_Gym_Text_206BB1: @ 8206BB1 +PetalburgCity_Gym_Text_GeorgePostBadge: @ 8206BB1 .string "I'm going to keep training at GYMS.\n" .string "One day, I'll become a LEADER.$" -PetalburgCity_Gym_Text_206BF4: @ 8206BF4 +PetalburgCity_Gym_Text_BerkePreBattle: @ 8206BF4 .string "I'm not going to take it easy just\n" .string "because you're our LEADER's kid.\p" .string "I'll show you how horrid it is for\n" .string "a POKéMON to take a critical hit!$" -PetalburgCity_Gym_Text_206C7D: @ 8206C7D +PetalburgCity_Gym_Text_BerkeDefeat: @ 8206C7D .string "Your power…\n" .string "You're the real deal.$" -PetalburgCity_Gym_Text_206C9F: @ 8206C9F +PetalburgCity_Gym_Text_BerkePostBattle: @ 8206C9F .string "Your father really is strong.\n" .string "He's a TRAINER worth my respect.\p" .string "And, I sense the same glow coming\n" @@ -1531,21 +1537,21 @@ PetalburgCity_Gym_Text_206C9F: @ 8206C9F .string "I hope that you'll stage a terrific\n" .string "battle with your father!$" -PetalburgCity_Gym_Text_206D56: @ 8206D56 +PetalburgCity_Gym_Text_BerkePostBadge: @ 8206D56 .string "Since your dad became the LEADER,\n" .string "the TRAINERS of PETALBURG CITY have\l" .string "become a lot tougher.$" -PetalburgCity_Gym_Text_206DB2: @ 8206DB2 +PetalburgCity_Gym_Text_MaryPreBattle: @ 8206DB2 .string "Giggle…\n" .string "This is the ACCURACY ROOM.\p" .string "It's pretty nasty when every attack\n" .string "lands without fail.$" -PetalburgCity_Gym_Text_206E0D: @ 8206E0D +PetalburgCity_Gym_Text_MaryDefeat: @ 8206E0D .string "You were a cut above me…$" -PetalburgCity_Gym_Text_206E26: @ 8206E26 +PetalburgCity_Gym_Text_MaryPostBattle: @ 8206E26 .string "There are some even stronger\n" .string "TRAINERS waiting for you.\p" .string "The left is the DEFENSE ROOM, and\n" @@ -1553,20 +1559,20 @@ PetalburgCity_Gym_Text_206E26: @ 8206E26 .string "Your POKéMON's ATTACK power will be\n" .string "on trial either way.$" -PetalburgCity_Gym_Text_206ED8: @ 8206ED8 +PetalburgCity_Gym_Text_MaryPostBadge: @ 8206ED8 .string "Do you know what we're trying to\n" .string "achieve as TRAINERS?\p" .string "We're striving to become soul mates\n" .string "with our POKéMON.$" -PetalburgCity_Gym_Text_206F44: @ 8206F44 +PetalburgCity_Gym_Text_AlexiaPreBattle: @ 8206F44 .string "The higher the DEFENSE, the more\n" .string "reckless I can be in attack.$" -PetalburgCity_Gym_Text_206F82: @ 8206F82 +PetalburgCity_Gym_Text_AlexiaDefeat: @ 8206F82 .string "Our defenses weren't enough…$" -PetalburgCity_Gym_Text_206F9F: @ 8206F9F +PetalburgCity_Gym_Text_AlexiaPostBattle: @ 8206F9F .string "I think you've taught me a valuable\n" .string "lesson here.\p" .string "Now, go on! The left door goes to\n" @@ -1576,82 +1582,83 @@ PetalburgCity_Gym_Text_206F9F: @ 8206F9F .string "Both of them have TRAINERS who are\n" .string "skilled at offense.$" -PetalburgCity_Gym_Text_207069: @ 8207069 +PetalburgCity_Gym_Text_AlexiaPostBadge: @ 8207069 .string "Hi! Have you tried using SURF?$" -PetalburgCity_Gym_Text_207088: @ 8207088 +PetalburgCity_Gym_Text_JodyPreBattle: @ 8207088 .string "Our GYM LEADER told us to go all out\n" .string "and beat you.\p" .string "Even if you happen to be the\n" .string "LEADER's kid!$" -PetalburgCity_Gym_Text_2070E6: @ 82070E6 +PetalburgCity_Gym_Text_JodyDefeat: @ 82070E6 .string "But… I went all out!$" -PetalburgCity_Gym_Text_2070FB: @ 82070FB +PetalburgCity_Gym_Text_JodyPostBattle: @ 82070FB .string "The way you use your POKéMON…\n" .string "It's like your father's style.\p" .string "Go on through! The GYM LEADER, your\n" .string "father, is waiting!$" -PetalburgCity_Gym_Text_207170: @ 8207170 +PetalburgCity_Gym_Text_JodyPostBadge: @ 8207170 .string "Sure, it's fine to make your POKéMON\n" .string "stronger.\p" .string "But what decides the winner?\p" .string "Why, it's the feelings TRAINERS have\n" .string "for their POKéMON.$" -PetalburgCity_Gym_Text_2071F4: @ 82071F4 +PetalburgCity_Gym_Text_DoorAppearsLocked: @ 82071F4 .string "This door appears to be locked\n" .string "right now…$" -PetalburgCity_Gym_Text_20721E: @ 820721E +PetalburgCity_Gym_Text_EnterSpeedRoom: @ 820721E .string "“SPEED ROOM,” the sign says.\p" .string "Do you want to go through?$" -PetalburgCity_Gym_Text_207256: @ 8207256 +@ Unused +PetalburgCity_Gym_Text_DoorAppearsLocked2: @ 8207256 .string "This door appears to be locked\n" .string "right now…$" -PetalburgCity_Gym_Text_207280: @ 8207280 +PetalburgCity_Gym_Text_EnterAccuracyRoom: @ 8207280 .string "“ACCURACY ROOM,” the sign says.\p" .string "Do you want to go through?$" -PetalburgCity_Gym_Text_2072BB: @ 82072BB +PetalburgCity_Gym_Text_EnterConfusionRoom: @ 82072BB .string "“CONFUSION ROOM,” the sign says.\p" .string "Do you want to go through?$" -PetalburgCity_Gym_Text_2072F7: @ 82072F7 +PetalburgCity_Gym_Text_EnterDefenseRoom: @ 82072F7 .string "“DEFENSE ROOM,” the sign says.\p" .string "Do you want to go through?$" -PetalburgCity_Gym_Text_207331: @ 8207331 +PetalburgCity_Gym_Text_EnterRecoveryRoom: @ 8207331 .string "“RECOVERY ROOM,” the sign says.\p" .string "Do you want to go through?$" -PetalburgCity_Gym_Text_20736C: @ 820736C +PetalburgCity_Gym_Text_EnterStrengthRoom: @ 820736C .string "“STRENGTH ROOM,” the sign says.\p" .string "Do you want to go through?$" -PetalburgCity_Gym_Text_2073A7: @ 82073A7 +PetalburgCity_Gym_Text_EnterOHKORoom: @ 82073A7 .string "“ONE-HIT KO ROOM,” the sign says.\p" .string "Do you want to go through?$" -PetalburgCity_Gym_Text_2073E4: @ 82073E4 +PetalburgCity_Gym_Text_EnterGymLeadersRoom: @ 82073E4 .string "“GYM LEADER'S ROOM\p" .string "“See for yourself what POKéMON await\n" .string "you!” the sign says.\p" .string "Do you want to go through?$" -PetalburgCity_Gym_Text_20744C: @ 820744C +PetalburgCity_Gym_Text_GymStatue: @ 820744C .string "PETALBURG CITY POKéMON GYM$" -PetalburgCity_Gym_Text_207467: @ 8207467 +PetalburgCity_Gym_Text_GymStatueCertified: @ 8207467 .string "PETALBURG CITY POKéMON GYM\p" .string "NORMAN'S CERTIFIED TRAINERS:\n" .string "{PLAYER}$" -PetalburgCity_Gym_Text_2074A2: @ 82074A2 +PetalburgCity_Gym_Text_NormanPreRematch: @ 82074A2 .string "DAD: {PLAYER}…\n" .string "I had a feeling that you would come.\p" .string "I would never refuse to accept\n" @@ -1663,18 +1670,18 @@ PetalburgCity_Gym_Text_2074A2: @ 82074A2 .string "we owe it to each other to do the best\l" .string "we can. Isn't that right, {PLAYER}?$" -PetalburgCity_Gym_Text_2075CE: @ 82075CE +PetalburgCity_Gym_Text_NormanRematchDefeat: @ 82075CE .string "Uh… Haha…\n" .string "Maybe that was going too hard…$" -PetalburgCity_Gym_Text_2075F7: @ 82075F7 +PetalburgCity_Gym_Text_NormanPostRematch: @ 82075F7 .string "DAD: {PLAYER}…\n" .string "What is your dream?\p" .string "My dream…\n" .string "Hahaha…\l" .string "It has already come true, actually.$" -PetalburgCity_Gym_Text_20764A: @ 820764A +PetalburgCity_Gym_Text_NormanRematchNeedTwoMons: @ 820764A .string "DAD: {PLAYER}…\n" .string "I had a feeling that you would come.\p" .string "I would never refuse to accept\n" diff --git a/data/maps/PetalburgCity_House1/map.json b/data/maps/PetalburgCity_House1/map.json index 68e9a4dce..ce3dc3b16 100644 --- a/data/maps/PetalburgCity_House1/map.json +++ b/data/maps/PetalburgCity_House1/map.json @@ -24,7 +24,7 @@ "movement_range_y": 2, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_House1_EventScript_2077A3", + "script": "PetalburgCity_House1_EventScript_Woman", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_House1_EventScript_20779A", + "script": "PetalburgCity_House1_EventScript_Man", "flag": "0" } ], diff --git a/data/maps/PetalburgCity_House1/scripts.inc b/data/maps/PetalburgCity_House1/scripts.inc index cb511bbed..2fe46437e 100644 --- a/data/maps/PetalburgCity_House1/scripts.inc +++ b/data/maps/PetalburgCity_House1/scripts.inc @@ -1,20 +1,20 @@ PetalburgCity_House1_MapScripts:: @ 8207799 .byte 0 -PetalburgCity_House1_EventScript_20779A:: @ 820779A - msgbox PetalburgCity_House1_Text_2077AC, MSGBOX_NPC +PetalburgCity_House1_EventScript_Man:: @ 820779A + msgbox PetalburgCity_House1_Text_TravelingIsWonderful, MSGBOX_NPC end -PetalburgCity_House1_EventScript_2077A3:: @ 82077A3 - msgbox PetalburgCity_House1_Text_2077FB, MSGBOX_NPC +PetalburgCity_House1_EventScript_Woman:: @ 82077A3 + msgbox PetalburgCity_House1_Text_GoOnAdventure, MSGBOX_NPC end -PetalburgCity_House1_Text_2077AC: @ 82077AC +PetalburgCity_House1_Text_TravelingIsWonderful: @ 82077AC .string "Traveling is wonderful!\p" .string "When I was young, I roamed the seas\n" .string "and the mountains!$" -PetalburgCity_House1_Text_2077FB: @ 82077FB +PetalburgCity_House1_Text_GoOnAdventure: @ 82077FB .string "Sigh…\p" .string "I wish I could go on an adventure\n" .string "with some POKéMON…\p" diff --git a/data/maps/PetalburgCity_House2/map.json b/data/maps/PetalburgCity_House2/map.json index b6c0107a0..9354b4926 100644 --- a/data/maps/PetalburgCity_House2/map.json +++ b/data/maps/PetalburgCity_House2/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_House2_EventScript_2078F3", + "script": "PetalburgCity_House2_EventScript_Woman", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_House2_EventScript_2078FC", + "script": "PetalburgCity_House2_EventScript_SchoolKid", "flag": "0" } ], diff --git a/data/maps/PetalburgCity_House2/scripts.inc b/data/maps/PetalburgCity_House2/scripts.inc index 2650e970c..3be93cbd0 100644 --- a/data/maps/PetalburgCity_House2/scripts.inc +++ b/data/maps/PetalburgCity_House2/scripts.inc @@ -1,21 +1,21 @@ PetalburgCity_House2_MapScripts:: @ 82078F2 .byte 0 -PetalburgCity_House2_EventScript_2078F3:: @ 82078F3 - msgbox PetalburgCity_House2_Text_207905, MSGBOX_NPC +PetalburgCity_House2_EventScript_Woman:: @ 82078F3 + msgbox PetalburgCity_House2_Text_NormanBecameGymLeader, MSGBOX_NPC end -PetalburgCity_House2_EventScript_2078FC:: @ 82078FC - msgbox PetalburgCity_House2_Text_207969, MSGBOX_NPC +PetalburgCity_House2_EventScript_SchoolKid:: @ 82078FC + msgbox PetalburgCity_House2_Text_BattledNormanOnce, MSGBOX_NPC end -PetalburgCity_House2_Text_207905: @ 8207905 +PetalburgCity_House2_Text_NormanBecameGymLeader: @ 8207905 .string "NORMAN became our town's new\n" .string "GYM LEADER.\p" .string "I think he called his family over from\n" .string "somewhere far away.$" -PetalburgCity_House2_Text_207969: @ 8207969 +PetalburgCity_House2_Text_BattledNormanOnce: @ 8207969 .string "I battled NORMAN once, but, whew,\n" .string "he was way too strong.\p" .string "How would I put it?\p" diff --git a/data/maps/PetalburgCity_Mart/map.json b/data/maps/PetalburgCity_Mart/map.json index b08837e80..82519cb5c 100644 --- a/data/maps/PetalburgCity_Mart/map.json +++ b/data/maps/PetalburgCity_Mart/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_Mart_EventScript_207D69", + "script": "PetalburgCity_Mart_EventScript_Clerk", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_Mart_EventScript_207DE8", + "script": "PetalburgCity_Mart_EventScript_Man", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_Mart_EventScript_207DDF", + "script": "PetalburgCity_Mart_EventScript_Boy", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_Mart_EventScript_207DD6", + "script": "PetalburgCity_Mart_EventScript_Woman", "flag": "0" } ], diff --git a/data/maps/PetalburgCity_Mart/scripts.inc b/data/maps/PetalburgCity_Mart/scripts.inc index 0b4d9808f..f27f0aeb5 100644 --- a/data/maps/PetalburgCity_Mart/scripts.inc +++ b/data/maps/PetalburgCity_Mart/scripts.inc @@ -1,19 +1,19 @@ PetalburgCity_Mart_MapScripts:: @ 8207D68 .byte 0 -PetalburgCity_Mart_EventScript_207D69:: @ 8207D69 +PetalburgCity_Mart_EventScript_Clerk:: @ 8207D69 lock faceplayer message gText_HowMayIServeYou waitmessage - goto_if_set FLAG_PETALBURG_MART_EXPANDED_ITEMS, PetalburgCity_Mart_EventScript_207DA6 - pokemart PetalburgCity_Mart_Pokemart_207D8C + goto_if_set FLAG_PETALBURG_MART_EXPANDED_ITEMS, PetalburgCity_Mart_EventScript_ExpandedItems + pokemart PetalburgCity_Mart_Pokemart_Basic msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -PetalburgCity_Mart_Pokemart_207D8C: @ 8207D8C +PetalburgCity_Mart_Pokemart_Basic: @ 8207D8C .2byte ITEM_POKE_BALL .2byte ITEM_POTION .2byte ITEM_ANTIDOTE @@ -29,14 +29,14 @@ PetalburgCity_Mart_Pokemart_207D8C: @ 8207D8C release end -PetalburgCity_Mart_EventScript_207DA6:: @ 8207DA6 - pokemart PetalburgCity_Mart_Pokemart_207DB8 +PetalburgCity_Mart_EventScript_ExpandedItems:: @ 8207DA6 + pokemart PetalburgCity_Mart_Pokemart_Expanded msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -PetalburgCity_Mart_Pokemart_207DB8: @ 8207DB8 +PetalburgCity_Mart_Pokemart_Expanded: @ 8207DB8 .2byte ITEM_POKE_BALL .2byte ITEM_GREAT_BALL .2byte ITEM_POTION @@ -54,30 +54,30 @@ PetalburgCity_Mart_Pokemart_207DB8: @ 8207DB8 release end -PetalburgCity_Mart_EventScript_207DD6:: @ 8207DD6 - msgbox PetalburgCity_Mart_Text_207DF1, MSGBOX_NPC +PetalburgCity_Mart_EventScript_Woman:: @ 8207DD6 + msgbox PetalburgCity_Mart_Text_WeakWillGrowStronger, MSGBOX_NPC end -PetalburgCity_Mart_EventScript_207DDF:: @ 8207DDF - msgbox PetalburgCity_Mart_Text_207E60, MSGBOX_NPC +PetalburgCity_Mart_EventScript_Boy:: @ 8207DDF + msgbox PetalburgCity_Mart_Text_RepelIsUseful, MSGBOX_NPC end -PetalburgCity_Mart_EventScript_207DE8:: @ 8207DE8 - msgbox PetalburgCity_Mart_Text_207EB0, MSGBOX_NPC +PetalburgCity_Mart_EventScript_Man:: @ 8207DE8 + msgbox PetalburgCity_Mart_Text_TakeSomeAntidotesWithYou, MSGBOX_NPC end -PetalburgCity_Mart_Text_207DF1: @ 8207DF1 +PetalburgCity_Mart_Text_WeakWillGrowStronger: @ 8207DF1 .string "Even if a POKéMON is weak now,\n" .string "it will grow stronger.\p" .string "The most important thing is love!\n" .string "Love for your POKéMON!$" -PetalburgCity_Mart_Text_207E60: @ 8207E60 +PetalburgCity_Mart_Text_RepelIsUseful: @ 8207E60 .string "Do you use REPEL?\n" .string "It keeps POKéMON away, so it's\l" .string "useful when you're in a hurry.$" -PetalburgCity_Mart_Text_207EB0: @ 8207EB0 +PetalburgCity_Mart_Text_TakeSomeAntidotesWithYou: @ 8207EB0 .string "Do you have any ANTIDOTES with\n" .string "you?\p" .string "If you walk around with a poisoned\n" diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/map.json b/data/maps/PetalburgCity_PokemonCenter_1F/map.json index eeb22dca4..d673ecf4d 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/map.json +++ b/data/maps/PetalburgCity_PokemonCenter_1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_PokemonCenter_1F_EventScript_2079FC", + "script": "PetalburgCity_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": "PetalburgCity_PokemonCenter_1F_EventScript_291539", + "script": "MysteryEventClub_EventScript_Man", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_PokemonCenter_1F_EventScript_207A0A", + "script": "PetalburgCity_PokemonCenter_1F_EventScript_FatMan", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_PokemonCenter_1F_EventScript_207A13", + "script": "PetalburgCity_PokemonCenter_1F_EventScript_Youngster", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_PokemonCenter_1F_EventScript_207A1C", + "script": "PetalburgCity_PokemonCenter_1F_EventScript_Woman", "flag": "0" } ], diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc index a5b069d94..60b56837c 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc @@ -8,7 +8,7 @@ PetalburgCity_PokemonCenter_1F_OnTransition: @ 82079F3 call Common_EventScript_UpdateBrineyLocation end -PetalburgCity_PokemonCenter_1F_EventScript_2079FC:: @ 82079FC +PetalburgCity_PokemonCenter_1F_EventScript_Nurse:: @ 82079FC setvar VAR_0x800B, 1 call Common_EventScript_PkmnCenterNurse waitmessage @@ -16,64 +16,64 @@ PetalburgCity_PokemonCenter_1F_EventScript_2079FC:: @ 82079FC release end -PetalburgCity_PokemonCenter_1F_EventScript_207A0A:: @ 8207A0A - msgbox PetalburgCity_PokemonCenter_1F_Text_207A76, MSGBOX_NPC +PetalburgCity_PokemonCenter_1F_EventScript_FatMan:: @ 8207A0A + msgbox PetalburgCity_PokemonCenter_1F_Text_PCStorageSystem, MSGBOX_NPC end -PetalburgCity_PokemonCenter_1F_EventScript_207A13:: @ 8207A13 - msgbox PetalburgCity_PokemonCenter_1F_Text_207AD6, MSGBOX_NPC +PetalburgCity_PokemonCenter_1F_EventScript_Youngster:: @ 8207A13 + msgbox PetalburgCity_PokemonCenter_1F_Text_OranBerryRegainedHP, MSGBOX_NPC end -PetalburgCity_PokemonCenter_1F_EventScript_207A1C:: @ 8207A1C +PetalburgCity_PokemonCenter_1F_EventScript_Woman:: @ 8207A1C lock faceplayer - msgbox PetalburgCity_PokemonCenter_1F_Text_207B09, MSGBOX_DEFAULT + msgbox PetalburgCity_PokemonCenter_1F_Text_ManyTypesOfPokemon, MSGBOX_DEFAULT specialvar VAR_RESULT, IsStarterInParty compare VAR_RESULT, 1 - goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_207A38 + goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_SayStarterTypeInfo release end -PetalburgCity_PokemonCenter_1F_EventScript_207A38:: @ 8207A38 +PetalburgCity_PokemonCenter_1F_EventScript_SayStarterTypeInfo:: @ 8207A38 compare VAR_STARTER_MON, 0 - call_if_eq PetalburgCity_PokemonCenter_1F_EventScript_207A5B + call_if_eq PetalburgCity_PokemonCenter_1F_EventScript_SayTreeckoType compare VAR_STARTER_MON, 1 - call_if_eq PetalburgCity_PokemonCenter_1F_EventScript_207A64 + call_if_eq PetalburgCity_PokemonCenter_1F_EventScript_SayTorchicType compare VAR_STARTER_MON, 2 - call_if_eq PetalburgCity_PokemonCenter_1F_EventScript_207A6D + call_if_eq PetalburgCity_PokemonCenter_1F_EventScript_SayMudkipType release end -PetalburgCity_PokemonCenter_1F_EventScript_207A5B:: @ 8207A5B - msgbox PetalburgCity_PokemonCenter_1F_Text_207BB0, MSGBOX_DEFAULT +PetalburgCity_PokemonCenter_1F_EventScript_SayTreeckoType:: @ 8207A5B + msgbox PetalburgCity_PokemonCenter_1F_Text_TreeckoIsGrassType, MSGBOX_DEFAULT return -PetalburgCity_PokemonCenter_1F_EventScript_207A64:: @ 8207A64 - msgbox PetalburgCity_PokemonCenter_1F_Text_207C35, MSGBOX_DEFAULT +PetalburgCity_PokemonCenter_1F_EventScript_SayTorchicType:: @ 8207A64 + msgbox PetalburgCity_PokemonCenter_1F_Text_TorchicIsFireType, MSGBOX_DEFAULT return -PetalburgCity_PokemonCenter_1F_EventScript_207A6D:: @ 8207A6D - msgbox PetalburgCity_PokemonCenter_1F_Text_207CB7, MSGBOX_DEFAULT +PetalburgCity_PokemonCenter_1F_EventScript_SayMudkipType:: @ 8207A6D + msgbox PetalburgCity_PokemonCenter_1F_Text_MudkipIsWaterType, MSGBOX_DEFAULT return -PetalburgCity_PokemonCenter_1F_Text_207A76: @ 8207A76 +PetalburgCity_PokemonCenter_1F_Text_PCStorageSystem: @ 8207A76 .string "That PC-based POKéMON Storage\n" .string "System…\p" .string "Whoever made it must be some kind\n" .string "of a scientific wizard!$" -PetalburgCity_PokemonCenter_1F_Text_207AD6: @ 8207AD6 +PetalburgCity_PokemonCenter_1F_Text_OranBerryRegainedHP: @ 8207AD6 .string "When my POKéMON ate an\n" .string "ORAN BERRY, it regained HP!$" -PetalburgCity_PokemonCenter_1F_Text_207B09: @ 8207B09 +PetalburgCity_PokemonCenter_1F_Text_ManyTypesOfPokemon: @ 8207B09 .string "There are many types of POKéMON.\p" .string "All types have their strengths and\n" .string "weaknesses against other types.\p" .string "Depending on the types of POKéMON,\n" .string "a battle could be easy or hard.$" -PetalburgCity_PokemonCenter_1F_Text_207BB0: @ 8207BB0 +PetalburgCity_PokemonCenter_1F_Text_TreeckoIsGrassType: @ 8207BB0 .string "For example, your TREECKO\n" .string "is a GRASS type.\p" .string "It's strong against the WATER and\n" @@ -81,7 +81,7 @@ PetalburgCity_PokemonCenter_1F_Text_207BB0: @ 8207BB0 .string "But, it's weak against FIRE-type\n" .string "POKéMON.$" -PetalburgCity_PokemonCenter_1F_Text_207C35: @ 8207C35 +PetalburgCity_PokemonCenter_1F_Text_TorchicIsFireType: @ 8207C35 .string "For example, your TORCHIC\n" .string "is a FIRE type.\p" .string "It's strong against the GRASS and\n" @@ -89,7 +89,7 @@ PetalburgCity_PokemonCenter_1F_Text_207C35: @ 8207C35 .string "But, it's weak against WATER-type\n" .string "POKéMON.$" -PetalburgCity_PokemonCenter_1F_Text_207CB7: @ 8207CB7 +PetalburgCity_PokemonCenter_1F_Text_MudkipIsWaterType: @ 8207CB7 .string "For example, your MUDKIP\n" .string "is a WATER type.\p" .string "It's strong against the FIRE type.\p" diff --git a/data/maps/PetalburgCity_WallysHouse/map.json b/data/maps/PetalburgCity_WallysHouse/map.json index c961d300c..49af9f43d 100644 --- a/data/maps/PetalburgCity_WallysHouse/map.json +++ b/data/maps/PetalburgCity_WallysHouse/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_WallysHouse_EventScript_204278", + "script": "PetalburgCity_WallysHouse_EventScript_WallyUncle", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_WallysHouse_EventScript_2042C0", + "script": "PetalburgCity_WallysHouse_EventScript_WallyAunt", "flag": "0" } ], diff --git a/data/maps/PetalburgCity_WallysHouse/scripts.inc b/data/maps/PetalburgCity_WallysHouse/scripts.inc index be2a6280e..1516e33d2 100644 --- a/data/maps/PetalburgCity_WallysHouse/scripts.inc +++ b/data/maps/PetalburgCity_WallysHouse/scripts.inc @@ -1,71 +1,71 @@ PetalburgCity_WallysHouse_MapScripts:: @ 8204229 - map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_WallysHouse_MapScript2_204247 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PetalburgCity_WallysHouse_MapScript2_204234 + map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_WallysHouse_MapScript2_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PetalburgCity_WallysHouse_MapScript2_OnWarp .byte 0 -PetalburgCity_WallysHouse_MapScript2_204234: @ 8204234 - map_script_2 VAR_PETALBURG_CITY_STATE, 4, PetalburgCity_WallysHouse_EventScript_20423E +PetalburgCity_WallysHouse_MapScript2_OnWarp: @ 8204234 + map_script_2 VAR_PETALBURG_CITY_STATE, 4, PetalburgCity_WallysHouse_EventScript_PlayerUncleFaceEachOther .2byte 0 -PetalburgCity_WallysHouse_EventScript_20423E:: @ 820423E +PetalburgCity_WallysHouse_EventScript_PlayerUncleFaceEachOther:: @ 820423E turnobject EVENT_OBJ_ID_PLAYER, DIR_EAST turnobject 1, DIR_WEST end -PetalburgCity_WallysHouse_MapScript2_204247: @ 8204247 - map_script_2 VAR_PETALBURG_CITY_STATE, 4, PetalburgCity_WallysHouse_EventScript_204251 +PetalburgCity_WallysHouse_MapScript2_OnFrame: @ 8204247 + map_script_2 VAR_PETALBURG_CITY_STATE, 4, PetalburgCity_WallysHouse_EventScript_GiveHM03Surf .2byte 0 -PetalburgCity_WallysHouse_EventScript_204251:: @ 8204251 +PetalburgCity_WallysHouse_EventScript_GiveHM03Surf:: @ 8204251 lockall - msgbox PetalburgCity_WallysHouse_Text_20446E, MSGBOX_DEFAULT + msgbox PetalburgCity_WallysHouse_Text_PleaseExcuseUs, MSGBOX_DEFAULT giveitem_std ITEM_HM03 setflag FLAG_RECEIVED_HM03 - msgbox PetalburgCity_WallysHouse_Text_20461A, MSGBOX_DEFAULT + msgbox PetalburgCity_WallysHouse_Text_SurfGoAllSortsOfPlaces, MSGBOX_DEFAULT setvar VAR_PETALBURG_CITY_STATE, 5 releaseall end -PetalburgCity_WallysHouse_EventScript_204278:: @ 8204278 +PetalburgCity_WallysHouse_EventScript_WallyUncle:: @ 8204278 lock faceplayer - goto_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, PetalburgCity_WallysHouse_EventScript_2042AC - goto_if_set FLAG_RECEIVED_HM03, PetalburgCity_WallysHouse_EventScript_2042A2 - goto_if_set FLAG_THANKED_FOR_PLAYING_WITH_WALLY, PetalburgCity_WallysHouse_EventScript_2042B6 - msgbox PetalburgCity_WallysHouse_Text_2042DF, MSGBOX_DEFAULT + goto_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, PetalburgCity_WallysHouse_EventScript_DefeatedWallyInVictoryRoad + goto_if_set FLAG_RECEIVED_HM03, PetalburgCity_WallysHouse_EventScript_ReceievedHM03Surf + goto_if_set FLAG_THANKED_FOR_PLAYING_WITH_WALLY, PetalburgCity_WallysHouse_EventScript_PlayedWithWally + msgbox PetalburgCity_WallysHouse_Text_ThanksForPlayingWithWally, MSGBOX_DEFAULT setflag FLAG_THANKED_FOR_PLAYING_WITH_WALLY release end -PetalburgCity_WallysHouse_EventScript_2042A2:: @ 82042A2 - msgbox PetalburgCity_WallysHouse_Text_204661, MSGBOX_DEFAULT +PetalburgCity_WallysHouse_EventScript_ReceievedHM03Surf:: @ 82042A2 + msgbox PetalburgCity_WallysHouse_Text_WallyIsComingHomeSoon, MSGBOX_DEFAULT release end -PetalburgCity_WallysHouse_EventScript_2042AC:: @ 82042AC - msgbox PetalburgCity_WallysHouse_Text_204698, MSGBOX_DEFAULT +PetalburgCity_WallysHouse_EventScript_DefeatedWallyInVictoryRoad:: @ 82042AC + msgbox PetalburgCity_WallysHouse_Text_YouMetWallyInEverGrandeCity, MSGBOX_DEFAULT release end -PetalburgCity_WallysHouse_EventScript_2042B6:: @ 82042B6 - msgbox PetalburgCity_WallysHouse_Text_20444D, MSGBOX_DEFAULT +PetalburgCity_WallysHouse_EventScript_PlayedWithWally:: @ 82042B6 + msgbox PetalburgCity_WallysHouse_Text_WonderHowWallyIsDoing, MSGBOX_DEFAULT release end -PetalburgCity_WallysHouse_EventScript_2042C0:: @ 82042C0 +PetalburgCity_WallysHouse_EventScript_WallyAunt:: @ 82042C0 lock faceplayer - goto_if_set FLAG_RECEIVED_HM03, PetalburgCity_WallysHouse_EventScript_2042D5 - msgbox PetalburgCity_WallysHouse_Text_204732, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_HM03, PetalburgCity_WallysHouse_EventScript_ReceivedHM03Surf + msgbox PetalburgCity_WallysHouse_Text_WallyWasReallyHappy, MSGBOX_DEFAULT release end -PetalburgCity_WallysHouse_EventScript_2042D5:: @ 82042D5 - msgbox PetalburgCity_WallysHouse_Text_2047A7, MSGBOX_DEFAULT +PetalburgCity_WallysHouse_EventScript_ReceivedHM03Surf:: @ 82042D5 + msgbox PetalburgCity_WallysHouse_Text_WallyLeftWithoutTelling, MSGBOX_DEFAULT release end -PetalburgCity_WallysHouse_Text_2042DF: @ 82042DF +PetalburgCity_WallysHouse_Text_ThanksForPlayingWithWally: @ 82042DF .string "You're…\n" .string "Ah, you must be {PLAYER}{KUN}, right?\p" .string "Thank you for playing with WALLY a\n" @@ -81,10 +81,10 @@ PetalburgCity_WallysHouse_Text_2042DF: @ 82042DF .string "I wonder where he could have\n" .string "gotten by now?$" -PetalburgCity_WallysHouse_Text_20444D: @ 820444D +PetalburgCity_WallysHouse_Text_WonderHowWallyIsDoing: @ 820444D .string "I wonder how our WALLY is doing?$" -PetalburgCity_WallysHouse_Text_20446E: @ 820446E +PetalburgCity_WallysHouse_Text_PleaseExcuseUs: @ 820446E .string "{PLAYER}{KUN}! Please excuse us for\n" .string "dragging you here this way.\p" .string "But our WALLY's become very healthy\n" @@ -101,15 +101,15 @@ PetalburgCity_WallysHouse_Text_20446E: @ 820446E .string "This isn't a bribe or anything, but\n" .string "I'd really like you to have this.$" -PetalburgCity_WallysHouse_Text_20461A: @ 820461A +PetalburgCity_WallysHouse_Text_SurfGoAllSortsOfPlaces: @ 820461A .string "If your POKéMON can SURF, you'll be\n" .string "able to go to all sorts of places.$" -PetalburgCity_WallysHouse_Text_204661: @ 8204661 +PetalburgCity_WallysHouse_Text_WallyIsComingHomeSoon: @ 8204661 .string "WALLY's coming home soon.\n" .string "I'm looking forward to that.$" -PetalburgCity_WallysHouse_Text_204698: @ 8204698 +PetalburgCity_WallysHouse_Text_YouMetWallyInEverGrandeCity: @ 8204698 .string "Oh? You met WALLY in\n" .string "EVER GRANDE CITY?\p" .string "Oh, {PLAYER}{KUN}, don't be silly.\p" @@ -117,13 +117,13 @@ PetalburgCity_WallysHouse_Text_204698: @ 8204698 .string "can't go somewhere far away like\l" .string "that all by himself.$" -PetalburgCity_WallysHouse_Text_204732: @ 8204732 +PetalburgCity_WallysHouse_Text_WallyWasReallyHappy: @ 8204732 .string "WALLY was really happy when he told\n" .string "us that he caught a POKéMON.\p" .string "It's been ages since I've seen him\n" .string "smile like that.$" -PetalburgCity_WallysHouse_Text_2047A7: @ 82047A7 +PetalburgCity_WallysHouse_Text_WallyLeftWithoutTelling: @ 82047A7 .string "I want you to keep this a secret\n" .string "from my husband…\p" .string "But our WALLY left VERDANTURF TOWN\n" diff --git a/data/maps/PetalburgWoods/map.json b/data/maps/PetalburgWoods/map.json index 7e7de784a..d43017f99 100644 --- a/data/maps/PetalburgWoods/map.json +++ b/data/maps/PetalburgWoods/map.json @@ -115,7 +115,7 @@ "movement_range_y": 2, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgWoods_EventScript_22E210", + "script": "PetalburgWoods_EventScript_Boy1", "flag": "0" }, { @@ -128,7 +128,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "PetalburgWoods_EventScript_22E26D", + "script": "PetalburgWoods_EventScript_Lyle", "flag": "0" }, { @@ -141,7 +141,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "PetalburgWoods_EventScript_22E284", + "script": "PetalburgWoods_EventScript_James", "flag": "0" }, { @@ -154,7 +154,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgWoods_EventScript_22E219", + "script": "PetalburgWoods_EventScript_Boy2", "flag": "0" }, { @@ -180,7 +180,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgWoods_EventScript_22E222", + "script": "PetalburgWoods_EventScript_Girl", "flag": "0" } ], @@ -236,7 +236,7 @@ "elevation": 3, "var": "VAR_PETALBURG_WOODS_STATE", "var_value": "0", - "script": "PetalburgWoods_EventScript_22DFD7" + "script": "PetalburgWoods_EventScript_DevonResearcherLeft" }, { "type": "trigger", @@ -245,7 +245,7 @@ "elevation": 3, "var": "VAR_PETALBURG_WOODS_STATE", "var_value": "0", - "script": "PetalburgWoods_EventScript_22E079" + "script": "PetalburgWoods_EventScript_DevonResearcherRight" } ], "bg_events": [ @@ -255,7 +255,7 @@ "y": 32, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "PetalburgWoods_EventScript_22E25B" + "script": "PetalburgWoods_EventScript_Sign1" }, { "type": "hidden_item", @@ -295,7 +295,7 @@ "y": 8, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "PetalburgWoods_EventScript_22E264" + "script": "PetalburgWoods_EventScript_Sign2" } ] }
\ No newline at end of file diff --git a/data/maps/PetalburgWoods/scripts.inc b/data/maps/PetalburgWoods/scripts.inc index 5a194c721..79179ffa6 100644 --- a/data/maps/PetalburgWoods/scripts.inc +++ b/data/maps/PetalburgWoods/scripts.inc @@ -1,119 +1,119 @@ PetalburgWoods_MapScripts:: @ 822DFD6 .byte 0 -PetalburgWoods_EventScript_22DFD7:: @ 822DFD7 +PetalburgWoods_EventScript_DevonResearcherLeft:: @ 822DFD7 lockall - call PetalburgWoods_EventScript_22E124 - applymovement 4, PetalburgWoods_Movement_22E1CB + call PetalburgWoods_EventScript_DevonResearcherIntro + applymovement 4, PetalburgWoods_Movement_DevonResearcherApproachPlayerLeft waitmovement 0 - msgbox PetalburgWoods_Text_22E34F, MSGBOX_DEFAULT + msgbox PetalburgWoods_Text_HaveYouSeenShroomish, MSGBOX_DEFAULT closemessage playbgm MUS_AQA_0, 0 - applymovement 3, PetalburgWoods_Movement_22E209 + applymovement 3, PetalburgWoods_Movement_AquaEntrance waitmovement 0 - msgbox PetalburgWoods_Text_22E3AA, MSGBOX_DEFAULT + msgbox PetalburgWoods_Text_IWasGoingToAmbushYou, MSGBOX_DEFAULT closemessage - applymovement 3, PetalburgWoods_Movement_22E1F6 + applymovement 3, PetalburgWoods_Movement_AquaApproachResearcherLeft waitmovement 0 applymovement 4, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - msgbox PetalburgWoods_Text_22E428, MSGBOX_DEFAULT + msgbox PetalburgWoods_Text_HandOverThosePapers, MSGBOX_DEFAULT closemessage - applymovement 4, PetalburgWoods_Movement_22E1E4 + applymovement 4, PetalburgWoods_Movement_DevonResearcherFleeToPlayerLeft waitmovement 0 - msgbox PetalburgWoods_Text_22E457, MSGBOX_DEFAULT + msgbox PetalburgWoods_Text_YouHaveToHelpMe, MSGBOX_DEFAULT closemessage - applymovement 3, PetalburgWoods_Movement_22E20E + applymovement 3, PetalburgWoods_Movement_AquaApproachPlayer waitmovement 0 - msgbox PetalburgWoods_Text_22E4A5, MSGBOX_DEFAULT - trainerbattle_no_intro TRAINER_GRUNT_8, PetalburgWoods_Text_22E542 - applymovement 3, PetalburgWoods_Movement_22E1F9 + msgbox PetalburgWoods_Text_NoOneCrossesTeamAqua, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_GRUNT_8, PetalburgWoods_Text_YoureKiddingMe + applymovement 3, PetalburgWoods_Movement_AquaBackOff waitmovement 0 - call PetalburgWoods_EventScript_22E138 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgWoods_Movement_22E1E0 - applymovement 4, PetalburgWoods_Movement_22E1C2 + call PetalburgWoods_EventScript_DevonResearcherPostBattle + applymovement EVENT_OBJ_ID_PLAYER, PetalburgWoods_Movement_WatchResearcherLeave + applymovement 4, PetalburgWoods_Movement_DevonResearcherExitLeft waitmovement 0 - goto PetalburgWoods_EventScript_22E1A7 + goto PetalburgWoods_EventScript_RemoveDevonResearcher end -PetalburgWoods_EventScript_22E079:: @ 822E079 +PetalburgWoods_EventScript_DevonResearcherRight:: @ 822E079 lockall - call PetalburgWoods_EventScript_22E124 - applymovement 4, PetalburgWoods_Movement_22E1D0 + call PetalburgWoods_EventScript_DevonResearcherIntro + applymovement 4, PetalburgWoods_Movement_DevonResearcherApproachPlayerRight waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - msgbox PetalburgWoods_Text_22E34F, MSGBOX_DEFAULT + msgbox PetalburgWoods_Text_HaveYouSeenShroomish, MSGBOX_DEFAULT closemessage playbgm MUS_AQA_0, 0 - applymovement 3, PetalburgWoods_Movement_22E209 + applymovement 3, PetalburgWoods_Movement_AquaEntrance waitmovement 0 - msgbox PetalburgWoods_Text_22E3AA, MSGBOX_DEFAULT + msgbox PetalburgWoods_Text_IWasGoingToAmbushYou, MSGBOX_DEFAULT closemessage - applymovement 3, PetalburgWoods_Movement_22E205 + applymovement 3, PetalburgWoods_Movement_AquaApproachResearcherRight waitmovement 0 applymovement 4, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - msgbox PetalburgWoods_Text_22E428, MSGBOX_DEFAULT + msgbox PetalburgWoods_Text_HandOverThosePapers, MSGBOX_DEFAULT closemessage - applymovement 4, PetalburgWoods_Movement_22E1EA + applymovement 4, PetalburgWoods_Movement_DevonResearcherFleeToPlayerRight waitmovement 0 - msgbox PetalburgWoods_Text_22E457, MSGBOX_DEFAULT + msgbox PetalburgWoods_Text_YouHaveToHelpMe, MSGBOX_DEFAULT applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - msgbox PetalburgWoods_Text_22E4A5, MSGBOX_DEFAULT - trainerbattle_no_intro TRAINER_GRUNT_8, PetalburgWoods_Text_22E542 - applymovement 3, PetalburgWoods_Movement_22E1F9 + msgbox PetalburgWoods_Text_NoOneCrossesTeamAqua, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_GRUNT_8, PetalburgWoods_Text_YoureKiddingMe + applymovement 3, PetalburgWoods_Movement_AquaBackOff waitmovement 0 - call PetalburgWoods_EventScript_22E138 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgWoods_Movement_22E1E0 - applymovement 4, PetalburgWoods_Movement_22E1D7 + call PetalburgWoods_EventScript_DevonResearcherPostBattle + applymovement EVENT_OBJ_ID_PLAYER, PetalburgWoods_Movement_WatchResearcherLeave + applymovement 4, PetalburgWoods_Movement_DevonResearcherExitRight waitmovement 0 - goto PetalburgWoods_EventScript_22E1A7 + goto PetalburgWoods_EventScript_RemoveDevonResearcher end -PetalburgWoods_EventScript_22E124:: @ 822E124 - applymovement 4, PetalburgWoods_Movement_22E1B1 +PetalburgWoods_EventScript_DevonResearcherIntro:: @ 822E124 + applymovement 4, PetalburgWoods_Movement_DevonResearcherLookAround waitmovement 0 - msgbox PetalburgWoods_Text_22E332, MSGBOX_DEFAULT + msgbox PetalburgWoods_Text_NotAOneToBeFound, MSGBOX_DEFAULT closemessage return -PetalburgWoods_EventScript_22E138:: @ 822E138 - msgbox PetalburgWoods_Text_22E563, MSGBOX_DEFAULT +PetalburgWoods_EventScript_DevonResearcherPostBattle:: @ 822E138 + msgbox PetalburgWoods_Text_YouveGotSomeNerve, MSGBOX_DEFAULT closemessage - applymovement 3, PetalburgWoods_Movement_22E1FD + applymovement 3, PetalburgWoods_Movement_AquaRunAway waitmovement 0 removeobject 3 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 - msgbox PetalburgWoods_Text_22E63D, MSGBOX_DEFAULT + msgbox PetalburgWoods_Text_ThatWasAwfullyClose, MSGBOX_DEFAULT giveitem_std ITEM_GREAT_BALL compare VAR_RESULT, 0 - goto_if_eq PetalburgWoods_EventScript_22E17D - goto PetalburgWoods_EventScript_22E18B + goto_if_eq PetalburgWoods_EventScript_BagFull + goto PetalburgWoods_EventScript_DevonResearcherFinish end -PetalburgWoods_EventScript_22E17D:: @ 822E17D - msgbox PetalburgWoods_Text_22E741, MSGBOX_DEFAULT - goto PetalburgWoods_EventScript_22E18B +PetalburgWoods_EventScript_BagFull:: @ 822E17D + msgbox PetalburgWoods_Text_YoureLoadedWithItems, MSGBOX_DEFAULT + goto PetalburgWoods_EventScript_DevonResearcherFinish end -PetalburgWoods_EventScript_22E18B:: @ 822E18B - msgbox PetalburgWoods_Text_22E6C7, MSGBOX_DEFAULT - applymovement 4, PetalburgWoods_Movement_22E1EE +PetalburgWoods_EventScript_DevonResearcherFinish:: @ 822E18B + msgbox PetalburgWoods_Text_TeamAquaAfterSomethingInRustboro, MSGBOX_DEFAULT + applymovement 4, PetalburgWoods_Movement_DevonResearcherStartExit waitmovement 0 - msgbox PetalburgWoods_Text_22E712, MSGBOX_DEFAULT + msgbox PetalburgWoods_Text_ICantBeWastingTime, MSGBOX_DEFAULT closemessage return -PetalburgWoods_EventScript_22E1A7:: @ 822E1A7 +PetalburgWoods_EventScript_RemoveDevonResearcher:: @ 822E1A7 removeobject 4 setvar VAR_PETALBURG_WOODS_STATE, 1 releaseall end -PetalburgWoods_Movement_22E1B1: @ 822E1B1 +PetalburgWoods_Movement_DevonResearcherLookAround: @ 822E1B1 face_up delay_16 delay_4 @@ -132,7 +132,7 @@ PetalburgWoods_Movement_22E1B1: @ 822E1B1 delay_16 step_end -PetalburgWoods_Movement_22E1C2: @ 822E1C2 +PetalburgWoods_Movement_DevonResearcherExitLeft: @ 822E1C2 walk_fast_right walk_fast_up walk_fast_up @@ -143,14 +143,14 @@ PetalburgWoods_Movement_22E1C2: @ 822E1C2 walk_fast_up step_end -PetalburgWoods_Movement_22E1CB: @ 822E1CB +PetalburgWoods_Movement_DevonResearcherApproachPlayerLeft: @ 822E1CB delay_16 face_player walk_down walk_down step_end -PetalburgWoods_Movement_22E1D0: @ 822E1D0 +PetalburgWoods_Movement_DevonResearcherApproachPlayerRight: @ 822E1D0 delay_16 face_player walk_down @@ -159,7 +159,7 @@ PetalburgWoods_Movement_22E1D0: @ 822E1D0 walk_in_place_fastest_right step_end -PetalburgWoods_Movement_22E1D7: @ 822E1D7 +PetalburgWoods_Movement_DevonResearcherExitRight: @ 822E1D7 walk_fast_left walk_fast_up walk_fast_up @@ -170,13 +170,13 @@ PetalburgWoods_Movement_22E1D7: @ 822E1D7 walk_fast_up step_end -PetalburgWoods_Movement_22E1E0: @ 822E1E0 +PetalburgWoods_Movement_WatchResearcherLeave: @ 822E1E0 delay_16 delay_16 walk_in_place_fastest_up step_end -PetalburgWoods_Movement_22E1E4: @ 822E1E4 +PetalburgWoods_Movement_DevonResearcherFleeToPlayerLeft: @ 822E1E4 walk_fast_right walk_fast_down walk_fast_down @@ -184,13 +184,13 @@ PetalburgWoods_Movement_22E1E4: @ 822E1E4 walk_in_place_fastest_up step_end -PetalburgWoods_Movement_22E1EA: @ 822E1EA +PetalburgWoods_Movement_DevonResearcherFleeToPlayerRight: @ 822E1EA walk_fast_down walk_fast_right walk_in_place_fastest_up step_end -PetalburgWoods_Movement_22E1EE: @ 822E1EE +PetalburgWoods_Movement_DevonResearcherStartExit: @ 822E1EE walk_in_place_fastest_down delay_16 delay_16 @@ -200,18 +200,18 @@ PetalburgWoods_Movement_22E1EE: @ 822E1EE face_up step_end -PetalburgWoods_Movement_22E1F6: @ 822E1F6 +PetalburgWoods_Movement_AquaApproachResearcherLeft: @ 822E1F6 walk_fast_down walk_fast_down step_end -PetalburgWoods_Movement_22E1F9: @ 822E1F9 +PetalburgWoods_Movement_AquaBackOff: @ 822E1F9 lock_facing_direction walk_up unlock_facing_direction step_end -PetalburgWoods_Movement_22E1FD: @ 822E1FD +PetalburgWoods_Movement_AquaRunAway: @ 822E1FD walk_fast_up walk_fast_up walk_fast_up @@ -221,36 +221,36 @@ PetalburgWoods_Movement_22E1FD: @ 822E1FD delay_16 step_end -PetalburgWoods_Movement_22E205: @ 822E205 +PetalburgWoods_Movement_AquaApproachResearcherRight: @ 822E205 walk_fast_down walk_fast_down walk_fast_down step_end -PetalburgWoods_Movement_22E209: @ 822E209 +PetalburgWoods_Movement_AquaEntrance: @ 822E209 walk_down walk_down delay_16 delay_16 step_end -PetalburgWoods_Movement_22E20E: @ 822E20E +PetalburgWoods_Movement_AquaApproachPlayer: @ 822E20E walk_down step_end -PetalburgWoods_EventScript_22E210:: @ 822E210 - msgbox PetalburgWoods_Text_22EA0C, MSGBOX_NPC +PetalburgWoods_EventScript_Boy1:: @ 822E210 + msgbox PetalburgWoods_Text_StayOutOfTallGrass, MSGBOX_NPC end -PetalburgWoods_EventScript_22E219:: @ 822E219 - msgbox PetalburgWoods_Text_22EA8B, MSGBOX_NPC +PetalburgWoods_EventScript_Boy2:: @ 822E219 + msgbox PetalburgWoods_Text_HiddenItemsExplanation, MSGBOX_NPC end -PetalburgWoods_EventScript_22E222:: @ 822E222 +PetalburgWoods_EventScript_Girl:: @ 822E222 lock faceplayer - goto_if_set FLAG_RECEIVED_MIRACLE_SEED, PetalburgWoods_EventScript_22E251 - msgbox PetalburgWoods_Text_22EAFE, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_MIRACLE_SEED, PetalburgWoods_EventScript_ExplainMiracleSeed + msgbox PetalburgWoods_Text_TryUsingThisItem, MSGBOX_DEFAULT giveitem_std ITEM_MIRACLE_SEED compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull @@ -258,102 +258,102 @@ PetalburgWoods_EventScript_22E222:: @ 822E222 release end -PetalburgWoods_EventScript_22E251:: @ 822E251 - msgbox PetalburgWoods_Text_22EB63, MSGBOX_DEFAULT +PetalburgWoods_EventScript_ExplainMiracleSeed:: @ 822E251 + msgbox PetalburgWoods_Text_MiracleSeedExplanation, MSGBOX_DEFAULT release end -PetalburgWoods_EventScript_22E25B:: @ 822E25B - msgbox PetalburgWoods_Text_22EC10, MSGBOX_SIGN +PetalburgWoods_EventScript_Sign1:: @ 822E25B + msgbox PetalburgWoods_Text_TrainerTipsExperience, MSGBOX_SIGN end -PetalburgWoods_EventScript_22E264:: @ 822E264 - msgbox PetalburgWoods_Text_22ED07, MSGBOX_SIGN +PetalburgWoods_EventScript_Sign2:: @ 822E264 + msgbox PetalburgWoods_Text_TrainerTipsPP, MSGBOX_SIGN end -PetalburgWoods_EventScript_22E26D:: @ 822E26D - trainerbattle_single TRAINER_LYLE, PetalburgWoods_Text_22E77D, PetalburgWoods_Text_22E7C1 - msgbox PetalburgWoods_Text_22E7EF, MSGBOX_AUTOCLOSE +PetalburgWoods_EventScript_Lyle:: @ 822E26D + trainerbattle_single TRAINER_LYLE, PetalburgWoods_Text_GoBugPokemonTeam, PetalburgWoods_Text_ICouldntWin + msgbox PetalburgWoods_Text_ImOutOfPokeBalls, MSGBOX_AUTOCLOSE end -PetalburgWoods_EventScript_22E284:: @ 822E284 - trainerbattle_single TRAINER_JAMES_1, PetalburgWoods_Text_22E827, PetalburgWoods_Text_22E86B, PetalburgWoods_EventScript_22E2C5 +PetalburgWoods_EventScript_James:: @ 822E284 + trainerbattle_single TRAINER_JAMES_1, PetalburgWoods_Text_InstantlyPopularWithBugPokemon, PetalburgWoods_Text_CantBePopularIfILose, PetalburgWoods_EventScript_TryRegisterJames specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if_eq PetalburgWoods_EventScript_22E31B + goto_if_eq PetalburgWoods_EventScript_JamesRematch setvar VAR_0x8004, TRAINER_JAMES_1 specialvar VAR_RESULT, IsTrainerRegistered compare VAR_RESULT, 0 - goto_if_eq PetalburgWoods_EventScript_22E2EF - msgbox PetalburgWoods_Text_22E889, MSGBOX_DEFAULT + goto_if_eq PetalburgWoods_EventScript_TryRegisterJames2 + msgbox PetalburgWoods_Text_PeopleRespectYou, MSGBOX_DEFAULT release end -PetalburgWoods_EventScript_22E2C5:: @ 822E2C5 +PetalburgWoods_EventScript_TryRegisterJames:: @ 822E2C5 special sub_80B4808 waitmovement 0 - goto_if_set FLAG_HAS_MATCH_CALL, PetalburgWoods_EventScript_22E2D6 + goto_if_set FLAG_HAS_MATCH_CALL, PetalburgWoods_EventScript_RegisterJames release end -PetalburgWoods_EventScript_22E2D6:: @ 822E2D6 - msgbox PetalburgWoods_Text_22E8C3, MSGBOX_DEFAULT +PetalburgWoods_EventScript_RegisterJames:: @ 822E2D6 + msgbox PetalburgWoods_Text_IWantRematch1, MSGBOX_DEFAULT register_matchcall TRAINER_JAMES_1 release end -PetalburgWoods_EventScript_22E2EF:: @ 822E2EF - goto_if_set FLAG_HAS_MATCH_CALL, PetalburgWoods_EventScript_22E302 - msgbox PetalburgWoods_Text_22E889, MSGBOX_DEFAULT +PetalburgWoods_EventScript_TryRegisterJames2:: @ 822E2EF + goto_if_set FLAG_HAS_MATCH_CALL, PetalburgWoods_EventScript_RegisterJames2 + msgbox PetalburgWoods_Text_PeopleRespectYou, MSGBOX_DEFAULT release end -PetalburgWoods_EventScript_22E302:: @ 822E302 - msgbox PetalburgWoods_Text_22E914, MSGBOX_DEFAULT +PetalburgWoods_EventScript_RegisterJames2:: @ 822E302 + msgbox PetalburgWoods_Text_IWantRematch2, MSGBOX_DEFAULT register_matchcall TRAINER_JAMES_1 release end -PetalburgWoods_EventScript_22E31B:: @ 822E31B - trainerbattle_rematch TRAINER_JAMES_1, PetalburgWoods_Text_22E966, PetalburgWoods_Text_22E998 - msgbox PetalburgWoods_Text_22E9B6, MSGBOX_AUTOCLOSE +PetalburgWoods_EventScript_JamesRematch:: @ 822E31B + trainerbattle_rematch TRAINER_JAMES_1, PetalburgWoods_Text_MyPokemonHaveGrown, PetalburgWoods_Text_CantBePopularIfLose + msgbox PetalburgWoods_Text_IveBeenTrainingHard, MSGBOX_AUTOCLOSE end -PetalburgWoods_Text_22E332: @ 822E332 +PetalburgWoods_Text_NotAOneToBeFound: @ 822E332 .string "Hmmm…\n" .string "Not a one to be found…$" -PetalburgWoods_Text_22E34F: @ 822E34F +PetalburgWoods_Text_HaveYouSeenShroomish: @ 822E34F .string "Hello, have you seen any POKéMON\n" .string "called SHROOMISH around here?\p" .string "I really love that POKéMON.$" -PetalburgWoods_Text_22E3AA: @ 822E3AA +PetalburgWoods_Text_IWasGoingToAmbushYou: @ 822E3AA .string "I was going to ambush you, but you\n" .string "had to dawdle in PETALBURG WOODS\l" .string "forever, didn't you?\p" .string "I got sick of waiting, so here I am!$" -PetalburgWoods_Text_22E428: @ 822E428 +PetalburgWoods_Text_HandOverThosePapers: @ 822E428 .string "You! DEVON RESEARCHER!\p" .string "Hand over those papers!$" -PetalburgWoods_Text_22E457: @ 822E457 +PetalburgWoods_Text_YouHaveToHelpMe: @ 822E457 .string "Aiyeeeh!\p" .string "You're a POKéMON TRAINER, aren't you?\n" .string "You've got to help me, please!$" -PetalburgWoods_Text_22E4A5: @ 822E4A5 +PetalburgWoods_Text_NoOneCrossesTeamAqua: @ 822E4A5 .string "Hunh? What do you think you're doing?\n" .string "What, you're going to protect him?\p" .string "No one who crosses TEAM AQUA\n" .string "gets any mercy, not even a kid!\p" .string "Come on and battle me!$" -PetalburgWoods_Text_22E542: @ 822E542 +PetalburgWoods_Text_YoureKiddingMe: @ 822E542 .string "You're kidding me! You're tough!$" -PetalburgWoods_Text_22E563: @ 822E563 +PetalburgWoods_Text_YouveGotSomeNerve: @ 822E563 .string "Grrr… You've got some nerve\n" .string "meddling with TEAM AQUA!\l" .string "Come on and battle me again!\p" @@ -363,7 +363,7 @@ PetalburgWoods_Text_22E563: @ 822E563 .string "after something in RUSTBORO.\p" .string "I'll let you go today!$" -PetalburgWoods_Text_22E63D: @ 822E63D +PetalburgWoods_Text_ThatWasAwfullyClose: @ 822E63D .string "Whew…\n" .string "That was awfully close!\p" .string "Thanks to you, he didn't rob me of\n" @@ -371,85 +371,85 @@ PetalburgWoods_Text_22E63D: @ 822E63D .string "I know, I'll give you a GREAT BALL as\n" .string "my thanks!$" -PetalburgWoods_Text_22E6C7: @ 822E6C7 +PetalburgWoods_Text_TeamAquaAfterSomethingInRustboro: @ 822E6C7 .string "Didn't that TEAM AQUA thug say\n" .string "they were after something in\l" .string "RUSTBORO, too?$" -PetalburgWoods_Text_22E712: @ 822E712 +PetalburgWoods_Text_ICantBeWastingTime: @ 822E712 .string "Uh-oh! It's a crisis!\n" .string "I can't be wasting time!$" -PetalburgWoods_Text_22E741: @ 822E741 +PetalburgWoods_Text_YoureLoadedWithItems: @ 822E741 .string "You're loaded with items.\n" .string "I can't give you this GREAT BALL.$" -PetalburgWoods_Text_22E77D: @ 822E77D +PetalburgWoods_Text_GoBugPokemonTeam: @ 822E77D .string "I caught a whole bunch of POKéMON!\p" .string "Go, go, go!\n" .string "My BUG POKéMON team!$" -PetalburgWoods_Text_22E7C1: @ 822E7C1 +PetalburgWoods_Text_ICouldntWin: @ 822E7C1 .string "I have all these POKéMON,\n" .string "but I couldn't win…$" -PetalburgWoods_Text_22E7EF: @ 822E7EF +PetalburgWoods_Text_ImOutOfPokeBalls: @ 822E7EF .string "I caught a bunch of POKéMON.\n" .string "Now I'm out of POKé BALLS.$" -PetalburgWoods_Text_22E827: @ 822E827 +PetalburgWoods_Text_InstantlyPopularWithBugPokemon: @ 822E827 .string "If you take BUG POKéMON to school,\n" .string "you get to be instantly popular!$" -PetalburgWoods_Text_22E86B: @ 822E86B +PetalburgWoods_Text_CantBePopularIfILose: @ 822E86B .string "I can't be popular if I lose.$" -PetalburgWoods_Text_22E889: @ 822E889 +PetalburgWoods_Text_PeopleRespectYou: @ 822E889 .string "If you have a big BUG POKéMON,\n" .string "people respect you for it.$" -PetalburgWoods_Text_22E8C3: @ 822E8C3 +PetalburgWoods_Text_IWantRematch1: @ 822E8C3 .string "I want a rematch when my BUG\n" .string "POKéMON grow up!\p" .string "I'm registering you in my POKéNAV!$" -PetalburgWoods_Text_22E914: @ 822E914 +PetalburgWoods_Text_IWantRematch2: @ 822E914 .string "I want a rematch when my BUG \n" .string "POKéMON grow up!\p" .string "I'm registering you in my POKéNAV!$" -PetalburgWoods_Text_22E966: @ 822E966 +PetalburgWoods_Text_MyPokemonHaveGrown: @ 822E966 .string "My BUG POKéMON have grown.\n" .string "I'll be popular again.$" -PetalburgWoods_Text_22E998: @ 822E998 +PetalburgWoods_Text_CantBePopularIfLose: @ 822E998 .string "I can't be popular if I lose.$" -PetalburgWoods_Text_22E9B6: @ 822E9B6 +PetalburgWoods_Text_IveBeenTrainingHard: @ 822E9B6 .string "You get to be popular if you have\n" .string "strong POKéMON, right?\l" .string "So, I've been training hard.$" -PetalburgWoods_Text_22EA0C: @ 822EA0C +PetalburgWoods_Text_StayOutOfTallGrass: @ 822EA0C .string "Yo, there!\n" .string "Your POKéMON doing okay?\p" .string "If your POKéMON are weak and you want\n" .string "to avoid battles, you should stay out\l" .string "of tall grass.$" -PetalburgWoods_Text_22EA8B: @ 822EA8B +PetalburgWoods_Text_HiddenItemsExplanation: @ 822EA8B .string "Sometimes, there are things on the\n" .string "ground even if you can't see them.\p" .string "That's why I always check where I'm\n" .string "walking.$" -PetalburgWoods_Text_22EAFE: @ 822EAFE +PetalburgWoods_Text_TryUsingThisItem: @ 822EAFE .string "Oh, neat!\n" .string "That's the BADGE from RUSTBORO GYM!\p" .string "You must be a TRAINER.\n" .string "You should try using this item.$" -PetalburgWoods_Text_22EB63: @ 822EB63 +PetalburgWoods_Text_MiracleSeedExplanation: @ 822EB63 .string "It's a MIRACLE SEED.\n" .string "If a POKéMON holds that item, its\l" .string "GRASS-type moves become stronger.\p" @@ -457,7 +457,7 @@ PetalburgWoods_Text_22EB63: @ 822EB63 .string "other convenient items for POKéMON\l" .string "to hold.$" -PetalburgWoods_Text_22EC10: @ 822EC10 +PetalburgWoods_Text_TrainerTipsExperience: @ 822EC10 .string "TRAINER TIPS\p" .string "Any POKéMON that appears even once\n" .string "in a battle is awarded EXP Points.\p" @@ -467,7 +467,7 @@ PetalburgWoods_Text_22EC10: @ 822EC10 .string "out. It will earn EXP Points without\l" .string "being exposed to any harm.$" -PetalburgWoods_Text_22ED07: @ 822ED07 +PetalburgWoods_Text_TrainerTipsPP: @ 822ED07 .string "TRAINER TIPS\p" .string "In addition to Hit Points (HP), POKéMON\n" .string "have Power Points (PP) that are used to\l" diff --git a/data/maps/Route101/map.json b/data/maps/Route101/map.json index 7e8cfb959..71dbf96cc 100644 --- a/data/maps/Route101/map.json +++ b/data/maps/Route101/map.json @@ -35,7 +35,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route101_EventScript_1EBDFB", + "script": "Route101_EventScript_Youngster", "flag": "0" }, { @@ -61,7 +61,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route101_EventScript_1EBE16", + "script": "Route101_EventScript_BirchsBag", "flag": "FLAG_HIDE_ROUTE_101_BIRCH_STARTERS_BAG" }, { @@ -100,7 +100,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route101_EventScript_1EBE04", + "script": "Route101_EventScript_Boy", "flag": "FLAG_HIDE_ROUTE_101_BOY" } ], @@ -113,7 +113,7 @@ "elevation": 3, "var": "VAR_ROUTE101_STATE", "var_value": "1", - "script": "Route101_EventScript_1EBCDE" + "script": "Route101_EventScript_StartBirchRescue" }, { "type": "trigger", @@ -122,7 +122,7 @@ "elevation": 3, "var": "VAR_ROUTE101_STATE", "var_value": "1", - "script": "Route101_EventScript_1EBCDE" + "script": "Route101_EventScript_StartBirchRescue" }, { "type": "trigger", @@ -131,7 +131,7 @@ "elevation": 3, "var": "VAR_ROUTE101_STATE", "var_value": "2", - "script": "Route101_EventScript_1EBD4E" + "script": "Route101_EventScript_PreventExitSouth" }, { "type": "trigger", @@ -140,7 +140,7 @@ "elevation": 3, "var": "VAR_ROUTE101_STATE", "var_value": "2", - "script": "Route101_EventScript_1EBD4E" + "script": "Route101_EventScript_PreventExitSouth" }, { "type": "trigger", @@ -149,7 +149,7 @@ "elevation": 3, "var": "VAR_ROUTE101_STATE", "var_value": "2", - "script": "Route101_EventScript_1EBD64" + "script": "Route101_EventScript_PreventExitWest" }, { "type": "trigger", @@ -158,7 +158,7 @@ "elevation": 3, "var": "VAR_ROUTE101_STATE", "var_value": "2", - "script": "Route101_EventScript_1EBD64" + "script": "Route101_EventScript_PreventExitWest" }, { "type": "trigger", @@ -167,7 +167,7 @@ "elevation": 3, "var": "VAR_ROUTE101_STATE", "var_value": "2", - "script": "Route101_EventScript_1EBD64" + "script": "Route101_EventScript_PreventExitWest" }, { "type": "trigger", @@ -176,7 +176,7 @@ "elevation": 3, "var": "VAR_ROUTE101_STATE", "var_value": "2", - "script": "Route101_EventScript_1EBD64" + "script": "Route101_EventScript_PreventExitWest" }, { "type": "trigger", @@ -185,7 +185,7 @@ "elevation": 3, "var": "VAR_ROUTE101_STATE", "var_value": "2", - "script": "Route101_EventScript_1EBD7A" + "script": "Route101_EventScript_PreventExitNorth" } ], "bg_events": [ @@ -195,7 +195,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route101_EventScript_1EBE0D" + "script": "Route101_EventScript_RouteSign" } ] }
\ No newline at end of file diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc index 3b5b22b37..de28aa251 100644 --- a/data/maps/Route101/scripts.inc +++ b/data/maps/Route101/scripts.inc @@ -8,79 +8,79 @@ Route101_OnTransition: @ 81EBCC5 end Route101_MapScript2_1EBCCB: @ 81EBCCB - map_script_2 VAR_ROUTE101_STATE, 0, Route101_EventScript_1EBCD5 + map_script_2 VAR_ROUTE101_STATE, 0, Route101_EventScript_HideMapNamePopup .2byte 0 -Route101_EventScript_1EBCD5:: @ 81EBCD5 +Route101_EventScript_HideMapNamePopup:: @ 81EBCD5 setflag FLAG_HIDE_MAP_NAME_POPUP setvar VAR_ROUTE101_STATE, 1 end -Route101_EventScript_1EBCDE:: @ 81EBCDE +Route101_EventScript_StartBirchRescue:: @ 81EBCDE lockall playbgm MUS_EVENT0, 1 - msgbox Route101_Text_1EBE8F, MSGBOX_DEFAULT + msgbox Route101_Text_HelpMe, MSGBOX_DEFAULT closemessage setobjectxy 2, 0, 15 setobjectxy 4, 0, 16 - applymovement EVENT_OBJ_ID_PLAYER, Route101_Movement_1EBDC2 - applymovement 2, Route101_Movement_1EBDE7 - applymovement 4, Route101_Movement_1EBDB5 + applymovement EVENT_OBJ_ID_PLAYER, Route101_Movement_EnterScene + applymovement 2, Route101_Movement_BirchRunAway1 + applymovement 4, Route101_Movement_PoochyenaChase1 waitmovement 0 - applymovement 4, Route101_Movement_1EBD96 - applymovement 2, Route101_Movement_1EBDC8 + applymovement 4, Route101_Movement_PoochyenaChaseInCircles + applymovement 2, Route101_Movement_BirchRunInCircles waitmovement 0 applymovement 2, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - applymovement 4, Route101_Movement_1EBDBD - applymovement 2, Route101_Movement_1EBDEF + applymovement 4, Route101_Movement_PoochyenaFaceBirch + applymovement 2, Route101_Movement_BirchFacePoochyena waitmovement 0 - msgbox Route101_Text_1EBE9A, MSGBOX_DEFAULT + msgbox Route101_Text_PleaseHelp, MSGBOX_DEFAULT closemessage setvar VAR_ROUTE101_STATE, 2 releaseall end -Route101_EventScript_1EBD4E:: @ 81EBD4E +Route101_EventScript_PreventExitSouth:: @ 81EBD4E lockall - msgbox Route101_Text_1EBEDF, MSGBOX_DEFAULT + msgbox Route101_Text_DontLeaveMe, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, Route101_Movement_1EBD90 + applymovement EVENT_OBJ_ID_PLAYER, Route101_Movement_PreventExitSouth waitmovement 0 releaseall end -Route101_EventScript_1EBD64:: @ 81EBD64 +Route101_EventScript_PreventExitWest:: @ 81EBD64 lockall - msgbox Route101_Text_1EBEDF, MSGBOX_DEFAULT + msgbox Route101_Text_DontLeaveMe, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, Route101_Movement_1EBD92 + applymovement EVENT_OBJ_ID_PLAYER, Route101_Movement_PreventExitWest waitmovement 0 releaseall end -Route101_EventScript_1EBD7A:: @ 81EBD7A +Route101_EventScript_PreventExitNorth:: @ 81EBD7A lockall - msgbox Route101_Text_1EBEDF, MSGBOX_DEFAULT + msgbox Route101_Text_DontLeaveMe, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, Route101_Movement_1EBD94 + applymovement EVENT_OBJ_ID_PLAYER, Route101_Movement_PreventExitNorth waitmovement 0 releaseall end -Route101_Movement_1EBD90: @ 81EBD90 +Route101_Movement_PreventExitSouth: @ 81EBD90 walk_up step_end -Route101_Movement_1EBD92: @ 81EBD92 +Route101_Movement_PreventExitWest: @ 81EBD92 walk_right step_end -Route101_Movement_1EBD94: @ 81EBD94 +Route101_Movement_PreventExitNorth: @ 81EBD94 walk_down step_end -Route101_Movement_1EBD96: @ 81EBD96 +Route101_Movement_PoochyenaChaseInCircles: @ 81EBD96 walk_fast_up walk_fast_up walk_fast_up @@ -113,7 +113,7 @@ Route101_Movement_1EBD96: @ 81EBD96 walk_fast_left step_end -Route101_Movement_1EBDB5: @ 81EBDB5 +Route101_Movement_PoochyenaChase1: @ 81EBDB5 walk_fast_up walk_fast_right walk_fast_right @@ -122,17 +122,17 @@ Route101_Movement_1EBDB5: @ 81EBDB5 walk_fast_up step_end -Route101_Movement_1EBDBC: @ 81EBDBC +@ Leftover data? This command is unused. step_end -Route101_Movement_1EBDBD: @ 81EBDBD +Route101_Movement_PoochyenaFaceBirch: @ 81EBDBD walk_in_place_fast_left walk_in_place_fast_left walk_in_place_fast_left walk_in_place_fast_left step_end -Route101_Movement_1EBDC2: @ 81EBDC2 +Route101_Movement_EnterScene: @ 81EBDC2 walk_fast_up walk_fast_up walk_fast_up @@ -140,7 +140,7 @@ Route101_Movement_1EBDC2: @ 81EBDC2 walk_in_place_fastest_left step_end -Route101_Movement_1EBDC8: @ 81EBDC8 +Route101_Movement_BirchRunInCircles: @ 81EBDC8 walk_fast_up walk_fast_up walk_fast_right @@ -173,7 +173,7 @@ Route101_Movement_1EBDC8: @ 81EBDC8 walk_fast_left step_end -Route101_Movement_1EBDE7: @ 81EBDE7 +Route101_Movement_BirchRunAway1: @ 81EBDE7 walk_fast_right walk_fast_right walk_fast_right @@ -182,40 +182,40 @@ Route101_Movement_1EBDE7: @ 81EBDE7 walk_fast_up step_end -Route101_Movement_1EBDEE: @ 81EBDEE +@ Leftover data? This command is unused. step_end -Route101_Movement_1EBDEF: @ 81EBDEF +Route101_Movement_BirchFacePoochyena: @ 81EBDEF walk_in_place_fast_right walk_in_place_fast_right walk_in_place_fast_right walk_in_place_fast_right step_end -Route101_Movement_1EBDF4: @ 81EBDF4 +Route101_Movement_Unused1: @ 81EBDF4 walk_up walk_up step_end -Route101_Movement_1EBDF7: @ 81EBDF7 +Route101_Movement_Unused2: @ 81EBDF7 walk_up walk_left walk_up step_end -Route101_EventScript_1EBDFB:: @ 81EBDFB - msgbox Route101_Text_1EBFDD, MSGBOX_NPC +Route101_EventScript_Youngster:: @ 81EBDFB + msgbox Route101_Text_TakeTiredPokemonToPokeCenter, MSGBOX_NPC end -Route101_EventScript_1EBE04:: @ 81EBE04 - msgbox Route101_Text_1EC04A, MSGBOX_NPC +Route101_EventScript_Boy:: @ 81EBE04 + msgbox Route101_Text_WildPokemonInTallGrass, MSGBOX_NPC end -Route101_EventScript_1EBE0D:: @ 81EBE0D - msgbox Route101_Text_1EC0C8, MSGBOX_SIGN +Route101_EventScript_RouteSign:: @ 81EBE0D + msgbox Route101_Text_RouteSign, MSGBOX_SIGN end -Route101_EventScript_1EBE16:: @ 81EBE16 +Route101_EventScript_BirchsBag:: @ 81EBE16 lock faceplayer setflag FLAG_SYS_POKEMON_GET @@ -227,9 +227,9 @@ Route101_EventScript_1EBE16:: @ 81EBE16 waitmovement 0 special ChooseStarter waitstate - applymovement 2, Route101_Movement_1EBE8D + applymovement 2, Route101_Movement_BirchApproachPlayer waitmovement 0 - msgbox Route101_Text_1EBF12, MSGBOX_DEFAULT + msgbox Route101_Text_YouSavedMe, MSGBOX_DEFAULT special HealPlayerParty setflag FLAG_HIDE_ROUTE_101_BIRCH_ZIGZAGOON_BATTLE clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH @@ -239,40 +239,40 @@ Route101_EventScript_1EBE16:: @ 81EBE16 clearflag FLAG_HIDE_MAP_NAME_POPUP checkplayergender compare VAR_RESULT, MALE - call_if_eq Route101_EventScript_1EBE85 + call_if_eq Route101_EventScript_HideMayInBedroom compare VAR_RESULT, FEMALE - call_if_eq Route101_EventScript_1EBE89 + call_if_eq Route101_EventScript_HideBrendanInBedroom warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5 waitstate release end -Route101_EventScript_1EBE85:: @ 81EBE85 +Route101_EventScript_HideMayInBedroom:: @ 81EBE85 setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM return -Route101_EventScript_1EBE89:: @ 81EBE89 +Route101_EventScript_HideBrendanInBedroom:: @ 81EBE89 setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM return -Route101_Movement_1EBE8D: @ 81EBE8D +Route101_Movement_BirchApproachPlayer: @ 81EBE8D walk_right step_end -Route101_Text_1EBE8F: @ 81EBE8F +Route101_Text_HelpMe: @ 81EBE8F .string "H-help me!$" -Route101_Text_1EBE9A: @ 81EBE9A +Route101_Text_PleaseHelp: @ 81EBE9A .string "Hello! You over there!\n" .string "Please! Help!\p" .string "In my BAG!\n" .string "There's a POKé BALL!$" -Route101_Text_1EBEDF: @ 81EBEDF +Route101_Text_DontLeaveMe: @ 81EBEDF .string "Wh-Where are you going?!\n" .string "Don't leave me like this!$" -Route101_Text_1EBF12: @ 81EBF12 +Route101_Text_YouSavedMe: @ 81EBF12 .string "PROF. BIRCH: Whew…\p" .string "I was in the tall grass studying wild\n" .string "POKéMON when I was jumped.\p" @@ -283,19 +283,19 @@ Route101_Text_1EBF12: @ 81EBF12 .string "This is not the place to chat, so come\n" .string "by my POKéMON LAB later, okay?$" -Route101_Text_1EBFDD: @ 81EBFDD +Route101_Text_TakeTiredPokemonToPokeCenter: @ 81EBFDD .string "If POKéMON get tired, take them to\n" .string "a POKéMON CENTER.\p" .string "There's a POKéMON CENTER in OLDALE\n" .string "TOWN right close by.$" -Route101_Text_1EC04A: @ 81EC04A +Route101_Text_WildPokemonInTallGrass: @ 81EC04A .string "Wild POKéMON will jump out at you in\n" .string "tall grass.\p" .string "If you want to catch POKéMON, you have\n" .string "to go into the tall grass and search.$" -Route101_Text_1EC0C8: @ 81EC0C8 +Route101_Text_RouteSign: @ 81EC0C8 .string "ROUTE 101\n" .string "{UP_ARROW} OLDALE TOWN$" diff --git a/data/maps/Route102/map.json b/data/maps/Route102/map.json index 323c4142b..f8930a21d 100644 --- a/data/maps/Route102/map.json +++ b/data/maps/Route102/map.json @@ -35,7 +35,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route102_EventScript_1EC0E1", + "script": "Route102_EventScript_LittleBoy", "flag": "0" }, { @@ -48,7 +48,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route102_EventScript_1EC105", + "script": "Route102_EventScript_Calvin", "flag": "0" }, { @@ -61,7 +61,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route102_EventScript_1EC1B3", + "script": "Route102_EventScript_Rick", "flag": "0" }, { @@ -74,7 +74,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route102_EventScript_1EC1CA", + "script": "Route102_EventScript_Tiana", "flag": "0" }, { @@ -87,7 +87,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route102_EventScript_1EC0FC", + "script": "Route102_EventScript_Boy", "flag": "0" }, { @@ -139,7 +139,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route102_EventScript_1EC1E1", + "script": "Route102_EventScript_Allen", "flag": "0" } ], @@ -152,7 +152,7 @@ "y": 2, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route102_EventScript_1EC0F3" + "script": "Route102_EventScript_RouteSignPetalburg" }, { "type": "sign", @@ -160,7 +160,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route102_EventScript_1EC0EA" + "script": "Route102_EventScript_RouteSignOldale" } ] }
\ No newline at end of file diff --git a/data/maps/Route102/scripts.inc b/data/maps/Route102/scripts.inc index 58adf4456..3c79e8c61 100644 --- a/data/maps/Route102/scripts.inc +++ b/data/maps/Route102/scripts.inc @@ -1,81 +1,81 @@ Route102_MapScripts:: @ 81EC0E0 .byte 0 -Route102_EventScript_1EC0E1:: @ 81EC0E1 - msgbox Route102_Text_1EC2C0, MSGBOX_NPC +Route102_EventScript_LittleBoy:: @ 81EC0E1 + msgbox Route102_Text_ImNotVeryTall, MSGBOX_NPC end -Route102_EventScript_1EC0EA:: @ 81EC0EA - msgbox Route102_Text_1EC35B, MSGBOX_SIGN +Route102_EventScript_RouteSignOldale:: @ 81EC0EA + msgbox Route102_Text_RouteSignOldale, MSGBOX_SIGN end -Route102_EventScript_1EC0F3:: @ 81EC0F3 - msgbox Route102_Text_1EC373, MSGBOX_SIGN +Route102_EventScript_RouteSignPetalburg:: @ 81EC0F3 + msgbox Route102_Text_RouteSignPetalburg, MSGBOX_SIGN end -Route102_EventScript_1EC0FC:: @ 81EC0FC - msgbox Route102_Text_1EC32E, MSGBOX_NPC +Route102_EventScript_Boy:: @ 81EC0FC + msgbox Route102_Text_CatchWholeBunchOfPokemon, MSGBOX_NPC end -Route102_EventScript_1EC105:: @ 81EC105 - trainerbattle_single TRAINER_CALVIN_1, Route102_Text_294513, Route102_Text_29457C, Route102_EventScript_1EC146 +Route102_EventScript_Calvin:: @ 81EC105 + trainerbattle_single TRAINER_CALVIN_1, Route102_Text_CalvinIntro, Route102_Text_CalvinDefeated, Route102_EventScript_CalvinRegisterMatchCallAfterBattle specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route102_EventScript_1EC19C + compare VAR_RESULT, TRUE + goto_if_eq Route102_EventScript_CalvinRematch setvar VAR_0x8004, TRAINER_CALVIN_1 specialvar VAR_RESULT, IsTrainerRegistered - compare VAR_RESULT, 0 - goto_if_eq Route102_EventScript_1EC170 - msgbox Route102_Text_2945AC, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + goto_if_eq Route102_EventScript_CalvinTryRegister + msgbox Route102_Text_CalvinPostBattle, MSGBOX_DEFAULT release end -Route102_EventScript_1EC146:: @ 81EC146 +Route102_EventScript_CalvinRegisterMatchCallAfterBattle:: @ 81EC146 special sub_80B4808 waitmovement 0 - goto_if_set FLAG_HAS_MATCH_CALL, Route102_EventScript_1EC157 + goto_if_set FLAG_HAS_MATCH_CALL, Route102_EventScript_CalvinRegisterMatchCall release end -Route102_EventScript_1EC157:: @ 81EC157 - msgbox Route102_Text_294668, MSGBOX_DEFAULT +Route102_EventScript_CalvinRegisterMatchCall:: @ 81EC157 + msgbox Route102_Text_CalvinRegisterShort, MSGBOX_DEFAULT register_matchcall TRAINER_CALVIN_1 release end -Route102_EventScript_1EC170:: @ 81EC170 - goto_if_set FLAG_HAS_MATCH_CALL, Route102_EventScript_1EC183 - msgbox Route102_Text_2945AC, MSGBOX_DEFAULT +Route102_EventScript_CalvinTryRegister:: @ 81EC170 + goto_if_set FLAG_HAS_MATCH_CALL, Route102_EventScript_CalvinRegister + msgbox Route102_Text_CalvinPostBattle, MSGBOX_DEFAULT release end -Route102_EventScript_1EC183:: @ 81EC183 - msgbox Route102_Text_2945EB, MSGBOX_DEFAULT +Route102_EventScript_CalvinRegister:: @ 81EC183 + msgbox Route102_Text_CalvinRegister, MSGBOX_DEFAULT register_matchcall TRAINER_CALVIN_1 release end -Route102_EventScript_1EC19C:: @ 81EC19C - trainerbattle_rematch TRAINER_CALVIN_1, Route102_Text_2946AE, Route102_Text_29470C - msgbox Route102_Text_29473C, MSGBOX_AUTOCLOSE +Route102_EventScript_CalvinRematch:: @ 81EC19C + trainerbattle_rematch TRAINER_CALVIN_1, Route102_Text_CalvinRematchIntro, Route102_Text_CalvinRematchDefeated + msgbox Route102_Text_CalvinRematchPostBattle, MSGBOX_AUTOCLOSE end -Route102_EventScript_1EC1B3:: @ 81EC1B3 - trainerbattle_single TRAINER_RICK, Route102_Text_29480C, Route102_Text_294847 - msgbox Route102_Text_294859, MSGBOX_AUTOCLOSE +Route102_EventScript_Rick:: @ 81EC1B3 + trainerbattle_single TRAINER_RICK, Route102_Text_RickIntro, Route102_Text_RickDefeated + msgbox Route102_Text_RickPostBattle, MSGBOX_AUTOCLOSE end -Route102_EventScript_1EC1CA:: @ 81EC1CA - trainerbattle_single TRAINER_TIANA, Route102_Text_29489E, Route102_Text_2948F3 - msgbox Route102_Text_294916, MSGBOX_AUTOCLOSE +Route102_EventScript_Tiana:: @ 81EC1CA + trainerbattle_single TRAINER_TIANA, Route102_Text_TianaIntro, Route102_Text_TianaDefeated + msgbox Route102_Text_TianaPostBattle, MSGBOX_AUTOCLOSE end -Route102_EventScript_1EC1E1:: @ 81EC1E1 - trainerbattle_single TRAINER_ALLEN, Route102_Text_294775, Route102_Text_2947AA - msgbox Route102_Text_2947DB, MSGBOX_AUTOCLOSE +Route102_EventScript_Allen:: @ 81EC1E1 + trainerbattle_single TRAINER_ALLEN, Route102_Text_AllenIntro, Route102_Text_AllenDefeated + msgbox Route102_Text_AllenPostBattle, MSGBOX_AUTOCLOSE end -PetalburgCity_Text_1EC1F8: @ 81EC1F8 +Route102_Text_WatchMeCatchPokemon: @ 81EC1F8 .string "WALLY: {PLAYER}…\n" .string "POKéMON hide in tall grass like this,\l" .string "don't they?\p" @@ -83,29 +83,29 @@ PetalburgCity_Text_1EC1F8: @ 81EC1F8 .string "catch one properly.\p" .string "…Whoa!$" -PetalburgCity_Text_1EC271: @ 81EC271 +Route102_Text_WallyIDidIt: @ 81EC271 .string "WALLY: I did it… It's my…\n" .string "My POKéMON!$" -PetalburgCity_Text_1EC297: @ 81EC297 +Route102_Text_LetsGoBack: @ 81EC297 .string "{PLAYER}, thank you!\n" .string "Let's go back to the GYM!$" -Route102_Text_1EC2C0: @ 81EC2C0 +Route102_Text_ImNotVeryTall: @ 81EC2C0 .string "I'm…not very tall, so I sink right\n" .string "into tall grass.\p" .string "The grass goes up my nose and…\n" .string "Fwafwafwafwafwa…\p" .string "Fwatchoo!$" -Route102_Text_1EC32E: @ 81EC32E +Route102_Text_CatchWholeBunchOfPokemon: @ 81EC32E .string "I'm going to catch a whole bunch of\n" .string "POKéMON!$" -Route102_Text_1EC35B: @ 81EC35B +Route102_Text_RouteSignOldale: @ 81EC35B .string "ROUTE 102\n" .string "{RIGHT_ARROW} OLDALE TOWN$" -Route102_Text_1EC373: @ 81EC373 +Route102_Text_RouteSignPetalburg: @ 81EC373 .string "ROUTE 102\n" .string "{LEFT_ARROW} PETALBURG CITY$" diff --git a/data/maps/Route103/map.json b/data/maps/Route103/map.json index 8f5b9f2b3..0a870a06e 100644 --- a/data/maps/Route103/map.json +++ b/data/maps/Route103/map.json @@ -35,7 +35,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route103_EventScript_1EC5E2", + "script": "Route103_EventScript_Man", "flag": "0" }, { @@ -48,7 +48,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route103_EventScript_1EC3C1", + "script": "Route103_EventScript_Rival", "flag": "FLAG_HIDE_ROUTE_103_RIVAL" }, { @@ -61,7 +61,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route103_EventScript_1EC5F4", + "script": "Route103_EventScript_Daisy", "flag": "0" }, { @@ -74,7 +74,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route103_EventScript_1EC66E", + "script": "Route103_EventScript_Liv", "flag": "0" }, { @@ -87,7 +87,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route103_EventScript_1EC60B", + "script": "Route103_EventScript_Amy", "flag": "0" }, { @@ -100,7 +100,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route103_EventScript_1EC6D1", + "script": "Route103_EventScript_Andrew", "flag": "0" }, { @@ -152,7 +152,7 @@ "movement_range_y": 2, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route103_EventScript_1EC5D9", + "script": "Route103_EventScript_Boy", "flag": "0" }, { @@ -178,7 +178,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "5", - "script": "Route103_EventScript_1EC6E8", + "script": "Route103_EventScript_Miguel", "flag": "0" }, { @@ -230,7 +230,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route103_EventScript_1EC761", + "script": "Route103_EventScript_Rhett", "flag": "0" }, { @@ -243,7 +243,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route103_EventScript_1EC74A", + "script": "Route103_EventScript_Marcos", "flag": "0" }, { @@ -256,7 +256,7 @@ "movement_range_y": 3, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "5", - "script": "Route103_EventScript_1EC78F", + "script": "Route103_EventScript_Isabelle", "flag": "0" }, { @@ -269,7 +269,7 @@ "movement_range_y": 3, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "5", - "script": "Route103_EventScript_1EC778", + "script": "Route103_EventScript_Pete", "flag": "0" }, { @@ -303,7 +303,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route103_EventScript_1EC5EB" + "script": "Route103_EventScript_RouteSign" } ] }
\ No newline at end of file diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc index 9a185aa14..b54ede043 100644 --- a/data/maps/Route103/scripts.inc +++ b/data/maps/Route103/scripts.inc @@ -1,6 +1,6 @@ Route103_MapScripts:: @ 81EC38E map_script MAP_SCRIPT_ON_TRANSITION, Route103_OnTransition - map_script MAP_SCRIPT_ON_LOAD, Route103_MapScript1_1EC3A4 + map_script MAP_SCRIPT_ON_LOAD, Route103_OnLoad .byte 0 Route103_OnTransition: @ 81EC399 @@ -8,26 +8,26 @@ Route103_OnTransition: @ 81EC399 call ProfBirch_EventScript_UpdateLocation end -Route103_MapScript1_1EC3A4: @ 81EC3A4 - call_if_set FLAG_SYS_GAME_CLEAR, Route103_EventScript_1EC3AE +Route103_OnLoad: @ 81EC3A4 + call_if_set FLAG_SYS_GAME_CLEAR, Route103_EventScript_OpenAlteringCave end -Route103_EventScript_1EC3AE:: @ 81EC3AE +Route103_EventScript_OpenAlteringCave:: @ 81EC3AE setmetatile 45, 5, METATILE_General_CaveEntrance_Top, 1 setmetatile 45, 6, METATILE_General_CaveEntrance_Bottom, 0 return -Route103_EventScript_1EC3C1:: @ 81EC3C1 +Route103_EventScript_Rival:: @ 81EC3C1 lockall checkplayergender compare VAR_RESULT, MALE - goto_if_eq Route103_EventScript_1EC3DA + goto_if_eq Route103_EventScript_RivalMay compare VAR_RESULT, FEMALE - goto_if_eq Route103_EventScript_1EC434 + goto_if_eq Route103_EventScript_RivalBrendan end -Route103_EventScript_1EC3DA:: @ 81EC3DA - msgbox Route103_Text_1EC7A6, MSGBOX_DEFAULT +Route103_EventScript_RivalMay:: @ 81EC3DA + msgbox Route103_Text_MayRoute103Pokemon, MSGBOX_DEFAULT closemessage playbgm MUS_GIRL_SUP, 1 applymovement 2, Common_Movement_FacePlayer @@ -36,15 +36,15 @@ Route103_EventScript_1EC3DA:: @ 81EC3DA waitmovement 0 applymovement 2, Common_Movement_Delay48 waitmovement 0 - msgbox Route103_Text_1EC7DE, MSGBOX_DEFAULT + msgbox Route103_Text_MayLetsBattle, MSGBOX_DEFAULT switch VAR_STARTER_MON - case 0, Route103_EventScript_1EC48E - case 1, Route103_EventScript_1EC49E - case 2, Route103_EventScript_1EC4AE + case 0, Route103_EventScript_StartMayBattleTreecko + case 1, Route103_EventScript_StartMayBattleTorchic + case 2, Route103_EventScript_StartMayBattleMudkip end -Route103_EventScript_1EC434:: @ 81EC434 - msgbox Route103_Text_1EC989, MSGBOX_DEFAULT +Route103_EventScript_RivalBrendan:: @ 81EC434 + msgbox Route103_Text_BrendanRoute103Pokemon, MSGBOX_DEFAULT closemessage playbgm MUS_BOY_SUP, 1 applymovement 2, Common_Movement_FacePlayer @@ -53,92 +53,92 @@ Route103_EventScript_1EC434:: @ 81EC434 waitmovement 0 applymovement 2, Common_Movement_Delay48 waitmovement 0 - msgbox Route103_Text_1EC9CE, MSGBOX_DEFAULT + msgbox Route103_Text_BrendanLetsBattle, MSGBOX_DEFAULT switch VAR_STARTER_MON - case 0, Route103_EventScript_1EC4BE - case 1, Route103_EventScript_1EC4CE - case 2, Route103_EventScript_1EC4DE + case 0, Route103_EventScript_StartBrendanBattleTreecko + case 1, Route103_EventScript_StartBrendanBattleTorchic + case 2, Route103_EventScript_StartBrendanBattleMudkip end -Route103_EventScript_1EC48E:: @ 81EC48E - trainerbattle_no_intro TRAINER_MAY_4, Route103_Text_1EC881 - goto Route103_EventScript_1EC4EE +Route103_EventScript_StartMayBattleTreecko:: @ 81EC48E + trainerbattle_no_intro TRAINER_MAY_4, Route103_Text_MayDefeated + goto Route103_EventScript_AfterMayBattle end -Route103_EventScript_1EC49E:: @ 81EC49E - trainerbattle_no_intro TRAINER_MAY_7, Route103_Text_1EC881 - goto Route103_EventScript_1EC4EE +Route103_EventScript_StartMayBattleTorchic:: @ 81EC49E + trainerbattle_no_intro TRAINER_MAY_7, Route103_Text_MayDefeated + goto Route103_EventScript_AfterMayBattle end -Route103_EventScript_1EC4AE:: @ 81EC4AE - trainerbattle_no_intro TRAINER_MAY_1, Route103_Text_1EC881 - goto Route103_EventScript_1EC4EE +Route103_EventScript_StartMayBattleMudkip:: @ 81EC4AE + trainerbattle_no_intro TRAINER_MAY_1, Route103_Text_MayDefeated + goto Route103_EventScript_AfterMayBattle end -Route103_EventScript_1EC4BE:: @ 81EC4BE - trainerbattle_no_intro TRAINER_BRENDAN_4, Route103_Text_1ECA59 - goto Route103_EventScript_1EC4FC +Route103_EventScript_StartBrendanBattleTreecko:: @ 81EC4BE + trainerbattle_no_intro TRAINER_BRENDAN_4, Route103_Text_BrendanDefeated + goto Route103_EventScript_AfterBrendanBattle end -Route103_EventScript_1EC4CE:: @ 81EC4CE - trainerbattle_no_intro TRAINER_BRENDAN_7, Route103_Text_1ECA59 - goto Route103_EventScript_1EC4FC +Route103_EventScript_StartBrendanBattleTorchic:: @ 81EC4CE + trainerbattle_no_intro TRAINER_BRENDAN_7, Route103_Text_BrendanDefeated + goto Route103_EventScript_AfterBrendanBattle end -Route103_EventScript_1EC4DE:: @ 81EC4DE - trainerbattle_no_intro TRAINER_BRENDAN_1, Route103_Text_1ECA59 - goto Route103_EventScript_1EC4FC +Route103_EventScript_StartBrendanBattleMudkip:: @ 81EC4DE + trainerbattle_no_intro TRAINER_BRENDAN_1, Route103_Text_BrendanDefeated + goto Route103_EventScript_AfterBrendanBattle end -Route103_EventScript_1EC4EE:: @ 81EC4EE - msgbox Route103_Text_1EC8AE, MSGBOX_DEFAULT - goto Route103_EventScript_1EC50A +Route103_EventScript_AfterMayBattle:: @ 81EC4EE + msgbox Route103_Text_MayTimeToHeadBack, MSGBOX_DEFAULT + goto Route103_EventScript_RivalExit end -Route103_EventScript_1EC4FC:: @ 81EC4FC - msgbox Route103_Text_1ECA79, MSGBOX_DEFAULT - goto Route103_EventScript_1EC50A +Route103_EventScript_AfterBrendanBattle:: @ 81EC4FC + msgbox Route103_Text_BrendanTimeToHeadBack, MSGBOX_DEFAULT + goto Route103_EventScript_RivalExit end -Route103_EventScript_1EC50A:: @ 81EC50A +Route103_EventScript_RivalExit:: @ 81EC50A closemessage switch VAR_FACING - case DIR_SOUTH, Route103_EventScript_1EC585 - case DIR_NORTH, Route103_EventScript_1EC53D - case DIR_WEST, Route103_EventScript_1EC561 - case DIR_EAST, Route103_EventScript_1EC561 + case DIR_SOUTH, Route103_EventScript_RivalExitFacingSouth + case DIR_NORTH, Route103_EventScript_RivalExitFacingNorth + case DIR_WEST, Route103_EventScript_RivalExitFacingEastOrWest + case DIR_EAST, Route103_EventScript_RivalExitFacingEastOrWest end -Route103_EventScript_1EC53D:: @ 81EC53D - applymovement EVENT_OBJ_ID_PLAYER, Route103_Movement_1EC5C8 - applymovement 2, Route103_Movement_1EC5BE +Route103_EventScript_RivalExitFacingNorth:: @ 81EC53D + applymovement EVENT_OBJ_ID_PLAYER, Route103_Movement_WatchRivalExitFacingNorth + applymovement 2, Route103_Movement_RivalExitFacingNorth1 waitmovement 0 playse SE_DANSA - applymovement 2, Route103_Movement_1EC5C1 + applymovement 2, Route103_EventScript_RivalExitFacingNorth2 waitmovement 0 - goto Route103_EventScript_1EC5A2 + goto Route103_EventScript_RivalEnd end -Route103_EventScript_1EC561:: @ 81EC561 - applymovement EVENT_OBJ_ID_PLAYER, Route103_Movement_1EC5D6 - applymovement 2, Route103_Movement_1EC5CE +Route103_EventScript_RivalExitFacingEastOrWest:: @ 81EC561 + applymovement EVENT_OBJ_ID_PLAYER, Route103_Movement_WatchRivalExitFacingEastOrWest + applymovement 2, Route103_Movement_RivalExit1 waitmovement 0 playse SE_DANSA - applymovement 2, Route103_Movement_1EC5D0 + applymovement 2, Route103_Movement_RivalExit2 waitmovement 0 - goto Route103_EventScript_1EC5A2 + goto Route103_EventScript_RivalEnd end -Route103_EventScript_1EC585:: @ 81EC585 - applymovement 2, Route103_Movement_1EC5CE +Route103_EventScript_RivalExitFacingSouth:: @ 81EC585 + applymovement 2, Route103_Movement_RivalExit1 waitmovement 0 playse SE_DANSA - applymovement 2, Route103_Movement_1EC5D0 + applymovement 2, Route103_Movement_RivalExit2 waitmovement 0 - goto Route103_EventScript_1EC5A2 + goto Route103_EventScript_RivalEnd end -Route103_EventScript_1EC5A2:: @ 81EC5A2 +Route103_EventScript_RivalEnd:: @ 81EC5A2 removeobject 2 setvar VAR_BIRCH_LAB_STATE, 4 clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL @@ -150,12 +150,12 @@ Route103_EventScript_1EC5A2:: @ 81EC5A2 releaseall end -Route103_Movement_1EC5BE: @ 81EC5BE +Route103_Movement_RivalExitFacingNorth1: @ 81EC5BE walk_left walk_down step_end -Route103_Movement_1EC5C1: @ 81EC5C1 +Route103_EventScript_RivalExitFacingNorth2: @ 81EC5C1 jump_2_down delay_16 walk_down @@ -164,7 +164,7 @@ Route103_Movement_1EC5C1: @ 81EC5C1 walk_down step_end -Route103_Movement_1EC5C8: @ 81EC5C8 +Route103_Movement_WatchRivalExitFacingNorth: @ 81EC5C8 delay_16 delay_4 walk_in_place_fastest_left @@ -172,11 +172,11 @@ Route103_Movement_1EC5C8: @ 81EC5C8 walk_in_place_fastest_down step_end -Route103_Movement_1EC5CE: @ 81EC5CE +Route103_Movement_RivalExit1: @ 81EC5CE walk_down step_end -Route103_Movement_1EC5D0: @ 81EC5D0 +Route103_Movement_RivalExit2: @ 81EC5D0 jump_2_down delay_16 walk_down @@ -184,118 +184,118 @@ Route103_Movement_1EC5D0: @ 81EC5D0 walk_down step_end -Route103_Movement_1EC5D6: @ 81EC5D6 +Route103_Movement_WatchRivalExitFacingEastOrWest: @ 81EC5D6 delay_16 walk_in_place_fastest_down step_end -Route103_EventScript_1EC5D9:: @ 81EC5D9 - msgbox Route103_Text_1ECB73, MSGBOX_NPC +Route103_EventScript_Boy:: @ 81EC5D9 + msgbox Route103_Text_ShouldHaveBroughtPotion, MSGBOX_NPC end -Route103_EventScript_1EC5E2:: @ 81EC5E2 - msgbox Route103_Text_1ECBB5, MSGBOX_NPC +Route103_EventScript_Man:: @ 81EC5E2 + msgbox Route103_Text_ShortcutToOldale, MSGBOX_NPC end -Route103_EventScript_1EC5EB:: @ 81EC5EB - msgbox Route103_Text_1ECC1A, MSGBOX_SIGN +Route103_EventScript_RouteSign:: @ 81EC5EB + msgbox Route103_Text_RouteSign, MSGBOX_SIGN end -Route103_EventScript_1EC5F4:: @ 81EC5F4 - trainerbattle_single TRAINER_DAISY, Route103_Text_29495A, Route103_Text_29498F - msgbox Route103_Text_2949B4, MSGBOX_AUTOCLOSE +Route103_EventScript_Daisy:: @ 81EC5F4 + trainerbattle_single TRAINER_DAISY, Route103_Text_DaisyIntro, Route103_Text_DaisyDefeated + msgbox Route103_Text_DaisyPostBattle, MSGBOX_AUTOCLOSE end -Route103_EventScript_1EC60B:: @ 81EC60B - trainerbattle_double TRAINER_AMY_AND_LIV_1, Route103_Text_2949F9, Route103_Text_294A3D, Route103_Text_294AAE, Route103_EventScript_1EC63A +Route103_EventScript_Amy:: @ 81EC60B + trainerbattle_double TRAINER_AMY_AND_LIV_1, Route103_Text_AmyIntro, Route103_Text_AmyDefeated, Route103_Text_AmyNotEnoughPokemon, Route102_EventScript_AmyRegisterMatchCallAfterBattle specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route103_EventScript_1EC653 - msgbox Route103_Text_294A52, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route102_EventScript_AmyRematch + msgbox Route103_Text_AmyPostBattle, MSGBOX_AUTOCLOSE end -Route103_EventScript_1EC63A:: @ 81EC63A - msgbox Route103_Text_294B8A, MSGBOX_DEFAULT +Route102_EventScript_AmyRegisterMatchCallAfterBattle:: @ 81EC63A + msgbox Route103_Text_AmyLivRegister, MSGBOX_DEFAULT register_matchcall TRAINER_AMY_AND_LIV_1 release end -Route103_EventScript_1EC653:: @ 81EC653 - trainerbattle_rematch_double TRAINER_AMY_AND_LIV_1, Route103_Text_294C29, Route103_Text_294C6D, Route103_Text_294CEF - msgbox Route103_Text_294C93, MSGBOX_AUTOCLOSE +Route102_EventScript_AmyRematch:: @ 81EC653 + trainerbattle_rematch_double TRAINER_AMY_AND_LIV_1, Route103_Text_AmyRematchIntro, Route103_Text_AmyRematchDefeated, Route103_Text_AmyRematchNotEnoughPokemon + msgbox Route103_Text_AmyRematchPostBattle, MSGBOX_AUTOCLOSE end -Route103_EventScript_1EC66E:: @ 81EC66E - trainerbattle_double TRAINER_AMY_AND_LIV_1, Route103_Text_294AFD, Route103_Text_294B22, Route103_Text_294BD0, Route103_EventScript_1EC69D +Route103_EventScript_Liv:: @ 81EC66E + trainerbattle_double TRAINER_AMY_AND_LIV_1, Route103_Text_LivIntro, Route103_Text_LivDefeated, Route103_Text_LivNotEnoughPokemon, Route102_EventScript_LivRegisterMatchCallAfterBattle specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route103_EventScript_1EC6B6 - msgbox Route103_Text_294B40, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route102_EventScript_LivRematch + msgbox Route103_Text_LivPostBattle, MSGBOX_AUTOCLOSE end -Route103_EventScript_1EC69D:: @ 81EC69D - msgbox Route103_Text_294B8A, MSGBOX_DEFAULT +Route102_EventScript_LivRegisterMatchCallAfterBattle:: @ 81EC69D + msgbox Route103_Text_AmyLivRegister, MSGBOX_DEFAULT register_matchcall TRAINER_AMY_AND_LIV_1 release end -Route103_EventScript_1EC6B6:: @ 81EC6B6 - trainerbattle_rematch_double TRAINER_AMY_AND_LIV_1, Route103_Text_294D3E, Route103_Text_294D63, Route103_Text_294DDB - msgbox Route103_Text_294D89, MSGBOX_AUTOCLOSE +Route102_EventScript_LivRematch:: @ 81EC6B6 + trainerbattle_rematch_double TRAINER_AMY_AND_LIV_1, Route103_Text_LivRematchIntro, Route103_Text_LivRematchDefeated, Route103_Text_LivRematchNotEnoughPokemon + msgbox Route103_Text_LivRematchPostBattle, MSGBOX_AUTOCLOSE end -Route103_EventScript_1EC6D1:: @ 81EC6D1 - trainerbattle_single TRAINER_ANDREW, Route103_Text_294E34, Route103_Text_294E92 - msgbox Route103_Text_294EBB, MSGBOX_AUTOCLOSE +Route103_EventScript_Andrew:: @ 81EC6D1 + trainerbattle_single TRAINER_ANDREW, Route103_Text_AndrewIntro, Route103_Text_AndrewDefeated + msgbox Route103_Text_AndrewPostBattle, MSGBOX_AUTOCLOSE end -Route103_EventScript_1EC6E8:: @ 81EC6E8 - trainerbattle_single TRAINER_MIGUEL_1, Route103_Text_294EDF, Route103_Text_294F21, Route103_EventScript_1EC714 +Route103_EventScript_Miguel:: @ 81EC6E8 + trainerbattle_single TRAINER_MIGUEL_1, Route103_Text_MiguelIntro, Route103_Text_MiguelDefeated, Route102_EventScript_MiguelRegisterMatchCallAfterBattle specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route103_EventScript_1EC733 - msgbox Route103_Text_294F42, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route103_EventScript_MiguelRematch + msgbox Route103_Text_MiguelPostBattle, MSGBOX_DEFAULT release end -Route103_EventScript_1EC714:: @ 81EC714 +Route102_EventScript_MiguelRegisterMatchCallAfterBattle:: @ 81EC714 special sub_80B4808 waitmovement 0 - msgbox Route103_Text_294F7E, MSGBOX_DEFAULT + msgbox Route103_Text_MiguelRegister, MSGBOX_DEFAULT register_matchcall TRAINER_MIGUEL_1 release end -Route103_EventScript_1EC733:: @ 81EC733 - trainerbattle_rematch TRAINER_MIGUEL_1, Route103_Text_294FC3, Route103_Text_295006 - msgbox Route103_Text_29501E, MSGBOX_AUTOCLOSE +Route103_EventScript_MiguelRematch:: @ 81EC733 + trainerbattle_rematch TRAINER_MIGUEL_1, Route103_Text_MiguelRematchIntro, Route103_Text_MiguelRematchDefeated + msgbox Route103_Text_MiguelRematchPostBattle, MSGBOX_AUTOCLOSE end -Route103_EventScript_1EC74A:: @ 81EC74A - trainerbattle_single TRAINER_MARCOS, Route103_Text_295206, Route103_Text_29522B - msgbox Route103_Text_295246, MSGBOX_AUTOCLOSE +Route103_EventScript_Marcos:: @ 81EC74A + trainerbattle_single TRAINER_MARCOS, Route103_Text_MarcosIntro, Route103_Text_MarcosDefeated + msgbox Route103_Text_MarcosPostBattle, MSGBOX_AUTOCLOSE end -Route103_EventScript_1EC761:: @ 81EC761 - trainerbattle_single TRAINER_RHETT, Route103_Text_295199, Route103_Text_2951C6 - msgbox Route103_Text_2951DE, MSGBOX_AUTOCLOSE +Route103_EventScript_Rhett:: @ 81EC761 + trainerbattle_single TRAINER_RHETT, Route103_Text_RhettIntro, Route103_Text_RhettDefeated + msgbox Route103_Text_RhettPostBattle, MSGBOX_AUTOCLOSE end -Route103_EventScript_1EC778:: @ 81EC778 - trainerbattle_single TRAINER_PETE, Route103_Text_295063, Route103_Text_295093 - msgbox Route103_Text_2950AA, MSGBOX_AUTOCLOSE +Route103_EventScript_Pete:: @ 81EC778 + trainerbattle_single TRAINER_PETE, Route103_Text_PeteIntro, Route103_Text_PeteDefeated + msgbox Route103_Text_PetePostBattle, MSGBOX_AUTOCLOSE end -Route103_EventScript_1EC78F:: @ 81EC78F - trainerbattle_single TRAINER_ISABELLE, Route103_Text_295116, Route103_Text_295146 - msgbox Route103_Text_29514D, MSGBOX_AUTOCLOSE +Route103_EventScript_Isabelle:: @ 81EC78F + trainerbattle_single TRAINER_ISABELLE, Route103_Text_IsabelleIntro, Route103_Text_IsabelleDefeated + msgbox Route103_Text_IsabellePostBattle, MSGBOX_AUTOCLOSE end -Route103_Text_1EC7A6: @ 81EC7A6 +Route103_Text_MayRoute103Pokemon: @ 81EC7A6 .string "MAY: Let's see… The POKéMON found\n" .string "on ROUTE 103 include…$" -Route103_Text_1EC7DE: @ 81EC7DE +Route103_Text_MayLetsBattle: @ 81EC7DE .string "Oh, hi, {PLAYER}{KUN}!\p" .string "…Oh, I see, my dad gave you\n" .string "a POKéMON as a gift.\p" @@ -304,11 +304,11 @@ Route103_Text_1EC7DE: @ 81EC7DE .string "I'll give you a taste of what being\n" .string "a TRAINER is like.$" -Route103_Text_1EC881: @ 81EC881 +Route103_Text_MayDefeated: @ 81EC881 .string "Wow! That's great!\n" .string "{PLAYER}{KUN}, you're pretty good!$" -Route103_Text_1EC8AE: @ 81EC8AE +Route103_Text_MayTimeToHeadBack: @ 81EC8AE .string "MAY: I think I know why my dad has\n" .string "an eye out for you now.\p" .string "I mean, you just got that POKéMON,\n" @@ -318,11 +318,11 @@ Route103_Text_1EC8AE: @ 81EC8AE .string "Well, it's time to head back to\n" .string "the LAB.$" -Route103_Text_1EC989: @ 81EC989 +Route103_Text_BrendanRoute103Pokemon: @ 81EC989 .string "BRENDAN: Okay, so it's this one and\n" .string "that one that live on ROUTE 103…$" -Route103_Text_1EC9CE: @ 81EC9CE +Route103_Text_BrendanLetsBattle: @ 81EC9CE .string "Hey, it's {PLAYER}!\p" .string "…Oh, yeah, Dad gave you a POKéMON.\p" .string "Since we're here, how about a little\n" @@ -330,10 +330,10 @@ Route103_Text_1EC9CE: @ 81EC9CE .string "I'll teach you what being a TRAINER's\n" .string "about!$" -Route103_Text_1ECA59: @ 81ECA59 +Route103_Text_BrendanDefeated: @ 81ECA59 .string "Huh, {PLAYER}, you're not too shabby.$" -Route103_Text_1ECA79: @ 81ECA79 +Route103_Text_BrendanTimeToHeadBack: @ 81ECA79 .string "BRENDAN: I think I get it.\n" .string "I think I know why my dad has his eye\l" .string "out for you now.\p" @@ -343,16 +343,16 @@ Route103_Text_1ECA79: @ 81ECA79 .string "could befriend any POKéMON with ease.\p" .string "We should head back to the LAB.$" -Route103_Text_1ECB73: @ 81ECB73 +Route103_Text_ShouldHaveBroughtPotion: @ 81ECB73 .string "My POKéMON is staggeringly tired…\n" .string "I should have brought a POTION…$" -Route103_Text_1ECBB5: @ 81ECBB5 +Route103_Text_ShortcutToOldale: @ 81ECBB5 .string "If you cross the sea from here,\n" .string "it'll be a shortcut to OLDALE TOWN.\p" .string "Fufufu, that's useful, isn't it?$" -Route103_Text_1ECC1A: @ 81ECC1A +Route103_Text_RouteSign: @ 81ECC1A .string "ROUTE 103\n" .string "{DOWN_ARROW} OLDALE TOWN$" diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index c943066f9..9c31aadb5 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -1,15 +1,15 @@ Route104_MapScripts:: @ 81ECC32 - map_script MAP_SCRIPT_ON_FRAME_TABLE, Route104_MapScript2_1ECC3D + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route104_OnFrame map_script MAP_SCRIPT_ON_TRANSITION, Route104_OnTransition .byte 0 -Route104_MapScript2_1ECC3D: @ 81ECC3D - map_script_2 VAR_BOARD_BRINEY_BOAT_STATE, 1, Route104_EventScript_1ECC47 +Route104_OnFrame: @ 81ECC3D + map_script_2 VAR_BOARD_BRINEY_BOAT_STATE, 1, Route104_EventScript_StartSailToDewford .2byte 0 -Route104_EventScript_1ECC47:: @ 81ECC47 +Route104_EventScript_StartSailToDewford:: @ 81ECC47 lockall - goto Route104_EventScript_1ED099 + goto Route104_EventScript_SailToDewford end Route104_OnTransition: @ 81ECC4E @@ -355,13 +355,13 @@ Route104_EventScript_1ED090:: @ 81ED090 msgbox Route104_Text_1ED7A2, MSGBOX_NPC end -Route104_EventScript_1ED099:: @ 81ED099 +Route104_EventScript_SailToDewford:: @ 81ED099 setobjectpriority 8, MAP_ROUTE104, 0 setobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE104, 0 - applymovement 8, Route104_Movement_1ED359 + applymovement 8, Route104_Movement_BrineyBoardBoat waitmovement 0 removeobject 8 - applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED34F + applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_PlayerBoardBoat waitmovement 0 hideobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE104 call Common_EventScript_PlayBrineysBoatMusic @@ -379,11 +379,11 @@ Route104_EventScript_1ED0EF:: @ 81ED0EF applymovement 7, Route104_Movement_1ED1C8 applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED1C8 waitmovement 0 - pokenavcall Route104_Text_1EE336 + pokenavcall Route104_Text_DadPokenavCall waitmessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox Route104_Text_1EE463, MSGBOX_DEFAULT + msgbox Route104_Text_RegisteredDadInPokenav, MSGBOX_DEFAULT waitfanfare closemessage delay 30 @@ -418,17 +418,17 @@ Route104_EventScript_1ED139:: @ 81ED139 resetobjectpriority 2, MAP_DEWFORD_TOWN copyobjectxytoperm 2 setvar VAR_BOARD_BRINEY_BOAT_STATE, 0 - goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_1ED1B4 - goto_if_set FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_1ED1BE + goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_DeliverLetterReminder + goto_if_set FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_LandedInDewford end -Route104_EventScript_1ED1B4:: @ 81ED1B4 - msgbox Route104_Text_1E9AAF, MSGBOX_DEFAULT +Route104_EventScript_DeliverLetterReminder:: @ 81ED1B4 + msgbox Route104_Text_LandedInDewfordDeliverLetter, MSGBOX_DEFAULT releaseall end -Route104_EventScript_1ED1BE:: @ 81ED1BE - msgbox Route104_Text_1E9C1D, MSGBOX_DEFAULT +Route104_EventScript_LandedInDewford:: @ 81ED1BE + msgbox DewfordTown_Text_BrineyLandedInDewford, MSGBOX_DEFAULT releaseall end @@ -829,7 +829,7 @@ Route104_Movement_1ED28C: @ 81ED28C walk_down step_end -Route104_Movement_1ED34F: @ 81ED34F +Route104_Movement_PlayerBoardBoat: @ 81ED34F walk_left walk_down walk_down @@ -845,7 +845,7 @@ Route104_Movement_1ED355: @ 81ED355 walk_in_place_fastest_right step_end -Route104_Movement_1ED359: @ 81ED359 +Route104_Movement_BrineyBoardBoat: @ 81ED359 walk_down walk_down step_end diff --git a/data/maps/Route104_MrBrineysHouse/scripts.inc b/data/maps/Route104_MrBrineysHouse/scripts.inc index b2baff82b..68fe98ffd 100644 --- a/data/maps/Route104_MrBrineysHouse/scripts.inc +++ b/data/maps/Route104_MrBrineysHouse/scripts.inc @@ -74,7 +74,7 @@ Route104_MrBrineysHouse_EventScript_229E1D:: @ 8229E1D Route104_MrBrineysHouse_EventScript_229E27:: @ 8229E27 msgbox Route104_MrBrineysHouse_Text_229FE9, MSGBOX_DEFAULT - call Route104_MrBrineysHouse_EventScript_271E95 + call EventScript_BackupMrBrineyLocation setvar VAR_BOARD_BRINEY_BOAT_STATE, 1 clearflag FLAG_HIDE_ROUTE_104_MR_BRINEY setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY diff --git a/data/maps/Route104_PrettyPetalFlowerShop/map.json b/data/maps/Route104_PrettyPetalFlowerShop/map.json index 9d3d30794..dcda9afeb 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/map.json +++ b/data/maps/Route104_PrettyPetalFlowerShop/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route104_PrettyPetalFlowerShop_EventScript_22A373", + "script": "Route104_PrettyPetalFlowerShop_EventScript_ShopOwner", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route104_PrettyPetalFlowerShop_EventScript_22A40C", + "script": "Route104_PrettyPetalFlowerShop_EventScript_WailmerPailGirl", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 2, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route104_PrettyPetalFlowerShop_EventScript_22A442", + "script": "Route104_PrettyPetalFlowerShop_EventScript_RandomBerryGirl", "flag": "0" } ], diff --git a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc index 0b8d2217f..dc5bd2ce9 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc @@ -4,48 +4,48 @@ Route104_PrettyPetalFlowerShop_MapScripts:: @ 822A34C Route104_PrettyPetalFlowerShop_OnTransition: @ 822A352 setflag FLAG_LANDMARK_FLOWER_SHOP - goto_if_unset FLAG_MET_PRETTY_PETAL_SHOP_OWNER, Route104_PrettyPetalFlowerShop_EventScript_22A36B - goto_if_unset FLAG_BADGE03_GET, Route104_PrettyPetalFlowerShop_EventScript_22A36B + goto_if_unset FLAG_MET_PRETTY_PETAL_SHOP_OWNER, Route104_PrettyPetalFlowerShop_EventScript_MoveShopOwner + goto_if_unset FLAG_BADGE03_GET, Route104_PrettyPetalFlowerShop_EventScript_MoveShopOwner setflag FLAG_TEMP_1 end -Route104_PrettyPetalFlowerShop_EventScript_22A36B:: @ 822A36B +Route104_PrettyPetalFlowerShop_EventScript_MoveShopOwner:: @ 822A36B setobjectxyperm 1, 4, 6 end -Route104_PrettyPetalFlowerShop_EventScript_22A373:: @ 822A373 +Route104_PrettyPetalFlowerShop_EventScript_ShopOwner:: @ 822A373 lock faceplayer - goto_if_set FLAG_TEMP_1, Route104_PrettyPetalFlowerShop_EventScript_22A3E4 - msgbox Route104_PrettyPetalFlowerShop_Text_2A7686, MSGBOX_DEFAULT - goto_if_set FLAG_MET_PRETTY_PETAL_SHOP_OWNER, Route104_PrettyPetalFlowerShop_EventScript_22A3B2 + goto_if_set FLAG_TEMP_1, Route104_PrettyPetalFlowerShop_EventScript_SellDecorations + msgbox Route104_PrettyPetalFlowerShop_Text_ThisIsPrettyPetalFlowerShop, MSGBOX_DEFAULT + goto_if_set FLAG_MET_PRETTY_PETAL_SHOP_OWNER, Route104_PrettyPetalFlowerShop_EventScript_AlreadyMet setflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER - msgbox Route104_PrettyPetalFlowerShop_Text_2A7706, MSGBOX_YESNO - compare VAR_RESULT, 1 - call_if_eq Route104_PrettyPetalFlowerShop_EventScript_22A3D2 - compare VAR_RESULT, 0 - call_if_eq Route104_PrettyPetalFlowerShop_EventScript_22A3DB + msgbox Route104_PrettyPetalFlowerShop_Text_IntroLearnAboutBerries, MSGBOX_YESNO + compare VAR_RESULT, TRUE + call_if_eq Route104_PrettyPetalFlowerShop_EventScript_ExplainBerries + compare VAR_RESULT, FALSE + call_if_eq Route104_PrettyPetalFlowerShop_EventScript_DontExplainBerries release end -Route104_PrettyPetalFlowerShop_EventScript_22A3B2:: @ 822A3B2 - msgbox Route104_PrettyPetalFlowerShop_Text_2A76D9, MSGBOX_YESNO - compare VAR_RESULT, 1 - call_if_eq Route104_PrettyPetalFlowerShop_EventScript_22A3D2 - compare VAR_RESULT, 0 - call_if_eq Route104_PrettyPetalFlowerShop_EventScript_22A3DB +Route104_PrettyPetalFlowerShop_EventScript_AlreadyMet:: @ 822A3B2 + msgbox Route104_PrettyPetalFlowerShop_Text_LearnAboutBerries, MSGBOX_YESNO + compare VAR_RESULT, TRUE + call_if_eq Route104_PrettyPetalFlowerShop_EventScript_ExplainBerries + compare VAR_RESULT, FALSE + call_if_eq Route104_PrettyPetalFlowerShop_EventScript_DontExplainBerries release end -Route104_PrettyPetalFlowerShop_EventScript_22A3D2:: @ 822A3D2 - msgbox Route104_PrettyPetalFlowerShop_Text_2A775B, MSGBOX_DEFAULT +Route104_PrettyPetalFlowerShop_EventScript_ExplainBerries:: @ 822A3D2 + msgbox Route104_PrettyPetalFlowerShop_Text_BerriesExplanation, MSGBOX_DEFAULT return -Route104_PrettyPetalFlowerShop_EventScript_22A3DB:: @ 822A3DB - msgbox Route104_PrettyPetalFlowerShop_Text_2A78DF, MSGBOX_DEFAULT +Route104_PrettyPetalFlowerShop_EventScript_DontExplainBerries:: @ 822A3DB + msgbox Route104_PrettyPetalFlowerShop_Text_FlowersBringHappiness, MSGBOX_DEFAULT return -Route104_PrettyPetalFlowerShop_EventScript_22A3E4:: @ 822A3E4 +Route104_PrettyPetalFlowerShop_EventScript_SellDecorations:: @ 822A3E4 message gText_PlayerWhatCanIDoForYou waitmessage pokemartdecoration2 Route104_PrettyPetalFlowerShop_Pokemart_Plants @@ -65,39 +65,39 @@ Route104_PrettyPetalFlowerShop_Pokemart_Plants: @ 822A3FC release end -Route104_PrettyPetalFlowerShop_EventScript_22A40C:: @ 822A40C +Route104_PrettyPetalFlowerShop_EventScript_WailmerPailGirl:: @ 822A40C lock faceplayer - goto_if_unset FLAG_RECEIVED_WAILMER_PAIL, Route104_PrettyPetalFlowerShop_EventScript_22A421 - msgbox Route104_PrettyPetalFlowerShop_Text_2A79A6, MSGBOX_DEFAULT + goto_if_unset FLAG_RECEIVED_WAILMER_PAIL, Route104_PrettyPetalFlowerShop_EventScript_GiveWailmerPail + msgbox Route104_PrettyPetalFlowerShop_Text_WailmerPailExplanation, MSGBOX_DEFAULT release end -Route104_PrettyPetalFlowerShop_EventScript_22A421:: @ 822A421 - msgbox Route104_PrettyPetalFlowerShop_Text_2A7916, MSGBOX_DEFAULT +Route104_PrettyPetalFlowerShop_EventScript_GiveWailmerPail:: @ 822A421 + msgbox Route104_PrettyPetalFlowerShop_Text_YouCanHaveThis, MSGBOX_DEFAULT giveitem_std ITEM_WAILMER_PAIL - msgbox Route104_PrettyPetalFlowerShop_Text_2A79A6, MSGBOX_DEFAULT + msgbox Route104_PrettyPetalFlowerShop_Text_WailmerPailExplanation, MSGBOX_DEFAULT setflag FLAG_RECEIVED_WAILMER_PAIL release end -Route104_PrettyPetalFlowerShop_EventScript_22A442:: @ 822A442 +Route104_PrettyPetalFlowerShop_EventScript_RandomBerryGirl:: @ 822A442 lock faceplayer dotimebasedevents - goto_if_set FLAG_DAILY_FLOWER_SHOP_RECEIVED_BERRY, Route104_PrettyPetalFlowerShop_EventScript_22A482 - msgbox Route104_PrettyPetalFlowerShop_Text_2A7A98, MSGBOX_DEFAULT + goto_if_set FLAG_DAILY_FLOWER_SHOP_RECEIVED_BERRY, Route104_PrettyPetalFlowerShop_EventScript_AlreadyReceivedBerry + msgbox Route104_PrettyPetalFlowerShop_Text_ImGrowingFlowers, MSGBOX_DEFAULT random 8 addvar VAR_RESULT, FIRST_BERRY_INDEX giveitem_std VAR_RESULT compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_FLOWER_SHOP_RECEIVED_BERRY - msgbox Route104_PrettyPetalFlowerShop_Text_2A7AF3, MSGBOX_DEFAULT + msgbox Route104_PrettyPetalFlowerShop_Text_MachineMixesBerries, MSGBOX_DEFAULT release end -Route104_PrettyPetalFlowerShop_EventScript_22A482:: @ 822A482 - msgbox Route104_PrettyPetalFlowerShop_Text_2A7AF3, MSGBOX_DEFAULT +Route104_PrettyPetalFlowerShop_EventScript_AlreadyReceivedBerry:: @ 822A482 + msgbox Route104_PrettyPetalFlowerShop_Text_MachineMixesBerries, MSGBOX_DEFAULT release end diff --git a/data/maps/Route105/map.json b/data/maps/Route105/map.json index 4d447d4f8..bb6aadd54 100644 --- a/data/maps/Route105/map.json +++ b/data/maps/Route105/map.json @@ -40,7 +40,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "6", - "script": "Route105_EventScript_1EE261", + "script": "Route105_EventScript_Luis", "flag": "0" }, { @@ -53,7 +53,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route105_EventScript_1EE278", + "script": "Route105_EventScript_Dominik", "flag": "0" }, { @@ -66,7 +66,7 @@ "movement_range_y": 7, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route105_EventScript_1EE28F", + "script": "Route105_EventScript_Beverly", "flag": "0" }, { @@ -79,7 +79,7 @@ "movement_range_y": 5, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route105_EventScript_1EE2A6", + "script": "Route105_EventScript_Imani", "flag": "0" }, { @@ -105,7 +105,7 @@ "movement_range_y": 7, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route105_EventScript_1EE24A", + "script": "Route105_EventScript_Foster", "flag": "0" }, { @@ -118,7 +118,7 @@ "movement_range_y": 2, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route105_EventScript_1EE2BD", + "script": "Route105_EventScript_Josue", "flag": "0" }, { @@ -131,7 +131,7 @@ "movement_range_y": 2, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route105_EventScript_1EE2D4", + "script": "Route105_EventScript_Andres", "flag": "0" } ], diff --git a/data/maps/Route105/scripts.inc b/data/maps/Route105/scripts.inc index ff4b3dbe1..1b892642e 100644 --- a/data/maps/Route105/scripts.inc +++ b/data/maps/Route105/scripts.inc @@ -1,18 +1,18 @@ Route105_MapScripts:: @ 81EE1DB - map_script MAP_SCRIPT_ON_LOAD, Route105_MapScript1_1EE1EB + map_script MAP_SCRIPT_ON_LOAD, Route105_OnLoad map_script MAP_SCRIPT_ON_TRANSITION, Route105_OnTransition - map_script MAP_SCRIPT_ON_FRAME_TABLE, Route105_MapScript2_1EE240 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route105_OnFrame .byte 0 -Route105_MapScript1_1EE1EB: @ 81EE1EB - call_if_unset FLAG_REGI_DOORS_OPENED, Route105_EventScript_1EE20B +Route105_OnLoad: @ 81EE1EB + call_if_unset FLAG_REGI_DOORS_OPENED, Route105_CloseRegiEntrance compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_NORTH call_if_eq UnusualWeather_EventScript_PlaceTilesRoute105North compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_SOUTH call_if_eq UnusualWeather_EventScript_PlaceTilesRoute105South end -Route105_EventScript_1EE20B:: @ 81EE20B +Route105_CloseRegiEntrance:: @ 81EE20B setmetatile 9, 19, METATILE_General_RockWall_RockBase, 1 setmetatile 9, 20, METATILE_General_RockWall_SandBase, 1 return @@ -26,63 +26,63 @@ Route105_OnTransition: @ 81EE21E call_if_eq UnusualWeather_StartKyogreWeather end -Route105_MapScript2_1EE240: @ 81EE240 +Route105_OnFrame: @ 81EE240 map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1 .2byte 0 -Route105_EventScript_1EE24A:: @ 81EE24A - trainerbattle_single TRAINER_FOSTER, Route105_Text_295D0F, Route105_Text_295D62 - msgbox Route105_Text_295DAB, MSGBOX_AUTOCLOSE +Route105_EventScript_Foster:: @ 81EE24A + trainerbattle_single TRAINER_FOSTER, Route105_Text_FosterIntro, Route105_Text_FosterDefeated + msgbox Route105_Text_FosterPostBattle, MSGBOX_AUTOCLOSE end -Route105_EventScript_1EE261:: @ 81EE261 - trainerbattle_single TRAINER_LUIS, Route105_Text_295DF5, Route105_Text_295E66 - msgbox Route105_Text_295E72, MSGBOX_AUTOCLOSE +Route105_EventScript_Luis:: @ 81EE261 + trainerbattle_single TRAINER_LUIS, Route105_Text_LuisIntro, Route105_Text_LuisDefeated + msgbox Route105_Text_LuisPostBattle, MSGBOX_AUTOCLOSE end -Route105_EventScript_1EE278:: @ 81EE278 - trainerbattle_single TRAINER_DOMINIK, Route105_Text_295EB7, Route105_Text_295EEA - msgbox Route105_Text_295F08, MSGBOX_AUTOCLOSE +Route105_EventScript_Dominik:: @ 81EE278 + trainerbattle_single TRAINER_DOMINIK, Route105_Text_DominikIntro, Route105_Text_DominikDefeated + msgbox Route105_Text_DominikPostBattle, MSGBOX_AUTOCLOSE end -Route105_EventScript_1EE28F:: @ 81EE28F - trainerbattle_single TRAINER_BEVERLY, Route105_Text_295F5C, Route105_Text_295FA0 - msgbox Route105_Text_295FAE, MSGBOX_AUTOCLOSE +Route105_EventScript_Beverly:: @ 81EE28F + trainerbattle_single TRAINER_BEVERLY, Route105_Text_BeverlyIntro, Route105_Text_BeverlyDefeated + msgbox Route105_Text_PostBattle, MSGBOX_AUTOCLOSE end -Route105_EventScript_1EE2A6:: @ 81EE2A6 - trainerbattle_single TRAINER_IMANI, Route105_Text_296025, Route105_Text_296059 - msgbox Route105_Text_296076, MSGBOX_AUTOCLOSE +Route105_EventScript_Imani:: @ 81EE2A6 + trainerbattle_single TRAINER_IMANI, Route105_Text_ImaniIntro, Route105_Text_ImaniDefeated + msgbox Route105_Text_ImaniPostBattle, MSGBOX_AUTOCLOSE end -Route105_EventScript_1EE2BD:: @ 81EE2BD - trainerbattle_single TRAINER_JOSUE, Route105_Text_29626F, Route105_Text_2962CB - msgbox Route105_Text_2962EC, MSGBOX_AUTOCLOSE +Route105_EventScript_Josue:: @ 81EE2BD + trainerbattle_single TRAINER_JOSUE, Route105_Text_JosueIntro, Route105_Text_JosueDefeated + msgbox Route105_Text_JosuePostBattle, MSGBOX_AUTOCLOSE end -Route105_EventScript_1EE2D4:: @ 81EE2D4 - trainerbattle_single TRAINER_ANDRES_1, Route105_Text_2960A9, Route105_Text_2960DB, Route105_EventScript_1EE300 +Route105_EventScript_Andres:: @ 81EE2D4 + trainerbattle_single TRAINER_ANDRES_1, Route105_Text_AndresIntro, Route105_Text_AndresDefeated, Route105_EventScript_AndresRegisterMatchCallAfterBattle specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route105_EventScript_1EE31F - msgbox Route105_Text_2960FA, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route105_EventScript_AndresRematch + msgbox Route105_Text_AndresPostBattle, MSGBOX_DEFAULT release end -Route105_EventScript_1EE300:: @ 81EE300 +Route105_EventScript_AndresRegisterMatchCallAfterBattle:: @ 81EE300 special sub_80B4808 waitmovement 0 - msgbox Route105_Text_296159, MSGBOX_DEFAULT + msgbox Route105_Text_AndresRegister, MSGBOX_DEFAULT register_matchcall TRAINER_ANDRES_1 release end -Route105_EventScript_1EE31F:: @ 81EE31F - trainerbattle_rematch TRAINER_ANDRES_1, Route105_Text_29619E, Route105_Text_2961DD - msgbox Route105_Text_2961FE, MSGBOX_AUTOCLOSE +Route105_EventScript_AndresRematch:: @ 81EE31F + trainerbattle_rematch TRAINER_ANDRES_1, Route105_Text_AndresRematchIntro, Route105_Text_AndresRematchDefeated + msgbox Route105_Text_AndresRematchPostBattle, MSGBOX_AUTOCLOSE end -Route104_Text_1EE336: @ 81EE336 +Route104_Text_DadPokenavCall: @ 81EE336 .string "… … … … … …\n" .string "… … … … … Beep!\p" .string "DAD: Oh, {PLAYER}?\p" @@ -98,6 +98,6 @@ Route104_Text_1EE336: @ 81EE336 .string "… … … … … …\n" .string "… … … … … Click!$" -Route104_Text_1EE463: @ 81EE463 +Route104_Text_RegisteredDadInPokenav: @ 81EE463 .string "Registered DAD NORMAN\n" .string "in the POKéNAV.$" diff --git a/data/maps/Route106/map.json b/data/maps/Route106/map.json index 70558d26e..273f59aa5 100644 --- a/data/maps/Route106/map.json +++ b/data/maps/Route106/map.json @@ -35,7 +35,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route106_EventScript_1EE493", + "script": "Route106_EventScript_Douglas", "flag": "0" }, { @@ -48,7 +48,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route106_EventScript_1EE4AA", + "script": "Route106_EventScript_Kyla", "flag": "0" }, { @@ -61,7 +61,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route106_EventScript_1EE4C1", + "script": "Route106_EventScript_Elliot", "flag": "0" }, { @@ -74,7 +74,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route106_EventScript_1EE523", + "script": "Route106_EventScript_Ned", "flag": "0" }, { @@ -132,7 +132,7 @@ "y": 13, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route106_EventScript_1EE48A" + "script": "Route106_EventScript_TrainerTipsSign" } ] }
\ No newline at end of file diff --git a/data/maps/Route106/scripts.inc b/data/maps/Route106/scripts.inc index f27ce9647..eb545cab8 100644 --- a/data/maps/Route106/scripts.inc +++ b/data/maps/Route106/scripts.inc @@ -1,48 +1,48 @@ Route106_MapScripts:: @ 81EE489 .byte 0 -Route106_EventScript_1EE48A:: @ 81EE48A - msgbox Route106_Text_1EE53A, MSGBOX_SIGN +Route106_EventScript_TrainerTipsSign:: @ 81EE48A + msgbox Route106_Text_TrainerTips, MSGBOX_SIGN end -Route106_EventScript_1EE493:: @ 81EE493 - trainerbattle_single TRAINER_DOUGLAS, Route106_Text_2965BB, Route106_Text_2965FD - msgbox Route106_Text_296608, MSGBOX_AUTOCLOSE +Route106_EventScript_Douglas:: @ 81EE493 + trainerbattle_single TRAINER_DOUGLAS, Route106_Text_DouglasIntro, Route106_Text_DouglasDefeated + msgbox Route106_Text_DouglasPostBattle, MSGBOX_AUTOCLOSE end -Route106_EventScript_1EE4AA:: @ 81EE4AA - trainerbattle_single TRAINER_KYLA, Route106_Text_296628, Route106_Text_296674 - msgbox Route106_Text_29669E, MSGBOX_AUTOCLOSE +Route106_EventScript_Kyla:: @ 81EE4AA + trainerbattle_single TRAINER_KYLA, Route106_Text_KylaIntro, Route106_Text_KylaDefeated + msgbox Route106_Text_KylaPostBattle, MSGBOX_AUTOCLOSE end -Route106_EventScript_1EE4C1:: @ 81EE4C1 - trainerbattle_single TRAINER_ELLIOT_1, Route106_Text_296327, Route106_Text_29635C, Route106_EventScript_1EE4ED +Route106_EventScript_Elliot:: @ 81EE4C1 + trainerbattle_single TRAINER_ELLIOT_1, Route106_Text_ElliotIntro, Route106_Text_ElliotDefeated, Route106_EventScript_ElliotRegisterMatchCallAfterBattle specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route106_EventScript_1EE50C - msgbox Route106_Text_29638C, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route106_EventScript_ElliotRematch + msgbox Route106_Text_ElliotPostBattle, MSGBOX_DEFAULT release end -Route106_EventScript_1EE4ED:: @ 81EE4ED +Route106_EventScript_ElliotRegisterMatchCallAfterBattle:: @ 81EE4ED special sub_80B4808 waitmovement 0 - msgbox Route106_Text_2963E3, MSGBOX_DEFAULT + msgbox Route106_Text_ElliotRegister, MSGBOX_DEFAULT register_matchcall TRAINER_ELLIOT_1 release end -Route106_EventScript_1EE50C:: @ 81EE50C - trainerbattle_rematch TRAINER_ELLIOT_1, Route106_Text_29642E, Route106_Text_296477 - msgbox Route106_Text_296493, MSGBOX_AUTOCLOSE +Route106_EventScript_ElliotRematch:: @ 81EE50C + trainerbattle_rematch TRAINER_ELLIOT_1, Route106_Text_ElliotRematchIntro, Route106_Text_ElliotRematchDefeated + msgbox Route106_Text_ElliotRematchPostBattle, MSGBOX_AUTOCLOSE end -Route106_EventScript_1EE523:: @ 81EE523 - trainerbattle_single TRAINER_NED, Route106_Text_2964D4, Route106_Text_296553 - msgbox Route106_Text_296588, MSGBOX_AUTOCLOSE +Route106_EventScript_Ned:: @ 81EE523 + trainerbattle_single TRAINER_NED, Route106_Text_NedIntro, Route106_Text_NedDefeated + msgbox Route106_Text_NedPostBattle, MSGBOX_AUTOCLOSE end -Route106_Text_1EE53A: @ 81EE53A +Route106_Text_TrainerTips: @ 81EE53A .string "TRAINER TIPS\p" .string "Advice on catching POKéMON with a ROD:\n" .string "Press the A Button if you get a bite.$" diff --git a/data/maps/Route107/map.json b/data/maps/Route107/map.json index 3813f4795..b0bb63a14 100644 --- a/data/maps/Route107/map.json +++ b/data/maps/Route107/map.json @@ -35,7 +35,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route107_EventScript_1EE595", + "script": "Route107_EventScript_Darrin", "flag": "0" }, { @@ -48,7 +48,7 @@ "movement_range_y": 2, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route107_EventScript_1EE5AC", + "script": "Route107_EventScript_Tony", "flag": "0" }, { @@ -61,7 +61,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "5", - "script": "Route107_EventScript_1EE60E", + "script": "Route107_EventScript_Denise", "flag": "0" }, { @@ -74,7 +74,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "5", - "script": "Route107_EventScript_1EE625", + "script": "Route107_EventScript_Beth", "flag": "0" }, { @@ -87,7 +87,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route107_EventScript_1EE63C", + "script": "Route107_EventScript_Lisa", "flag": "0" }, { @@ -100,7 +100,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route107_EventScript_1EE657", + "script": "Route107_EventScript_Ray", "flag": "0" }, { @@ -113,7 +113,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "5", - "script": "Route107_EventScript_1EE672", + "script": "Route107_EventScript_Camron", "flag": "0" } ], diff --git a/data/maps/Route107/scripts.inc b/data/maps/Route107/scripts.inc index 90f67a639..936634d8d 100644 --- a/data/maps/Route107/scripts.inc +++ b/data/maps/Route107/scripts.inc @@ -1,55 +1,55 @@ Route107_MapScripts:: @ 81EE594 .byte 0 -Route107_EventScript_1EE595:: @ 81EE595 - trainerbattle_single TRAINER_DARRIN, Route107_Text_2966E5, Route107_Text_29672F - msgbox Route107_Text_29675B, MSGBOX_AUTOCLOSE +Route107_EventScript_Darrin:: @ 81EE595 + trainerbattle_single TRAINER_DARRIN, Route107_Text_DarrinIntro, Route107_Text_DarrinDefeated + msgbox Route107_Text_DarrinPostBattle, MSGBOX_AUTOCLOSE end -Route107_EventScript_1EE5AC:: @ 81EE5AC - trainerbattle_single TRAINER_TONY_1, Route107_Text_2967AD, Route107_Text_2967D8, Route107_EventScript_1EE5D8 +Route107_EventScript_Tony:: @ 81EE5AC + trainerbattle_single TRAINER_TONY_1, Route107_Text_TonyIntro, Route107_Text_TonyDefeated, Route107_EventScript_TonyRegisterMatchCallAfterBattle specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route107_EventScript_1EE5F7 - msgbox Route107_Text_2967FF, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route107_EventScript_TonyRematch + msgbox Route107_Text_TonyPostBattle, MSGBOX_DEFAULT release end -Route107_EventScript_1EE5D8:: @ 81EE5D8 +Route107_EventScript_TonyRegisterMatchCallAfterBattle:: @ 81EE5D8 special sub_80B4808 waitmovement 0 - msgbox Route107_Text_29685A, MSGBOX_DEFAULT + msgbox Route107_Text_TonyRegister, MSGBOX_DEFAULT register_matchcall TRAINER_TONY_1 release end -Route107_EventScript_1EE5F7:: @ 81EE5F7 - trainerbattle_rematch TRAINER_TONY_1, Route107_Text_296897, Route107_Text_2968D5 - msgbox Route107_Text_296923, MSGBOX_AUTOCLOSE +Route107_EventScript_TonyRematch:: @ 81EE5F7 + trainerbattle_rematch TRAINER_TONY_1, Route107_Text_TonyRematchIntro, Route107_Text_TonyRematchDefeated + msgbox Route107_Text_TonyRematchPostBattle, MSGBOX_AUTOCLOSE end -Route107_EventScript_1EE60E:: @ 81EE60E - trainerbattle_single TRAINER_DENISE, Route107_Text_296974, Route107_Text_29699E - msgbox Route107_Text_2969AB, MSGBOX_AUTOCLOSE +Route107_EventScript_Denise:: @ 81EE60E + trainerbattle_single TRAINER_DENISE, Route107_Text_DeniseIntro, Route107_Text_DeniseDefeated + msgbox Route107_Text_DenisePostBattle, MSGBOX_AUTOCLOSE end -Route107_EventScript_1EE625:: @ 81EE625 - trainerbattle_single TRAINER_BETH, Route107_Text_2969E4, Route107_Text_296A17 - msgbox Route107_Text_296A35, MSGBOX_AUTOCLOSE +Route107_EventScript_Beth:: @ 81EE625 + trainerbattle_single TRAINER_BETH, Route107_Text_BethIntro, Route107_Text_BethDefeated + msgbox Route107_Text_BethPostBattle, MSGBOX_AUTOCLOSE end -Route107_EventScript_1EE63C:: @ 81EE63C - trainerbattle_double TRAINER_LISA_AND_RAY, Route107_Text_296A77, Route107_Text_296AA7, Route107_Text_296B1E - msgbox Route107_Text_296ADC, MSGBOX_AUTOCLOSE +Route107_EventScript_Lisa:: @ 81EE63C + trainerbattle_double TRAINER_LISA_AND_RAY, Route107_Text_LisaIntro, Route107_Text_LisaDefeated, Route107_Text_LisaNotEnoughPokemon + msgbox Route107_Text_LisaPostBattle, MSGBOX_AUTOCLOSE end -Route107_EventScript_1EE657:: @ 81EE657 - trainerbattle_double TRAINER_LISA_AND_RAY, Route107_Text_296B57, Route107_Text_296BB3, Route107_Text_296C34 - msgbox Route107_Text_296BE1, MSGBOX_AUTOCLOSE +Route107_EventScript_Ray:: @ 81EE657 + trainerbattle_double TRAINER_LISA_AND_RAY, Route107_Text_RayIntro, Route107_Text_RayDefeated, Route107_Text_RayNotEnoughPokemon + msgbox Route107_Text_RayPostBattle, MSGBOX_AUTOCLOSE end -Route107_EventScript_1EE672:: @ 81EE672 - trainerbattle_single TRAINER_CAMRON, Route107_Text_296C6F, Route107_Text_296CAD - msgbox Route107_Text_296CC0, MSGBOX_AUTOCLOSE +Route107_EventScript_Camron:: @ 81EE672 + trainerbattle_single TRAINER_CAMRON, Route107_Text_CamronIntro, Route107_Text_CamronDefeated + msgbox Route107_Text_CamronPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route108/map.json b/data/maps/Route108/map.json index b8b188637..ecdb81f6f 100644 --- a/data/maps/Route108/map.json +++ b/data/maps/Route108/map.json @@ -35,7 +35,7 @@ "movement_range_y": 3, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route108_EventScript_1EE68A", + "script": "Route108_EventScript_Jerome", "flag": "0" }, { @@ -48,7 +48,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route108_EventScript_1EE6B8", + "script": "Route108_EventScript_Tara", "flag": "0" }, { @@ -61,7 +61,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route108_EventScript_1EE6A1", + "script": "Route108_EventScript_Matthew", "flag": "0" }, { @@ -74,7 +74,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route108_EventScript_1EE6CF", + "script": "Route108_EventScript_Missy", "flag": "0" }, { @@ -87,7 +87,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route108_EventScript_1EE6E6", + "script": "Route108_EventScript_Carolina", "flag": "0" }, { @@ -100,7 +100,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route108_EventScript_1EE6FD", + "script": "Route108_EventScript_Cory", "flag": "0" }, { diff --git a/data/maps/Route108/scripts.inc b/data/maps/Route108/scripts.inc index 15a657a20..4f049f71d 100644 --- a/data/maps/Route108/scripts.inc +++ b/data/maps/Route108/scripts.inc @@ -1,50 +1,50 @@ Route108_MapScripts:: @ 81EE689 .byte 0 -Route108_EventScript_1EE68A:: @ 81EE68A - trainerbattle_single TRAINER_JEROME, Route108_Text_296D10, Route108_Text_296D3C - msgbox Route108_Text_296D6E, MSGBOX_AUTOCLOSE +Route108_EventScript_Jerome:: @ 81EE68A + trainerbattle_single TRAINER_JEROME, Route108_Text_JeromeIntro, Route108_Text_JeromeDefeated + msgbox Route108_Text_JeromePostBattle, MSGBOX_AUTOCLOSE end -Route108_EventScript_1EE6A1:: @ 81EE6A1 - trainerbattle_single TRAINER_MATTHEW, Route108_Text_296DAF, Route108_Text_296DEA - msgbox Route108_Text_296E03, MSGBOX_AUTOCLOSE +Route108_EventScript_Matthew:: @ 81EE6A1 + trainerbattle_single TRAINER_MATTHEW, Route108_Text_MatthewIntro, Route108_Text_MatthewDefeated + msgbox Route108_Text_MatthewPostBattle, MSGBOX_AUTOCLOSE end -Route108_EventScript_1EE6B8:: @ 81EE6B8 - trainerbattle_single TRAINER_TARA, Route108_Text_296E33, Route108_Text_296E71 - msgbox Route108_Text_296E7A, MSGBOX_AUTOCLOSE +Route108_EventScript_Tara:: @ 81EE6B8 + trainerbattle_single TRAINER_TARA, Route108_Text_TaraIntro, Route108_Text_TaraDefeated + msgbox Route108_Text_TaraPostBattle, MSGBOX_AUTOCLOSE end -Route108_EventScript_1EE6CF:: @ 81EE6CF - trainerbattle_single TRAINER_MISSY, Route108_Text_296EC7, Route108_Text_296EFC - msgbox Route108_Text_296F2A, MSGBOX_AUTOCLOSE +Route108_EventScript_Missy:: @ 81EE6CF + trainerbattle_single TRAINER_MISSY, Route108_Text_MissyIntro, Route108_Text_MissyDefeated + msgbox Route108_Text_MissyPostBattle, MSGBOX_AUTOCLOSE end -Route108_EventScript_1EE6E6:: @ 81EE6E6 - trainerbattle_single TRAINER_CAROLINA, Route108_Text_297094, Route108_Text_2970D7 - msgbox Route108_Text_2970F0, MSGBOX_AUTOCLOSE +Route108_EventScript_Carolina:: @ 81EE6E6 + trainerbattle_single TRAINER_CAROLINA, Route108_Text_CarolinaIntro, Route108_Text_CarolinaDefeated + msgbox Route108_Text_CarolinaPostBattle, MSGBOX_AUTOCLOSE end -Route108_EventScript_1EE6FD:: @ 81EE6FD - trainerbattle_single TRAINER_CORY_1, Route108_Text_296F5D, Route108_Text_296F93, Route108_EventScript_1EE729 +Route108_EventScript_Cory:: @ 81EE6FD + trainerbattle_single TRAINER_CORY_1, Route108_Text_CoryIntro, Route108_Text_CoryDefeated, Route108_EventScript_CoryRegisterMatchCallAfterBattle specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route108_EventScript_1EE748 - msgbox Route108_Text_296FB0, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route108_EventScript_CoryRematch + msgbox Route108_Text_CoryPostBattle, MSGBOX_DEFAULT release end -Route108_EventScript_1EE729:: @ 81EE729 +Route108_EventScript_CoryRegisterMatchCallAfterBattle:: @ 81EE729 special sub_80B4808 waitmovement 0 - msgbox Route108_Text_296FD8, MSGBOX_DEFAULT + msgbox Route108_Text_CoryRegister, MSGBOX_DEFAULT register_matchcall TRAINER_CORY_1 release end -Route108_EventScript_1EE748:: @ 81EE748 - trainerbattle_rematch TRAINER_CORY_1, Route108_Text_297011, Route108_Text_297036 - msgbox Route108_Text_297059, MSGBOX_AUTOCLOSE +Route108_EventScript_CoryRematch:: @ 81EE748 + trainerbattle_rematch TRAINER_CORY_1, Route108_Text_CoryRematchIntro, Route108_Text_CoryRematchDefeated + msgbox Route108_Text_CoryRematchPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route109/map.json b/data/maps/Route109/map.json index 361467266..4ba9baf9f 100644 --- a/data/maps/Route109/map.json +++ b/data/maps/Route109/map.json @@ -48,8 +48,8 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route109_EventScript_1EE910", - "flag": "FLAG_HIDE_ROUTE_108_MR_BRINEY" + "script": "Route109_EventScript_MrBriney", + "flag": "FLAG_HIDE_ROUTE_109_MR_BRINEY" }, { "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", @@ -61,7 +61,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "5", - "script": "Route109_EventScript_1EEA3D", + "script": "Route109_EventScript_David", "flag": "0" }, { @@ -74,7 +74,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "5", - "script": "Route109_EventScript_1EEA54", + "script": "Route109_EventScript_Alice", "flag": "0" }, { @@ -87,7 +87,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route109_EventScript_1EEA6B", + "script": "Route109_EventScript_Huey", "flag": "0" }, { @@ -100,7 +100,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "6", - "script": "Route109_EventScript_1EEA82", + "script": "Route109_EventScript_Edmond", "flag": "0" }, { @@ -113,7 +113,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route109_EventScript_1EEA99", + "script": "Route109_EventScript_Ricky", "flag": "0" }, { @@ -126,7 +126,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route109_EventScript_1EEAFB", + "script": "Route109_EventScript_Lola", "flag": "0" }, { @@ -139,7 +139,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route109_EventScript_1EE995", + "script": "Route109_EventScript_SeashoreHouseGirl", "flag": "0" }, { @@ -165,7 +165,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route109_EventScript_1EEB74", + "script": "Route109_EventScript_Gwen", "flag": "0" }, { @@ -178,7 +178,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route109_EventScript_1EEB5D", + "script": "Route109_EventScript_Austina", "flag": "0" }, { @@ -191,7 +191,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route109_EventScript_1EEB8B", + "script": "Route109_EventScript_Carter", "flag": "0" }, { @@ -204,7 +204,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route109_EventScript_1EE99E", + "script": "Route109_EventScript_SandCastleBoy", "flag": "0" }, { @@ -217,7 +217,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route109_EventScript_1EE9B5", + "script": "Route109_EventScript_SoftSandGirl", "flag": "0" }, { @@ -230,7 +230,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route109_EventScript_1EEA06", + "script": "Route109_EventScript_Woman", "flag": "0" }, { @@ -243,7 +243,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route109_EventScript_1EEBBD", + "script": "Route109_EventScript_Mel", "flag": "0" }, { @@ -256,7 +256,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route109_EventScript_1EEBA2", + "script": "Route109_EventScript_Paul", "flag": "0" }, { @@ -269,7 +269,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route109_EventScript_1EEA0F", + "script": "Route109_EventScript_OldMan", "flag": "0" }, { @@ -282,7 +282,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route109_EventScript_1EEA18", + "script": "Route109_EventScript_Zigzagoon", "flag": "0" }, { @@ -295,7 +295,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "6", - "script": "Route109_EventScript_1EEBEF", + "script": "Route109_EventScript_Hailey", "flag": "0" }, { @@ -308,7 +308,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route109_EventScript_1EEBD8", + "script": "Route109_EventScript_Chandler", "flag": "0" }, { @@ -334,7 +334,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route109_EventScript_1EEC06", + "script": "Route109_EventScript_Elijah", "flag": "0" } ], @@ -355,7 +355,7 @@ "y": 5, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route109_EventScript_1EEA2B" + "script": "Route109_EventScript_SeashoreHouseSign" }, { "type": "sign", @@ -363,7 +363,7 @@ "y": 10, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route109_EventScript_1EEA34" + "script": "Route109_EventScript_TrainerTipsSign" }, { "type": "hidden_item", diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc index a4ac60a9c..adaab110b 100644 --- a/data/maps/Route109/scripts.inc +++ b/data/maps/Route109/scripts.inc @@ -1,59 +1,59 @@ Route109_MapScripts:: @ 81EE75F .byte 0 -Route109_EventScript_1EE760:: @ 81EE760 - call Route109_EventScript_271E95 +Route109_EventScript_StartDepartForDewford:: @ 81EE760 + call EventScript_BackupMrBrineyLocation setobjectpriority 2, MAP_ROUTE109, 0 setobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE109, 0 - applymovement 2, Route109_Movement_1EE90B + applymovement 2, Route109_Movement_BrineyEnterBoat waitmovement 0 removeobject 2 switch VAR_FACING - case DIR_SOUTH, Route109_EventScript_1EE7A5 - case DIR_WEST, Route109_EventScript_1EE7C5 - case DIR_EAST, Route109_EventScript_1EE7B5 + case DIR_SOUTH, Route109_EventScript_EnterBoatSouth + case DIR_WEST, Route109_EventScript_EnterBoatWest + case DIR_EAST, Route109_EventScript_EnterBoatEast end -Route109_EventScript_1EE7A5:: @ 81EE7A5 - applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_1EE8FD +Route109_EventScript_EnterBoatSouth:: @ 81EE7A5 + applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_PlayerEnterBoatSouth waitmovement 0 - goto Route109_EventScript_1EE7D5 + goto Route109_EventScript_DoSailToDewford end -Route109_EventScript_1EE7B5:: @ 81EE7B5 - applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_1EE905 +Route109_EventScript_EnterBoatEast:: @ 81EE7B5 + applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_PlayerEnterBoatEast waitmovement 0 - goto Route109_EventScript_1EE7D5 + goto Route109_EventScript_DoSailToDewford end -Route109_EventScript_1EE7C5:: @ 81EE7C5 - applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_1EE908 +Route109_EventScript_EnterBoatWest:: @ 81EE7C5 + applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_PlayerEnterBoatWest waitmovement 0 - goto Route109_EventScript_1EE7D5 + goto Route109_EventScript_DoSailToDewford end -Route109_EventScript_1EE7D5:: @ 81EE7D5 +Route109_EventScript_DoSailToDewford:: @ 81EE7D5 hideobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE109 call Common_EventScript_PlayBrineysBoatMusic - applymovement 1, Route109_Movement_1EE84F - applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_1EE84F + applymovement 1, Route109_Movement_SailToDewford + applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_SailToDewford waitmovement 0 delay 50 call Common_EventScript_StopBrineysBoatMusic showobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN - applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_1EE900 + applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_PlayerExitBoat waitmovement 0 addobject 4 clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN setobjectxyperm 2, 12, 8 addobject 2 setobjectpriority 2, MAP_DEWFORD_TOWN, 0 - applymovement 2, Route109_Movement_1EE90D + applymovement 2, Route109_Movement_BrineyExitBoat waitmovement 0 clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN setflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT hideobjectat 1, MAP_ROUTE109 - msgbox Route109_Text_1E9C1D, MSGBOX_DEFAULT + msgbox DewfordTown_Text_BrineyLandedInDewford, MSGBOX_DEFAULT closemessage copyvar VAR_BRINEY_LOCATION, VAR_0x8008 resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE109 @@ -62,7 +62,7 @@ Route109_EventScript_1EE7D5:: @ 81EE7D5 release end -Route109_Movement_1EE84F: @ 81EE84F +Route109_Movement_SailToDewford: @ 81EE84F walk_in_place_fastest_down walk_down walk_down @@ -238,98 +238,98 @@ Route109_Movement_1EE84F: @ 81EE84F walk_in_place_fastest_down step_end -Route109_Movement_1EE8FD: @ 81EE8FD +Route109_Movement_PlayerEnterBoatSouth: @ 81EE8FD walk_down walk_down step_end -Route109_Movement_1EE900: @ 81EE900 +Route109_Movement_PlayerExitBoat: @ 81EE900 walk_down walk_down walk_left walk_in_place_fastest_right step_end -Route109_Movement_1EE905: @ 81EE905 +Route109_Movement_PlayerEnterBoatEast: @ 81EE905 walk_right walk_down step_end -Route109_Movement_1EE908: @ 81EE908 +Route109_Movement_PlayerEnterBoatWest: @ 81EE908 walk_left walk_down step_end -Route109_Movement_1EE90B: @ 81EE90B +Route109_Movement_BrineyEnterBoat: @ 81EE90B walk_down step_end -Route109_Movement_1EE90D: @ 81EE90D +Route109_Movement_BrineyExitBoat: @ 81EE90D walk_down walk_in_place_fastest_left step_end -Route109_EventScript_1EE910:: @ 81EE910 +Route109_EventScript_MrBriney:: @ 81EE910 lock faceplayer - goto_if_unset FLAG_DELIVERED_DEVON_GOODS, Route109_EventScript_1EE921 - goto Route109_EventScript_1EE93F + goto_if_unset FLAG_DELIVERED_DEVON_GOODS, Route109_EventScript_HaveNotDeliveredDevonGood + goto Route109_EventScript_DeliveredDevonGoods end -Route109_EventScript_1EE921:: @ 81EE921 - message Route109_Text_1EEC96 - msgbox Route109_Text_1EEC96, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq Route109_EventScript_1EE981 - goto Route109_EventScript_1EE972 +Route109_EventScript_HaveNotDeliveredDevonGood:: @ 81EE921 + message Route109_Text_BrineySailToDewfordQuestion + msgbox Route109_Text_BrineySailToDewfordQuestion, MSGBOX_YESNO + compare VAR_RESULT, FALSE + goto_if_eq Route109_EventScript_StayHere + goto Route109_EventScript_SailToDewford end -Route109_EventScript_1EE93F:: @ 81EE93F - message Route109_Text_1EEE17 +Route109_EventScript_DeliveredDevonGoods:: @ 81EE93F + message Route109_Text_BrineyWhereAreWeBound waitmessage multichoicedefault 21, 8, MULTI_BRINEY_OFF_DEWFORD, 1, 0 switch VAR_RESULT - case 0, Route109_EventScript_1EE972 - case 1, Route109_EventScript_1EE98B - case MULTI_B_PRESSED, Route109_EventScript_1EE98B + case 0, Route109_EventScript_SailToDewford + case 1, Route109_EventScript_ChoseNotToSail + case MULTI_B_PRESSED, Route109_EventScript_ChoseNotToSail end -Route109_EventScript_1EE972:: @ 81EE972 - msgbox Route109_Text_1EED06, MSGBOX_DEFAULT +Route109_EventScript_SailToDewford:: @ 81EE972 + msgbox Route109_Text_BrineyDewfordItIs, MSGBOX_DEFAULT closemessage - goto Route109_EventScript_1EE760 + goto Route109_EventScript_StartDepartForDewford end -Route109_EventScript_1EE981:: @ 81EE981 - msgbox Route109_Text_1EED5E, MSGBOX_DEFAULT +Route109_EventScript_StayHere:: @ 81EE981 + msgbox Route109_Text_BrineyDeliverDevonGoods, MSGBOX_DEFAULT release end -Route109_EventScript_1EE98B:: @ 81EE98B - msgbox Route109_Text_1EEE72, MSGBOX_DEFAULT +Route109_EventScript_ChoseNotToSail:: @ 81EE98B + msgbox Route109_Text_BrineyTellMeWhenYouNeedToSail, MSGBOX_DEFAULT release end -Route109_EventScript_1EE995:: @ 81EE995 - msgbox Route109_Text_1EEEB4, MSGBOX_NPC +Route109_EventScript_SeashoreHouseGirl:: @ 81EE995 + msgbox Route109_Text_ChillAtMyPapasSpot, MSGBOX_NPC end -Route109_EventScript_1EE99E:: @ 81EE99E +Route109_EventScript_SandCastleBoy:: @ 81EE99E lock faceplayer - msgbox Route109_Text_1EEFB0, MSGBOX_DEFAULT + msgbox Route109_Text_SandCastleTakingLongTime, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end -Route109_EventScript_1EE9B5:: @ 81EE9B5 +Route109_EventScript_SoftSandGirl:: @ 81EE9B5 lock faceplayer special GetPlayerBigGuyGirlString - goto_if_set FLAG_RECEIVED_SOFT_SAND, Route109_EventScript_1EE9F2 - msgbox Route109_Text_1EEFDE, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_SOFT_SAND, Route109_EventScript_AlreadyReceivedSoftSand + msgbox Route109_Text_YouCanHaveThis, MSGBOX_DEFAULT giveitem_std ITEM_SOFT_SAND compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull @@ -340,207 +340,207 @@ Route109_EventScript_1EE9B5:: @ 81EE9B5 release end -Route109_EventScript_1EE9F2:: @ 81EE9F2 - msgbox Route109_Text_1EEFF1, MSGBOX_DEFAULT +Route109_EventScript_AlreadyReceivedSoftSand:: @ 81EE9F2 + msgbox Route109_Text_WereGoingToMakeBigCastle, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end -Route109_EventScript_1EEA06:: @ 81EEA06 - msgbox Route109_Text_1EEF08, MSGBOX_NPC +Route109_EventScript_Woman:: @ 81EEA06 + msgbox Route109_Text_LittleKidsDartAround, MSGBOX_NPC end -Route109_EventScript_1EEA0F:: @ 81EEA0F - msgbox Route109_Text_1EF080, MSGBOX_NPC +Route109_EventScript_OldMan:: @ 81EEA0F + msgbox Route109_Text_ZigzagoonPicksUpLitter, MSGBOX_NPC end -Route109_EventScript_1EEA18:: @ 81EEA18 +Route109_EventScript_Zigzagoon:: @ 81EEA18 lock faceplayer waitse playmoncry SPECIES_ZIGZAGOON, 0 - msgbox Route109_Text_1EF173, MSGBOX_DEFAULT + msgbox Route109_Text_ZigzagoonCry, MSGBOX_DEFAULT waitmoncry release end -Route109_EventScript_1EEA2B:: @ 81EEA2B - msgbox Route109_Text_1EF185, MSGBOX_SIGN +Route109_EventScript_SeashoreHouseSign:: @ 81EEA2B + msgbox Route109_Text_SeashoreHouseSign, MSGBOX_SIGN end -Route109_EventScript_1EEA34:: @ 81EEA34 - msgbox Route109_Text_1EF1D5, MSGBOX_SIGN +Route109_EventScript_TrainerTipsSign:: @ 81EEA34 + msgbox Route109_Text_TrainerTipsSign, MSGBOX_SIGN end -Route109_EventScript_1EEA3D:: @ 81EEA3D - trainerbattle_single TRAINER_DAVID, Route109_Text_297140, Route109_Text_29717D - msgbox Route109_Text_297191, MSGBOX_AUTOCLOSE +Route109_EventScript_David:: @ 81EEA3D + trainerbattle_single TRAINER_DAVID, Route109_Text_DavidIntro, Route109_Text_DavidDefeated + msgbox Route109_Text_DavidPostBattle, MSGBOX_AUTOCLOSE end -Route109_EventScript_1EEA54:: @ 81EEA54 - trainerbattle_single TRAINER_ALICE, Route109_Text_2971D1, Route109_Text_2971FD - msgbox Route109_Text_29720F, MSGBOX_AUTOCLOSE +Route109_EventScript_Alice:: @ 81EEA54 + trainerbattle_single TRAINER_ALICE, Route109_Text_AliceIntro, Route109_Text_AliceDefeated + msgbox Route109_Text_AlicePostBattle, MSGBOX_AUTOCLOSE end -Route109_EventScript_1EEA6B:: @ 81EEA6B - trainerbattle_single TRAINER_HUEY, Route109_Text_297235, Route109_Text_29727B - msgbox Route109_Text_29728C, MSGBOX_AUTOCLOSE +Route109_EventScript_Huey:: @ 81EEA6B + trainerbattle_single TRAINER_HUEY, Route109_Text_HueyIntro, Route109_Text_HueyDefeated + msgbox Route109_Text_HueyPostBattle, MSGBOX_AUTOCLOSE end -Route109_EventScript_1EEA82:: @ 81EEA82 - trainerbattle_single TRAINER_EDMOND, Route109_Text_2972B3, Route109_Text_2972CE - msgbox Route109_Text_2972ED, MSGBOX_AUTOCLOSE +Route109_EventScript_Edmond:: @ 81EEA82 + trainerbattle_single TRAINER_EDMOND, Route109_Text_EdmondIntro, Route109_Text_EdmondDefeated + msgbox Route109_Text_EdmondPostBattle, MSGBOX_AUTOCLOSE end -Route109_EventScript_1EEA99:: @ 81EEA99 - trainerbattle_single TRAINER_RICKY_1, Route109_Text_29733B, Route109_Text_297379, Route109_EventScript_1EEAC5 +Route109_EventScript_Ricky:: @ 81EEA99 + trainerbattle_single TRAINER_RICKY_1, Route109_Text_RickyIntro, Route109_Text_RickyDefeated, Route109_EventScript_RickyRegisterMatchCallAfterBattle specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route109_EventScript_1EEAE4 - msgbox Route109_Text_297380, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route109_EventScript_RickyRematch + msgbox Route109_Text_RickyPostBattle, MSGBOX_DEFAULT release end -Route109_EventScript_1EEAC5:: @ 81EEAC5 +Route109_EventScript_RickyRegisterMatchCallAfterBattle:: @ 81EEAC5 special sub_80B4808 waitmovement 0 - msgbox Route109_Text_2973C1, MSGBOX_DEFAULT + msgbox Route109_Text_RickyRegister, MSGBOX_DEFAULT register_matchcall TRAINER_RICKY_1 release end -Route109_EventScript_1EEAE4:: @ 81EEAE4 - trainerbattle_rematch TRAINER_RICKY_1, Route109_Text_2973FF, Route109_Text_297437 - msgbox Route109_Text_297458, MSGBOX_AUTOCLOSE +Route109_EventScript_RickyRematch:: @ 81EEAE4 + trainerbattle_rematch TRAINER_RICKY_1, Route109_Text_RickyRematchIntro, Route109_Text_RickyRematchDefeated + msgbox Route109_Text_RickyRematchPostBattle, MSGBOX_AUTOCLOSE end -Route109_EventScript_1EEAFB:: @ 81EEAFB - trainerbattle_single TRAINER_LOLA_1, Route109_Text_29749C, Route109_Text_2974CF, Route109_EventScript_1EEB27 +Route109_EventScript_Lola:: @ 81EEAFB + trainerbattle_single TRAINER_LOLA_1, Route109_Text_LolaIntro, Route109_Text_LolaDefeated, Route109_EventScript_LolaRegisterMatchCallAfterBattle specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route109_EventScript_1EEB46 - msgbox Route109_Text_2974D6, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route109_EventScript_LolaRematch + msgbox Route109_Text_LolaPostBattle, MSGBOX_DEFAULT release end -Route109_EventScript_1EEB27:: @ 81EEB27 +Route109_EventScript_LolaRegisterMatchCallAfterBattle:: @ 81EEB27 special sub_80B4808 waitmovement 0 - msgbox Route109_Text_297520, MSGBOX_DEFAULT + msgbox Route109_Text_LolaRegister, MSGBOX_DEFAULT register_matchcall TRAINER_LOLA_1 release end -Route109_EventScript_1EEB46:: @ 81EEB46 - trainerbattle_rematch TRAINER_LOLA_1, Route109_Text_297538, Route109_Text_297576 - msgbox Route109_Text_29757D, MSGBOX_AUTOCLOSE +Route109_EventScript_LolaRematch:: @ 81EEB46 + trainerbattle_rematch TRAINER_LOLA_1, Route109_Text_LolaRematchIntro, Route109_Text_LolaRematchDefeated + msgbox Route109_Text_LolaRematchPostBattle, MSGBOX_AUTOCLOSE end -Route109_EventScript_1EEB5D:: @ 81EEB5D - trainerbattle_single TRAINER_AUSTINA, Route109_Text_2975C0, Route109_Text_297601 - msgbox Route109_Text_29762A, MSGBOX_AUTOCLOSE +Route109_EventScript_Austina:: @ 81EEB5D + trainerbattle_single TRAINER_AUSTINA, Route109_Text_AustinaIntro, Route109_Text_AustinaDefeated + msgbox Route109_Text_AustinaPostBattle, MSGBOX_AUTOCLOSE end -Route109_EventScript_1EEB74:: @ 81EEB74 - trainerbattle_single TRAINER_GWEN, Route109_Text_297667, Route109_Text_297691 - msgbox Route109_Text_2976A4, MSGBOX_AUTOCLOSE +Route109_EventScript_Gwen:: @ 81EEB74 + trainerbattle_single TRAINER_GWEN, Route109_Text_GwenIntro, Route109_Text_GwenDefeated + msgbox Route109_Text_GwenPostBattle, MSGBOX_AUTOCLOSE end -Route109_EventScript_1EEB8B:: @ 81EEB8B - trainerbattle_single TRAINER_CARTER, Route109_Text_2976C5, Route109_Text_2976FC - msgbox Route109_Text_297715, MSGBOX_AUTOCLOSE +Route109_EventScript_Carter:: @ 81EEB8B + trainerbattle_single TRAINER_CARTER, Route109_Text_CarterIntro, Route109_Text_CarterDefeated + msgbox Route109_Text_CarterPostBattle, MSGBOX_AUTOCLOSE end -Route109_EventScript_1EEBA2:: @ 81EEBA2 - trainerbattle_double TRAINER_MEL_AND_PAUL, Route109_Text_297754, Route109_Text_2977B0, Route109_Text_29781D - msgbox Route109_Text_2977C7, MSGBOX_AUTOCLOSE +Route109_EventScript_Paul:: @ 81EEBA2 + trainerbattle_double TRAINER_MEL_AND_PAUL, Route109_Text_PaulIntro, Route109_Text_PaulDefeated, Route109_Text_PaulNotEnoughPokemon + msgbox Route109_Text_PaulPostBattle, MSGBOX_AUTOCLOSE end -Route109_EventScript_1EEBBD:: @ 81EEBBD - trainerbattle_double TRAINER_MEL_AND_PAUL, Route109_Text_297872, Route109_Text_2978BD, Route109_Text_29792E - msgbox Route109_Text_2978F1, MSGBOX_AUTOCLOSE +Route109_EventScript_Mel:: @ 81EEBBD + trainerbattle_double TRAINER_MEL_AND_PAUL, Route109_Text_MelIntro, Route109_Text_MelDefeated, Route109_Text_MelNotEnoughPokemon + msgbox Route109_Text_MelPostBattle, MSGBOX_AUTOCLOSE end -Route109_EventScript_1EEBD8:: @ 81EEBD8 - trainerbattle_single TRAINER_CHANDLER, Route109_Text_29798A, Route109_Text_2979AE - msgbox Route109_Text_2979BF, MSGBOX_AUTOCLOSE +Route109_EventScript_Chandler:: @ 81EEBD8 + trainerbattle_single TRAINER_CHANDLER, Route109_Text_ChandlerIntro, Route109_Text_ChandlerDefeated + msgbox Route109_Text_ChandlerPostBattle, MSGBOX_AUTOCLOSE end -Route109_EventScript_1EEBEF:: @ 81EEBEF - trainerbattle_single TRAINER_HAILEY, Route109_Text_2979EC, Route109_Text_297A15 - msgbox Route109_Text_297A40, MSGBOX_AUTOCLOSE +Route109_EventScript_Hailey:: @ 81EEBEF + trainerbattle_single TRAINER_HAILEY, Route109_Text_HaileyIntro, Route109_Text_HaileyDefeated + msgbox Route109_Text_HaileyPostBattle, MSGBOX_AUTOCLOSE end -Route109_EventScript_1EEC06:: @ 81EEC06 - trainerbattle_single TRAINER_ELIJAH, Route109_Text_297A82, Route109_Text_297AC7 - msgbox Route109_Text_297AE5, MSGBOX_AUTOCLOSE +Route109_EventScript_Elijah:: @ 81EEC06 + trainerbattle_single TRAINER_ELIJAH, Route109_Text_ElijahIntro, Route109_Text_ElijahDefeated + msgbox Route109_Text_ElijahPostBattle, MSGBOX_AUTOCLOSE end -DewfordTown_Text_1EEC1D: @ 81EEC1D +DewfordTown_Text_BrineyLandedInSlateportDeliverGoods: @ 81EEC1D .string "MR. BRINEY: Ahoy!\n" .string "We've made land in SLATEPORT!\p" .string "I suppose you're going to visit CAPT.\n" .string "STERN and deliver the DEVON GOODS?$" -Route109_Text_1EEC96: @ 81EEC96 +Route109_Text_BrineySailToDewfordQuestion: @ 81EEC96 .string "MR. BRINEY: I thought you're supposed\n" .string "to deliver the DEVON GOODS.\p" .string "Would you like to sail back to\n" .string "DEWFORD, then?$" -Route109_Text_1EED06: @ 81EED06 +Route109_Text_BrineyDewfordItIs: @ 81EED06 .string "MR. BRINEY: DEWFORD it is, then!\p" .string "Anchors aweigh!\n" .string "PEEKO, we're setting sail, my darling!$" -Route109_Text_1EED5E: @ 81EED5E +Route109_Text_BrineyDeliverDevonGoods: @ 81EED5E .string "MR. BRINEY: Then you go on and deliver\n" .string "the DEVON GOODS. I'll be waiting.$" -DewfordTown_Text_1EEDA7: @ 81EEDA7 +DewfordTown_Text_BrineyLandedInSlateport: @ 81EEDA7 .string "MR. BRINEY: Ahoy! We've made land in\n" .string "SLATEPORT!\p" .string "You just go on and tell me whenever\n" .string "you want to set sail again!$" -Route109_Text_1EEE17: @ 81EEE17 +Route109_Text_BrineyWhereAreWeBound: @ 81EEE17 .string "MR. BRINEY: Ahoy!\n" .string "For you, I'll go out to sea anytime!\p" .string "Now, my friend, where are we bound?$" -Route109_Text_1EEE72: @ 81EEE72 +Route109_Text_BrineyTellMeWhenYouNeedToSail: @ 81EEE72 .string "MR. BRINEY: You just tell me whenever\n" .string "you need to set sail again!$" -Route109_Text_1EEEB4: @ 81EEEB4 +Route109_Text_ChillAtMyPapasSpot: @ 81EEEB4 .string "Yo, TRAINERS!\n" .string "Whether you're hot to trot,\l" .string "or cool cat not,\l" .string "chill at my papa's spot!$" -Route109_Text_1EEF08: @ 81EEF08 +Route109_Text_LittleKidsDartAround: @ 81EEF08 .string "Little kids can dart around so quickly…\p" .string "You don't dare take your eyes off them\n" .string "for an instant. It's very taxing.\p" .string "Mine are with my POKéMON, so they\n" .string "should be okay, but…$" -Route109_Text_1EEFB0: @ 81EEFB0 +Route109_Text_SandCastleTakingLongTime: @ 81EEFB0 .string "Our sand castle's taking a long time\n" .string "to make.$" -Route109_Text_1EEFDE: @ 81EEFDE +Route109_Text_YouCanHaveThis: @ 81EEFDE .string "You can have this!$" -Route109_Text_1EEFF1: @ 81EEFF1 +Route109_Text_WereGoingToMakeBigCastle: @ 81EEFF1 .string "We're going to get all the sand from\n" .string "the beach and make a big castle!\p" .string "And then we're going to be a king and\n" .string "queen.\p" .string "We'll let you be a servant.$" -Route109_Text_1EF080: @ 81EF080 +Route109_Text_ZigzagoonPicksUpLitter: @ 81EF080 .string "The water around these parts is clean.\p" .string "But, I get my ZIGZAGOON to pick up\n" .string "litter from the shoreline at times.\p" @@ -549,15 +549,15 @@ Route109_Text_1EF080: @ 81EF080 .string "If we pollute the sea, it all comes\n" .string "back to haunt us eventually.$" -Route109_Text_1EF173: @ 81EF173 +Route109_Text_ZigzagoonCry: @ 81EF173 .string "ZIGZAGOON: Guguu?$" -Route109_Text_1EF185: @ 81EF185 +Route109_Text_SeashoreHouseSign: @ 81EF185 .string "SEASHORE HOUSE\p" .string "“May hot battles rage on hot sands!\n" .string "The place for hot TRAINERS!”$" -Route109_Text_1EF1D5: @ 81EF1D5 +Route109_Text_TrainerTipsSign: @ 81EF1D5 .string "TRAINER TIPS\p" .string "POKéMON at the same level may not\n" .string "always have identical stats.\p" diff --git a/data/maps/Route109_SeashoreHouse/map.json b/data/maps/Route109_SeashoreHouse/map.json index 3f293b291..ebd5583c6 100644 --- a/data/maps/Route109_SeashoreHouse/map.json +++ b/data/maps/Route109_SeashoreHouse/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route109_SeashoreHouse_EventScript_2693FE", + "script": "Route109_SeashoreHouse_EventScript_Owner", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route109_SeashoreHouse_EventScript_2694E2", + "script": "Route109_SeashoreHouse_EventScript_Dwayne", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route109_SeashoreHouse_EventScript_269518", + "script": "Route109_SeashoreHouse_EventScript_Simon", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route109_SeashoreHouse_EventScript_2694FD", + "script": "Route109_SeashoreHouse_EventScript_Johanna", "flag": "0" } ], diff --git a/data/maps/Route109_SeashoreHouse/scripts.inc b/data/maps/Route109_SeashoreHouse/scripts.inc index d74b6b671..bc018c2f0 100644 --- a/data/maps/Route109_SeashoreHouse/scripts.inc +++ b/data/maps/Route109_SeashoreHouse/scripts.inc @@ -6,56 +6,56 @@ Route109_SeashoreHouse_OnTransition: @ 82693FA setflag FLAG_LANDMARK_SEASHORE_HOUSE end -Route109_SeashoreHouse_EventScript_2693FE:: @ 82693FE +Route109_SeashoreHouse_EventScript_Owner:: @ 82693FE lock faceplayer - goto_if_set FLAG_RECEIVED_6_SODA_POP, Route109_SeashoreHouse_EventScript_269460 - goto_if_set FLAG_DEFEATED_SEASHORE_HOUSE, Route109_SeashoreHouse_EventScript_269432 - goto_if_set FLAG_TEMP_2, Route109_SeashoreHouse_EventScript_269428 - msgbox Route109_SeashoreHouse_Text_269555, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_6_SODA_POP, Route109_SeashoreHouse_EventScript_AlreadyReceivedSodaPop + goto_if_set FLAG_DEFEATED_SEASHORE_HOUSE, Route109_SeashoreHouse_EventScript_DefeatedTrainers + goto_if_set FLAG_TEMP_2, Route109_SeashoreHouse_EventScript_AlreadyGaveIntroduction + msgbox Route109_SeashoreHouse_Text_SeashoreHouseIntro, MSGBOX_DEFAULT setflag FLAG_TEMP_2 release end -Route109_SeashoreHouse_EventScript_269428:: @ 8269428 - msgbox Route109_SeashoreHouse_Text_269635, MSGBOX_DEFAULT +Route109_SeashoreHouse_EventScript_AlreadyGaveIntroduction:: @ 8269428 + msgbox Route109_SeashoreHouse_Text_ShowMeSomeHotMatches, MSGBOX_DEFAULT release end -Route109_SeashoreHouse_EventScript_269432:: @ 8269432 - msgbox Route109_SeashoreHouse_Text_269685, MSGBOX_DEFAULT +Route109_SeashoreHouse_EventScript_DefeatedTrainers:: @ 8269432 + msgbox Route109_SeashoreHouse_Text_TakeTheseSodaPopBottles, MSGBOX_DEFAULT giveitem_std ITEM_SODA_POP, 6 compare VAR_RESULT, 0 - goto_if_eq Route109_SeashoreHouse_EventScript_269456 + goto_if_eq Route109_SeashoreHouse_EventScript_BagFull setflag FLAG_RECEIVED_6_SODA_POP release end -Route109_SeashoreHouse_EventScript_269456:: @ 8269456 - msgbox Route109_SeashoreHouse_Text_26973A, MSGBOX_DEFAULT +Route109_SeashoreHouse_EventScript_BagFull:: @ 8269456 + msgbox Route109_SeashoreHouse_Text_BagFull, MSGBOX_DEFAULT release end -Route109_SeashoreHouse_EventScript_269460:: @ 8269460 +Route109_SeashoreHouse_EventScript_AlreadyReceivedSodaPop:: @ 8269460 showmoneybox 0, 0, 0 - msgbox Route109_SeashoreHouse_Text_26977E, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq Route109_SeashoreHouse_EventScript_269484 - msgbox Route109_SeashoreHouse_Text_2697EF, MSGBOX_DEFAULT + msgbox Route109_SeashoreHouse_Text_WantToBuySodaPop, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq Route109_SeashoreHouse_EventScript_BuySodaPop + msgbox Route109_SeashoreHouse_Text_ThatsTooBad, MSGBOX_DEFAULT hidemoneybox nop nop release end -Route109_SeashoreHouse_EventScript_269484:: @ 8269484 +Route109_SeashoreHouse_EventScript_BuySodaPop:: @ 8269484 checkmoney 300, 0 - compare VAR_RESULT, 0 - goto_if_eq Route109_SeashoreHouse_EventScript_2694C8 + compare VAR_RESULT, FALSE + goto_if_eq Route109_SeashoreHouse_EventScript_NotEnoughMoney checkitemspace ITEM_SODA_POP, 1 - compare VAR_RESULT, 0 - goto_if_eq Route109_SeashoreHouse_EventScript_2694D5 - msgbox Route109_SeashoreHouse_Text_2697C8, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + goto_if_eq Route109_SeashoreHouse_EventScript_NotEnoughSpace + msgbox Route109_SeashoreHouse_Text_HereYouGo, MSGBOX_DEFAULT takemoney 300, 0 updatemoneybox 0, 0 giveitem_std ITEM_SODA_POP @@ -65,15 +65,15 @@ Route109_SeashoreHouse_EventScript_269484:: @ 8269484 release end -Route109_SeashoreHouse_EventScript_2694C8:: @ 82694C8 - msgbox Route109_SeashoreHouse_Text_2697D5, MSGBOX_DEFAULT +Route109_SeashoreHouse_EventScript_NotEnoughMoney:: @ 82694C8 + msgbox Route109_SeashoreHouse_Text_NotEnoughMoney, MSGBOX_DEFAULT hidemoneybox nop nop release end -Route109_SeashoreHouse_EventScript_2694D5:: @ 82694D5 +Route109_SeashoreHouse_EventScript_NotEnoughSpace:: @ 82694D5 msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT hidemoneybox nop @@ -81,37 +81,37 @@ Route109_SeashoreHouse_EventScript_2694D5:: @ 82694D5 release end -Route109_SeashoreHouse_EventScript_2694E2:: @ 82694E2 - trainerbattle_single TRAINER_DWAYNE, Route109_SeashoreHouse_Text_269803, Route109_SeashoreHouse_Text_269867, Route109_SeashoreHouse_EventScript_269533 - msgbox Route109_SeashoreHouse_Text_26989D, MSGBOX_AUTOCLOSE +Route109_SeashoreHouse_EventScript_Dwayne:: @ 82694E2 + trainerbattle_single TRAINER_DWAYNE, Route109_SeashoreHouse_Text_DwayneIntro, Route109_SeashoreHouse_Text_DwayneDefeated, Route109_SeashoreHouse_EventScript_CheckTrainersCompletion + msgbox Route109_SeashoreHouse_Text_DwaynePostBattle, MSGBOX_AUTOCLOSE end -Route109_SeashoreHouse_EventScript_2694FD:: @ 82694FD - trainerbattle_single TRAINER_JOHANNA, Route109_SeashoreHouse_Text_2698E3, Route109_SeashoreHouse_Text_269947, Route109_SeashoreHouse_EventScript_269533 - msgbox Route109_SeashoreHouse_Text_269953, MSGBOX_AUTOCLOSE +Route109_SeashoreHouse_EventScript_Johanna:: @ 82694FD + trainerbattle_single TRAINER_JOHANNA, Route109_SeashoreHouse_Text_JohannaIntro, Route109_SeashoreHouse_Text_JohannaDefeated, Route109_SeashoreHouse_EventScript_CheckTrainersCompletion + msgbox Route109_SeashoreHouse_Text_JohannaPostBattle, MSGBOX_AUTOCLOSE end -Route109_SeashoreHouse_EventScript_269518:: @ 8269518 - trainerbattle_single TRAINER_SIMON, Route109_SeashoreHouse_Text_269986, Route109_SeashoreHouse_Text_2699C5, Route109_SeashoreHouse_EventScript_269533 - msgbox Route109_SeashoreHouse_Text_2699DF, MSGBOX_AUTOCLOSE +Route109_SeashoreHouse_EventScript_Simon:: @ 8269518 + trainerbattle_single TRAINER_SIMON, Route109_SeashoreHouse_Text_SimonIntro, Route109_SeashoreHouse_Text_SimonDefeated, Route109_SeashoreHouse_EventScript_CheckTrainersCompletion + msgbox Route109_SeashoreHouse_Text_SimonPostBattle, MSGBOX_AUTOCLOSE end -Route109_SeashoreHouse_EventScript_269533:: @ 8269533 +Route109_SeashoreHouse_EventScript_CheckTrainersCompletion:: @ 8269533 checktrainerflag TRAINER_DWAYNE - goto_if_lt Route109_SeashoreHouse_EventScript_269553 + goto_if_lt Route109_SeashoreHouse_EventScript_TrainersNotCompleted checktrainerflag TRAINER_JOHANNA - goto_if_lt Route109_SeashoreHouse_EventScript_269553 + goto_if_lt Route109_SeashoreHouse_EventScript_TrainersNotCompleted checktrainerflag TRAINER_SIMON - goto_if_lt Route109_SeashoreHouse_EventScript_269553 + goto_if_lt Route109_SeashoreHouse_EventScript_TrainersNotCompleted setflag FLAG_DEFEATED_SEASHORE_HOUSE release end -Route109_SeashoreHouse_EventScript_269553:: @ 8269553 +Route109_SeashoreHouse_EventScript_TrainersNotCompleted:: @ 8269553 release end -Route109_SeashoreHouse_Text_269555: @ 8269555 +Route109_SeashoreHouse_Text_SeashoreHouseIntro: @ 8269555 .string "I'm the owner of the SEASHORE HOUSE.\n" .string "But you can call me MR. SEA!\p" .string "What I love above all is to see hot\n" @@ -120,12 +120,12 @@ Route109_SeashoreHouse_Text_269555: @ 8269555 .string "If you can defeat all the TRAINERS\n" .string "here, I'll reward your efforts.$" -Route109_SeashoreHouse_Text_269635: @ 8269635 +Route109_SeashoreHouse_Text_ShowMeSomeHotMatches: @ 8269635 .string "Show me some hot matches!\p" .string "I run this SEASHORE HOUSE just for\n" .string "that reason alone!$" -Route109_SeashoreHouse_Text_269685: @ 8269685 +Route109_SeashoreHouse_Text_TakeTheseSodaPopBottles: @ 8269685 .string "You're scorching hot!\n" .string "Those battles blazed!\l" .string "I'm more than just satisfied!\p" @@ -133,59 +133,59 @@ Route109_SeashoreHouse_Text_269685: @ 8269685 .string "streak, I want you to take these.\p" .string "It's half a dozen bottles of SODA POP!$" -Route109_SeashoreHouse_Text_26973A: @ 826973A +Route109_SeashoreHouse_Text_BagFull: @ 826973A .string "Oh, but hey, your BAG's jammed full.\n" .string "I'll hang on to these for you.$" -Route109_SeashoreHouse_Text_26977E: @ 826977E +Route109_SeashoreHouse_Text_WantToBuySodaPop: @ 826977E .string "Want to buy some SODA POP?\n" .string "POKéMON love it!\p" .string "Just ¥300 a bottle!\n" .string "Buy some!$" -Route109_SeashoreHouse_Text_2697C8: @ 82697C8 +Route109_SeashoreHouse_Text_HereYouGo: @ 82697C8 .string "Here you go!$" -Route109_SeashoreHouse_Text_2697D5: @ 82697D5 +Route109_SeashoreHouse_Text_NotEnoughMoney: @ 82697D5 .string "You don't have the money.$" -Route109_SeashoreHouse_Text_2697EF: @ 82697EF +Route109_SeashoreHouse_Text_ThatsTooBad: @ 82697EF .string "No?\n" .string "That's too bad.$" -Route109_SeashoreHouse_Text_269803: @ 8269803 +Route109_SeashoreHouse_Text_DwayneIntro: @ 8269803 .string "If you're looking for a battle in the\n" .string "SEASHORE HOUSE, you'll find no\l" .string "hotter TRAINER than me, matey!$" -Route109_SeashoreHouse_Text_269867: @ 8269867 +Route109_SeashoreHouse_Text_DwayneDefeated: @ 8269867 .string "That was a hot battle!\n" .string "I can accept that loss, matey!$" -Route109_SeashoreHouse_Text_26989D: @ 826989D +Route109_SeashoreHouse_Text_DwaynePostBattle: @ 826989D .string "Whenever I'm in SLATEPORT, I enjoy\n" .string "hot battles and ice-cold SODA POP!$" -Route109_SeashoreHouse_Text_2698E3: @ 82698E3 +Route109_SeashoreHouse_Text_JohannaIntro: @ 82698E3 .string "Boring battles aren't worth the effort.\p" .string "Fiery hot battles are what toughen up\n" .string "TRAINERS and POKéMON!$" -Route109_SeashoreHouse_Text_269947: @ 8269947 +Route109_SeashoreHouse_Text_JohannaDefeated: @ 8269947 .string "That's hot!$" -Route109_SeashoreHouse_Text_269953: @ 8269953 +Route109_SeashoreHouse_Text_JohannaPostBattle: @ 8269953 .string "Whew, I'm all thirsty.\n" .string "Maybe I'll have a SODA POP.$" -Route109_SeashoreHouse_Text_269986: @ 8269986 +Route109_SeashoreHouse_Text_SimonIntro: @ 8269986 .string "I'm going to show you how great\n" .string "my POKéMON are, but don't cry!$" -Route109_SeashoreHouse_Text_2699C5: @ 82699C5 +Route109_SeashoreHouse_Text_SimonDefeated: @ 82699C5 .string "…I lost, but I won't cry…$" -Route109_SeashoreHouse_Text_2699DF: @ 82699DF +Route109_SeashoreHouse_Text_SimonPostBattle: @ 82699DF .string "If one of my POKéMON knew the move\n" .string "for carrying me across water on its\l" .string "back, I could get rid of this inner tube.$" diff --git a/data/maps/Route110/map.json b/data/maps/Route110/map.json index 570c38dcc..660f24ccc 100644 --- a/data/maps/Route110/map.json +++ b/data/maps/Route110/map.json @@ -40,7 +40,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_EventScript_1EF338", + "script": "Route110_EventScript_Boy2", "flag": "0" }, { @@ -53,7 +53,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_EventScript_1EF32F", + "script": "Route110_EventScript_CyclingGuy2", "flag": "0" }, { @@ -66,7 +66,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_EventScript_1EF326", + "script": "Route110_EventScript_OldWoman", "flag": "0" }, { @@ -79,7 +79,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_EventScript_1EF314", + "script": "Route110_EventScript_CyclingGuy1", "flag": "0" }, { @@ -92,7 +92,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_EventScript_1EF31D", + "script": "Route110_EventScript_OldMan", "flag": "0" }, { @@ -105,7 +105,7 @@ "movement_range_y": 3, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_EventScript_1EF30B", + "script": "Route110_EventScript_CyclingGirl1", "flag": "0" }, { @@ -118,7 +118,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_EventScript_1EF302", + "script": "Route110_EventScript_Boy1", "flag": "0" }, { @@ -131,7 +131,7 @@ "movement_range_y": 14, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route110_EventScript_1EF529", + "script": "Route110_EventScript_Jasmine", "flag": "0" }, { @@ -144,7 +144,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route110_EventScript_1EF4B0", + "script": "Route110_EventScript_Anthony", "flag": "0" }, { @@ -157,7 +157,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route110_EventScript_1EF540", + "script": "Route110_EventScript_Abigail", "flag": "0" }, { @@ -170,7 +170,7 @@ "movement_range_y": 4, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route110_EventScript_1EF4C7", + "script": "Route110_EventScript_Benjamin", "flag": "0" }, { @@ -183,7 +183,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "6", - "script": "Route110_EventScript_1EF3F2", + "script": "Route110_EventScript_Edward", "flag": "0" }, { @@ -196,7 +196,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route110_EventScript_1EF409", + "script": "Route110_EventScript_Jaclyn", "flag": "0" }, { @@ -209,7 +209,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route110_EventScript_1EF420", + "script": "Route110_EventScript_Edwin", "flag": "0" }, { @@ -222,7 +222,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route110_EventScript_1EF482", + "script": "Route110_EventScript_Dale", "flag": "0" }, { @@ -300,7 +300,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_EventScript_1EF3B7", + "script": "Route110_EventScript_ChallengeGuy", "flag": "0" }, { @@ -313,7 +313,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_EventScript_1EF2AA", + "script": "Route110_EventScript_AquaGrunt1", "flag": "FLAG_HIDE_ROUTE_110_TEAM_AQUA" }, { @@ -326,7 +326,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_EventScript_1EF2C0", + "script": "Route110_EventScript_AquaGrunt2", "flag": "FLAG_HIDE_ROUTE_110_TEAM_AQUA" }, { @@ -339,7 +339,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_EventScript_1EF2D6", + "script": "Route110_EventScript_AquaGrunt3", "flag": "FLAG_HIDE_ROUTE_110_TEAM_AQUA" }, { @@ -352,7 +352,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_EventScript_1EF2EC", + "script": "Route110_EventScript_AquaGrunt4", "flag": "FLAG_HIDE_ROUTE_110_TEAM_AQUA" }, { @@ -378,7 +378,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route110_EventScript_1EF499", + "script": "Route110_EventScript_Jacob", "flag": "0" }, { @@ -417,7 +417,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route110_EventScript_1EF604", + "script": "Route110_EventScript_Timmy", "flag": "0" }, { @@ -430,7 +430,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route110_EventScript_1EF5A2", + "script": "Route110_EventScript_Isabel", "flag": "0" }, { @@ -443,7 +443,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route110_EventScript_1EF61C", + "script": "Route110_EventScript_Kaleb", "flag": "0" }, { @@ -456,7 +456,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "6", - "script": "Route110_EventScript_1EF64A", + "script": "Route110_EventScript_Alyssa", "flag": "0" }, { @@ -469,7 +469,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route110_EventScript_1EF633", + "script": "Route110_EventScript_Joseph", "flag": "0" }, { @@ -551,7 +551,7 @@ "elevation": 3, "var": "VAR_CYCLING_CHALLENGE_STATE", "var_value": "2", - "script": "Route110_EventScript_1EF661" + "script": "Route110_EventScript_CyclingChallengeEnd" }, { "type": "trigger", @@ -560,7 +560,7 @@ "elevation": 3, "var": "VAR_CYCLING_CHALLENGE_STATE", "var_value": "2", - "script": "Route110_EventScript_1EF661" + "script": "Route110_EventScript_CyclingChallengeEnd" }, { "type": "trigger", @@ -569,7 +569,7 @@ "elevation": 3, "var": "VAR_ROUTE110_STATE", "var_value": "0", - "script": "Route110_EventScript_1EF74D" + "script": "Route110_EventScript_RivalTrigger1" }, { "type": "trigger", @@ -578,7 +578,7 @@ "elevation": 3, "var": "VAR_ROUTE110_STATE", "var_value": "0", - "script": "Route110_EventScript_1EF758" + "script": "Route110_EventScript_RivalTrigger2" }, { "type": "trigger", @@ -587,7 +587,7 @@ "elevation": 3, "var": "VAR_ROUTE110_STATE", "var_value": "0", - "script": "Route110_EventScript_1EF763" + "script": "Route110_EventScript_RivalTrigger3" }, { "type": "trigger", @@ -596,7 +596,7 @@ "elevation": 3, "var": "VAR_REGISTER_BIRCH_STATE", "var_value": "1", - "script": "Route110_EventScript_1EF9CB" + "script": "Route110_EventScript_BirchScene1" }, { "type": "trigger", @@ -605,7 +605,7 @@ "elevation": 3, "var": "VAR_REGISTER_BIRCH_STATE", "var_value": "1", - "script": "Route110_EventScript_1EF9D6" + "script": "Route110_EventScript_BirchScene2" }, { "type": "trigger", @@ -614,7 +614,7 @@ "elevation": 3, "var": "VAR_REGISTER_BIRCH_STATE", "var_value": "1", - "script": "Route110_EventScript_1EF9E1" + "script": "Route110_EventScript_BirchScene3" }, { "type": "trigger", @@ -623,7 +623,7 @@ "elevation": 3, "var": "VAR_REGISTER_BIRCH_STATE", "var_value": "1", - "script": "Route110_EventScript_1EF9EC" + "script": "Route110_EventScript_BirchScene4" } ], "bg_events": [ @@ -633,7 +633,7 @@ "y": 25, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route110_EventScript_1EF353" + "script": "Route110_EventScript_VandalizedSign" }, { "type": "sign", @@ -641,7 +641,7 @@ "y": 51, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route110_EventScript_1EF365" + "script": "Route110_EventScript_SeasideParkingSign" }, { "type": "sign", @@ -649,7 +649,7 @@ "y": 88, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route110_EventScript_1EF34A" + "script": "Route110_EventScript_CyclingRoadSign" }, { "type": "sign", @@ -657,7 +657,7 @@ "y": 94, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route110_EventScript_1EF341" + "script": "Route110_EventScript_SlateportCitySign" }, { "type": "sign", @@ -665,7 +665,7 @@ "y": 79, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route110_EventScript_1EF35C" + "script": "Route110_EventScript_Route103Sign" }, { "type": "sign", @@ -673,7 +673,7 @@ "y": 17, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route110_EventScript_1EF36E" + "script": "Route110_EventScript_MauvilleCitySign" }, { "type": "secret_base", @@ -695,7 +695,7 @@ "y": 39, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route110_EventScript_1EF377" + "script": "Route110_EventScript_TrainerTipsPrlzSleep" }, { "type": "sign", @@ -703,7 +703,7 @@ "y": 70, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route110_EventScript_1EF380" + "script": "Route110_EventScript_TrainerTipsRegisterItems" }, { "type": "sign", @@ -711,7 +711,7 @@ "y": 67, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route110_EventScript_1EF389" + "script": "Route110_EventScript_TrickHouseSign" }, { "type": "sign", @@ -719,7 +719,7 @@ "y": 93, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route110_EventScript_1EF392" + "script": "Route110_EventScript_CyclingRoadResultsSign" }, { "type": "hidden_item", @@ -759,7 +759,7 @@ "y": 16, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route110_EventScript_1EF34A" + "script": "Route110_EventScript_CyclingRoadSign" } ] } diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc index cafd99a9c..68ae1d573 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -1,10 +1,10 @@ Route110_MapScripts:: @ 81EF269 - map_script MAP_SCRIPT_ON_RESUME, Route110_MapScript1_1EF279 + map_script MAP_SCRIPT_ON_RESUME, Route110_OnResume map_script MAP_SCRIPT_ON_TRANSITION, Route110_OnTransition - map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_MapScript2_1EF297 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_OnFrame .byte 0 -Route110_MapScript1_1EF279: @ 81EF279 +Route110_OnResume: @ 81EF279 special UpdateCyclingRoadState end @@ -12,300 +12,300 @@ Route110_OnTransition: @ 81EF27D call Common_EventScript_SetupRivalGfxId call Common_EventScript_SetupRivalOnBikeGfxId compare VAR_CYCLING_CHALLENGE_STATE, 1 - call_if_eq Route110_EventScript_1EF293 + call_if_eq Route110_EventScript_SaveCyclingMusic end -Route110_EventScript_1EF293:: @ 81EF293 +Route110_EventScript_SaveCyclingMusic:: @ 81EF293 savebgm MUS_CYCLING return -Route110_MapScript2_1EF297: @ 81EF297 - map_script_2 VAR_CYCLING_CHALLENGE_STATE, 1, Route110_EventScript_1EF2A1 +Route110_OnFrame: @ 81EF297 + map_script_2 VAR_CYCLING_CHALLENGE_STATE, 1, Route110_EventScript_BeginCylcingRoadChallenge .2byte 0 -Route110_EventScript_1EF2A1:: @ 81EF2A1 +Route110_EventScript_BeginCylcingRoadChallenge:: @ 81EF2A1 special Special_BeginCyclingRoadChallenge setvar VAR_CYCLING_CHALLENGE_STATE, 2 return -Route110_EventScript_1EF2AA:: @ 81EF2AA +Route110_EventScript_AquaGrunt1:: @ 81EF2AA lock faceplayer - msgbox Route110_Text_1EFB5D, MSGBOX_DEFAULT + msgbox Route110_Text_WeCantTalkAboutAquaActivities, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end -Route110_EventScript_1EF2C0:: @ 81EF2C0 +Route110_EventScript_AquaGrunt2:: @ 81EF2C0 lock faceplayer - msgbox Route110_Text_1EFB93, MSGBOX_DEFAULT + msgbox Route110_Text_KickUpARuckus, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end -Route110_EventScript_1EF2D6:: @ 81EF2D6 +Route110_EventScript_AquaGrunt3:: @ 81EF2D6 lock faceplayer - msgbox Route110_Text_1EFBCA, MSGBOX_DEFAULT + msgbox Route110_Text_MyFirstJobInAqua, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end -Route110_EventScript_1EF2EC:: @ 81EF2EC +Route110_EventScript_AquaGrunt4:: @ 81EF2EC lock faceplayer - msgbox Route110_Text_1EFC0D, MSGBOX_DEFAULT + msgbox Route110_Text_AquaActionsBringSmiles, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end -Route110_EventScript_1EF302:: @ 81EF302 - msgbox Route110_Text_1EFFC3, MSGBOX_NPC +Route110_EventScript_Boy1:: @ 81EF302 + msgbox Route110_Text_RideBikeAtFullSpeed, MSGBOX_NPC end -Route110_EventScript_1EF30B:: @ 81EF30B - msgbox Route110_Text_1F0006, MSGBOX_NPC +Route110_EventScript_CyclingGirl1:: @ 81EF30B + msgbox Route110_Text_HairStreamsBehindMe, MSGBOX_NPC end -Route110_EventScript_1EF314:: @ 81EF314 - msgbox Route110_Text_1F006A, MSGBOX_NPC +Route110_EventScript_CyclingGuy1:: @ 81EF314 + msgbox Route110_Text_YouGotBikeFromRydel, MSGBOX_NPC end -Route110_EventScript_1EF31D:: @ 81EF31D - msgbox Route110_Text_1F0261, MSGBOX_NPC +Route110_EventScript_OldMan:: @ 81EF31D + msgbox Route110_Text_TwoRoads, MSGBOX_NPC end -Route110_EventScript_1EF326:: @ 81EF326 - msgbox Route110_Text_1F02CA, MSGBOX_NPC +Route110_EventScript_OldWoman:: @ 81EF326 + msgbox Route110_Text_WalkOnTheLowRoad, MSGBOX_NPC end -Route110_EventScript_1EF32F:: @ 81EF32F - msgbox Route110_Text_1F030E, MSGBOX_NPC +Route110_EventScript_CyclingGuy2:: @ 81EF32F + msgbox Route110_Text_BikeTechniques, MSGBOX_NPC end -Route110_EventScript_1EF338:: @ 81EF338 - msgbox Route110_Text_1F0390, MSGBOX_NPC +Route110_EventScript_Boy2:: @ 81EF338 + msgbox Route110_Text_WhichShouldIChoose, MSGBOX_NPC end -Route110_EventScript_1EF341:: @ 81EF341 - msgbox Route110_Text_1F0812, MSGBOX_SIGN +Route110_EventScript_SlateportCitySign:: @ 81EF341 + msgbox Route110_Text_SlateportCitySign, MSGBOX_SIGN end -Route110_EventScript_1EF34A:: @ 81EF34A - msgbox Route110_Text_1F082D, MSGBOX_SIGN +Route110_EventScript_CyclingRoadSign:: @ 81EF34A + msgbox Route110_Text_CyclingRoadSign, MSGBOX_SIGN end -Route110_EventScript_1EF353:: @ 81EF353 - msgbox Route110_Text_1F0842, MSGBOX_SIGN +Route110_EventScript_VandalizedSign:: @ 81EF353 + msgbox Route110_Text_AquaWasHere, MSGBOX_SIGN end -Route110_EventScript_1EF35C:: @ 81EF35C - msgbox Route110_Text_1F08CD, MSGBOX_SIGN +Route110_EventScript_Route103Sign:: @ 81EF35C + msgbox Route110_Text_Route103Sign, MSGBOX_SIGN end -Route110_EventScript_1EF365:: @ 81EF365 - msgbox Route110_Text_1F08E3, MSGBOX_SIGN +Route110_EventScript_SeasideParkingSign:: @ 81EF365 + msgbox Route110_Text_SeasideParkingSign, MSGBOX_SIGN end -Route110_EventScript_1EF36E:: @ 81EF36E - msgbox Route110_Text_1F08F3, MSGBOX_SIGN +Route110_EventScript_MauvilleCitySign:: @ 81EF36E + msgbox Route110_Text_MauvilleCitySign, MSGBOX_SIGN end -Route110_EventScript_1EF377:: @ 81EF377 - msgbox Route110_Text_1F090D, MSGBOX_SIGN +Route110_EventScript_TrainerTipsPrlzSleep:: @ 81EF377 + msgbox Route110_Text_TrainerTipsPrlzSleep, MSGBOX_SIGN end -Route110_EventScript_1EF380:: @ 81EF380 - msgbox Route110_Text_1F0992, MSGBOX_SIGN +Route110_EventScript_TrainerTipsRegisterItems:: @ 81EF380 + msgbox Route110_Text_TrainerTipsRegisterItems, MSGBOX_SIGN end -Route110_EventScript_1EF389:: @ 81EF389 - msgbox Route110_Text_1F09DB, MSGBOX_SIGN +Route110_EventScript_TrickHouseSign:: @ 81EF389 + msgbox Route110_Text_TrickHouseSign, MSGBOX_SIGN end -Route110_EventScript_1EF392:: @ 81EF392 +Route110_EventScript_CyclingRoadResultsSign:: @ 81EF392 lockall specialvar VAR_RESULT, GetRecordedCyclingRoadResults - compare VAR_RESULT, 0 - goto_if_eq Route110_EventScript_1EF3AD - msgbox Route110_Text_1F0A1E, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + goto_if_eq Route110_EventScript_NoRecordSet + msgbox Route110_Text_BestRecord, MSGBOX_DEFAULT releaseall end -Route110_EventScript_1EF3AD:: @ 81EF3AD - msgbox Route110_Text_1F0A5E, MSGBOX_DEFAULT +Route110_EventScript_NoRecordSet:: @ 81EF3AD + msgbox Route110_Text_ThereIsNoRecord, MSGBOX_DEFAULT releaseall end -Route110_EventScript_1EF3B7:: @ 81EF3B7 +Route110_EventScript_ChallengeGuy:: @ 81EF3B7 lock faceplayer specialvar VAR_RESULT, GetPlayerAvatarBike compare VAR_RESULT, 1 - goto_if_eq Route110_EventScript_1EF3E8 + goto_if_eq Route110_EventScript_PlayerRidingAcroBike compare VAR_CYCLING_CHALLENGE_STATE, 0 - goto_if_eq Route110_EventScript_1EF3DE - msgbox Route110_Text_1F06FB, MSGBOX_DEFAULT + goto_if_eq Route110_EventScript_PlayerNotRidingBike + msgbox Route110_Text_AlwaysAimHigher, MSGBOX_DEFAULT release end -Route110_EventScript_1EF3DE:: @ 81EF3DE - msgbox Route110_Text_1F0661, MSGBOX_DEFAULT +Route110_EventScript_PlayerNotRidingBike:: @ 81EF3DE + msgbox Route110_Text_RatedForNumberOfCollisions, MSGBOX_DEFAULT release end -Route110_EventScript_1EF3E8:: @ 81EF3E8 - msgbox Route110_Text_1F0755, MSGBOX_DEFAULT +Route110_EventScript_PlayerRidingAcroBike:: @ 81EF3E8 + msgbox Route110_Text_AcroBikesDoNotQualify, MSGBOX_DEFAULT release end -Route110_EventScript_1EF3F2:: @ 81EF3F2 - trainerbattle_single TRAINER_EDWARD, Route110_Text_29802B, Route110_Text_298064 - msgbox Route110_Text_29808A, MSGBOX_AUTOCLOSE +Route110_EventScript_Edward:: @ 81EF3F2 + trainerbattle_single TRAINER_EDWARD, Route110_Text_EdwardIntro, Route110_Text_EdwardDefeated + msgbox Route110_Text_EdwardPostBattle, MSGBOX_AUTOCLOSE end -Route110_EventScript_1EF409:: @ 81EF409 - trainerbattle_single TRAINER_JACLYN, Route110_Text_2980B9, Route110_Text_2980E5 - msgbox Route110_Text_2980F8, MSGBOX_AUTOCLOSE +Route110_EventScript_Jaclyn:: @ 81EF409 + trainerbattle_single TRAINER_JACLYN, Route110_Text_JaclynIntro, Route110_Text_JaclynDefeated + msgbox Route110_Text_JaclynPostBattle, MSGBOX_AUTOCLOSE end -Route110_EventScript_1EF420:: @ 81EF420 - trainerbattle_single TRAINER_EDWIN_1, Route110_Text_29815E, Route110_Text_29818F, Route110_EventScript_1EF44C +Route110_EventScript_Edwin:: @ 81EF420 + trainerbattle_single TRAINER_EDWIN_1, Route110_Text_EdwinIntro, Route110_Text_EdwinDefeated, Route110_EventScript_EdwinRegisterMatchCallAfterBattle specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route110_EventScript_1EF46B - msgbox Route110_Text_2981B3, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route110_EventScript_EdwinRematch + msgbox Route110_Text_EdwinPostBattle, MSGBOX_DEFAULT release end -Route110_EventScript_1EF44C:: @ 81EF44C +Route110_EventScript_EdwinRegisterMatchCallAfterBattle:: @ 81EF44C special sub_80B4808 waitmovement 0 - msgbox Route110_Text_298201, MSGBOX_DEFAULT + msgbox Route110_Text_EdwinRegister, MSGBOX_DEFAULT register_matchcall TRAINER_EDWIN_1 release end -Route110_EventScript_1EF46B:: @ 81EF46B - trainerbattle_rematch TRAINER_EDWIN_1, Route110_Text_298232, Route110_Text_298288 - msgbox Route110_Text_2982A2, MSGBOX_AUTOCLOSE +Route110_EventScript_EdwinRematch:: @ 81EF46B + trainerbattle_rematch TRAINER_EDWIN_1, Route110_Text_EdwinRematchIntro, Route110_Text_EdwinRematchDefeated + msgbox Route110_Text_EdwinRematchPostBattle, MSGBOX_AUTOCLOSE end -Route110_EventScript_1EF482:: @ 81EF482 - trainerbattle_single TRAINER_DALE, Route110_Text_2982CC, Route110_Text_2982F5 - msgbox Route110_Text_298303, MSGBOX_AUTOCLOSE +Route110_EventScript_Dale:: @ 81EF482 + trainerbattle_single TRAINER_DALE, Route110_Text_DaleIntro, Route110_Text_DaleDefeated + msgbox Route110_Text_DalePostBattle, MSGBOX_AUTOCLOSE end -Route110_EventScript_1EF499:: @ 81EF499 - trainerbattle_single TRAINER_JACOB, Route110_Text_297B3F, Route110_Text_297B77 - msgbox Route110_Text_297B8F, MSGBOX_AUTOCLOSE +Route110_EventScript_Jacob:: @ 81EF499 + trainerbattle_single TRAINER_JACOB, Route110_Text_JacobIntro, Route110_Text_JacobDefeated + msgbox Route110_Text_JacobPostBattle, MSGBOX_AUTOCLOSE end -Route110_EventScript_1EF4B0:: @ 81EF4B0 - trainerbattle_single TRAINER_ANTHONY, Route110_Text_297BE7, Route110_Text_297C0F - msgbox Route110_Text_297C1F, MSGBOX_AUTOCLOSE +Route110_EventScript_Anthony:: @ 81EF4B0 + trainerbattle_single TRAINER_ANTHONY, Route110_Text_AnthonyIntro, Route110_Text_AnthonyDefeated + msgbox Route110_Text_AnthonyPostBattle, MSGBOX_AUTOCLOSE end -Route110_EventScript_1EF4C7:: @ 81EF4C7 - trainerbattle_single TRAINER_BENJAMIN_1, Route110_Text_297C63, Route110_Text_297C8A, Route110_EventScript_1EF4F3 +Route110_EventScript_Benjamin:: @ 81EF4C7 + trainerbattle_single TRAINER_BENJAMIN_1, Route110_Text_BenjaminIntro, Route110_Text_BenjaminDefeated, Route110_EventScript_BenjaminRegisterMatchCallAfterBattle specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route110_EventScript_1EF512 - msgbox Route110_Text_297CB4, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route110_EventScript_BenjaminRematch + msgbox Route110_Text_BenjaminPostBattle, MSGBOX_DEFAULT release end -Route110_EventScript_1EF4F3:: @ 81EF4F3 +Route110_EventScript_BenjaminRegisterMatchCallAfterBattle:: @ 81EF4F3 special sub_80B4808 waitmovement 0 - msgbox Route110_Text_297CFE, MSGBOX_DEFAULT + msgbox Route110_Text_BenjaminRegister, MSGBOX_DEFAULT register_matchcall TRAINER_BENJAMIN_1 release end -Route110_EventScript_1EF512:: @ 81EF512 - trainerbattle_rematch TRAINER_BENJAMIN_1, Route110_Text_297D4B, Route110_Text_297D8E - msgbox Route110_Text_297DB0, MSGBOX_AUTOCLOSE +Route110_EventScript_BenjaminRematch:: @ 81EF512 + trainerbattle_rematch TRAINER_BENJAMIN_1, Route110_Text_BenjaminRematchIntro, Route110_Text_BenjaminRematchDefeated + msgbox Route110_Text_BenjaminRematchPostBattle, MSGBOX_AUTOCLOSE end -Route110_EventScript_1EF529:: @ 81EF529 - trainerbattle_single TRAINER_JASMINE, Route110_Text_297F93, Route110_Text_297FD0 - msgbox Route110_Text_297FF1, MSGBOX_AUTOCLOSE +Route110_EventScript_Jasmine:: @ 81EF529 + trainerbattle_single TRAINER_JASMINE, Route110_Text_JasmineIntro, Route110_Text_JasmineDefeated + msgbox Route110_Text_JasminePostBattle, MSGBOX_AUTOCLOSE end -Route110_EventScript_1EF540:: @ 81EF540 - trainerbattle_single TRAINER_ABIGAIL_1, Route110_Text_297DFA, Route110_Text_297E69, Route110_EventScript_1EF56C +Route110_EventScript_Abigail:: @ 81EF540 + trainerbattle_single TRAINER_ABIGAIL_1, Route110_Text_AbigailIntro, Route110_Text_AbigailDefeated, Route110_EventScript_AbigailRegisterMatchCallAfterBattle specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route110_EventScript_1EF58B - msgbox Route110_Text_297E88, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route110_EventScript_AbigailRematch + msgbox Route110_Text_AbigailPostBattle, MSGBOX_DEFAULT release end -Route110_EventScript_1EF56C:: @ 81EF56C +Route110_EventScript_AbigailRegisterMatchCallAfterBattle:: @ 81EF56C special sub_80B4808 waitmovement 0 - msgbox Route110_Text_297ECD, MSGBOX_DEFAULT + msgbox Route110_Text_AbigailRegister, MSGBOX_DEFAULT register_matchcall TRAINER_ABIGAIL_1 release end -Route110_EventScript_1EF58B:: @ 81EF58B - trainerbattle_rematch TRAINER_ABIGAIL_1, Route110_Text_297F09, Route110_Text_297F37 - msgbox Route110_Text_297F58, MSGBOX_AUTOCLOSE +Route110_EventScript_AbigailRematch:: @ 81EF58B + trainerbattle_rematch TRAINER_ABIGAIL_1, Route110_Text_AbigailRematchIntro, Route110_Text_AbigailRematchDefeated + msgbox Route110_Text_AbigailRematchPostBattle, MSGBOX_AUTOCLOSE end -Route110_EventScript_1EF5A2:: @ 81EF5A2 - trainerbattle_single TRAINER_ISABEL_1, Route110_Text_298349, Route110_Text_298389, Route110_EventScript_1EF5CE +Route110_EventScript_Isabel:: @ 81EF5A2 + trainerbattle_single TRAINER_ISABEL_1, Route110_Text_IsabelIntro, Route110_Text_IsabelDefeated, Route110_EventScript_IsabelRegisterMatchCallAfterBattle specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route110_EventScript_1EF5ED - msgbox Route110_Text_2983A2, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route110_EventScript_IsabelRematch + msgbox Route110_Text_IsabelPostBattle, MSGBOX_DEFAULT release end -Route110_EventScript_1EF5CE:: @ 81EF5CE +Route110_EventScript_IsabelRegisterMatchCallAfterBattle:: @ 81EF5CE special sub_80B4808 waitmovement 0 - msgbox Route110_Text_2983EE, MSGBOX_DEFAULT + msgbox Route110_Text_IsabelRegister, MSGBOX_DEFAULT register_matchcall TRAINER_ISABEL_1 release end -Route110_EventScript_1EF5ED:: @ 81EF5ED - trainerbattle_rematch TRAINER_ISABEL_1, Route110_Text_298466, Route110_Text_2984AF - msgbox Route110_Text_2984C8, MSGBOX_AUTOCLOSE +Route110_EventScript_IsabelRematch:: @ 81EF5ED + trainerbattle_rematch TRAINER_ISABEL_1, Route110_Text_IsabelRematchIntro, Route110_Text_IsabelRematchDefeated + msgbox Route110_Text_IsabelRematchPostBattle, MSGBOX_AUTOCLOSE end -Route110_EventScript_1EF604:: @ 81EF604 - trainerbattle_single TRAINER_TIMMY, Route110_Text_298525, Route110_Text_298559 - msgbox Route110_Text_298579, MSGBOX_AUTOCLOSE +Route110_EventScript_Timmy:: @ 81EF604 + trainerbattle_single TRAINER_TIMMY, Route110_Text_TimmyIntro, Route110_Text_TimmyDefeated + msgbox Route110_Text_TimmyPostBattle, MSGBOX_AUTOCLOSE end -Route110_EventScript_1EF61B:: @ 81EF61B +Route110_EventScript_Unused:: @ 81EF61B end -Route110_EventScript_1EF61C:: @ 81EF61C - trainerbattle_single TRAINER_KALEB, Route110_Text_2986ED, Route110_Text_298735 - msgbox Route110_Text_298755, MSGBOX_AUTOCLOSE +Route110_EventScript_Kaleb:: @ 81EF61C + trainerbattle_single TRAINER_KALEB, Route110_Text_KalebIntro, Route110_Text_KalebDefeated + msgbox Route110_Text_KalebPostBattle, MSGBOX_AUTOCLOSE end -Route110_EventScript_1EF633:: @ 81EF633 - trainerbattle_single TRAINER_JOSEPH, Route110_Text_298642, Route110_Text_298686 - msgbox Route110_Text_2986A9, MSGBOX_AUTOCLOSE +Route110_EventScript_Joseph:: @ 81EF633 + trainerbattle_single TRAINER_JOSEPH, Route110_Text_JosephIntro, Route110_Text_JosephDefeated + msgbox Route110_Text_JosephPostBattle, MSGBOX_AUTOCLOSE end -Route110_EventScript_1EF64A:: @ 81EF64A - trainerbattle_single TRAINER_ALYSSA, Route110_Text_2985AB, Route110_Text_2985F9 - msgbox Route110_Text_298612, MSGBOX_AUTOCLOSE +Route110_EventScript_Alyssa:: @ 81EF64A + trainerbattle_single TRAINER_ALYSSA, Route110_Text_AlyssaIntro, Route110_Text_AlyssaDefeated + msgbox Route110_Text_AlyssaPostBattle, MSGBOX_AUTOCLOSE end -Route110_EventScript_1EF661:: @ 81EF661 +Route110_EventScript_CyclingChallengeEnd:: @ 81EF661 lockall applymovement 21, Common_Movement_WalkInPlaceFastestRight waitmovement 0 @@ -315,74 +315,74 @@ Route110_EventScript_1EF661:: @ 81EF661 Route110_EventScript_1EF673:: @ 81EF673 special FinishCyclingRoadChallenge - msgbox Route110_Text_1F03FF, MSGBOX_DEFAULT + msgbox Route110_Text_CyclingChallengeResultSummary, MSGBOX_DEFAULT switch VAR_RESULT - case 10, Route110_EventScript_1EF6FD - case 9, Route110_EventScript_1EF70B - case 8, Route110_EventScript_1EF70B - case 7, Route110_EventScript_1EF70B - case 6, Route110_EventScript_1EF719 - case 5, Route110_EventScript_1EF719 - case 4, Route110_EventScript_1EF719 - case 3, Route110_EventScript_1EF727 - case 2, Route110_EventScript_1EF727 - case 1, Route110_EventScript_1EF727 - case 0, Route110_EventScript_1EF735 + case 10, Route110_EventScript_ChallengeReactionBest + case 9, Route110_EventScript_ChallengeReactionGood + case 8, Route110_EventScript_ChallengeReactionGood + case 7, Route110_EventScript_ChallengeReactionGood + case 6, Route110_EventScript_ChallengeReactionOk + case 5, Route110_EventScript_ChallengeReactionOk + case 4, Route110_EventScript_ChallengeReactionOk + case 3, Route110_EventScript_ChallengeReactionBad + case 2, Route110_EventScript_ChallengeReactionBad + case 1, Route110_EventScript_ChallengeReactionBad + case 0, Route110_EventScript_ChallengeReactionWorst end -Route110_EventScript_1EF6FD:: @ 81EF6FD - msgbox Route110_Text_1F0431, MSGBOX_DEFAULT - goto Route110_EventScript_1EF743 +Route110_EventScript_ChallengeReactionBest:: @ 81EF6FD + msgbox Route110_Text_ChallengeReactionBest, MSGBOX_DEFAULT + goto Route110_EventScript_EndChallenge end -Route110_EventScript_1EF70B:: @ 81EF70B - msgbox Route110_Text_1F04A4, MSGBOX_DEFAULT - goto Route110_EventScript_1EF743 +Route110_EventScript_ChallengeReactionGood:: @ 81EF70B + msgbox Route110_Text_ChallengeReactionGood, MSGBOX_DEFAULT + goto Route110_EventScript_EndChallenge end -Route110_EventScript_1EF719:: @ 81EF719 - msgbox Route110_Text_1F0500, MSGBOX_DEFAULT - goto Route110_EventScript_1EF743 +Route110_EventScript_ChallengeReactionOk:: @ 81EF719 + msgbox Route110_Text_ChallengeReactionOk, MSGBOX_DEFAULT + goto Route110_EventScript_EndChallenge end -Route110_EventScript_1EF727:: @ 81EF727 - msgbox Route110_Text_1F0567, MSGBOX_DEFAULT - goto Route110_EventScript_1EF743 +Route110_EventScript_ChallengeReactionBad:: @ 81EF727 + msgbox Route110_Text_ChallengeReactionBad, MSGBOX_DEFAULT + goto Route110_EventScript_EndChallenge end -Route110_EventScript_1EF735:: @ 81EF735 - msgbox Route110_Text_1F05CE, MSGBOX_DEFAULT - goto Route110_EventScript_1EF743 +Route110_EventScript_ChallengeReactionWorst:: @ 81EF735 + msgbox Route110_Text_ChallengeReactionWorst, MSGBOX_DEFAULT + goto Route110_EventScript_EndChallenge end -Route110_EventScript_1EF743:: @ 81EF743 +Route110_EventScript_EndChallenge:: @ 81EF743 setvar VAR_CYCLING_CHALLENGE_STATE, 3 savebgm MUS_DUMMY fadedefaultbgm return -Route110_EventScript_1EF74D:: @ 81EF74D +Route110_EventScript_RivalTrigger1:: @ 81EF74D setvar VAR_0x8008, 1 - goto Route110_EventScript_1EF76E + goto Route110_EventScript_RivalScene end -Route110_EventScript_1EF758:: @ 81EF758 +Route110_EventScript_RivalTrigger2:: @ 81EF758 setvar VAR_0x8008, 2 - goto Route110_EventScript_1EF76E + goto Route110_EventScript_RivalScene end -Route110_EventScript_1EF763:: @ 81EF763 +Route110_EventScript_RivalTrigger3:: @ 81EF763 setvar VAR_0x8008, 3 - goto Route110_EventScript_1EF76E + goto Route110_EventScript_RivalScene end -Route110_EventScript_1EF76E:: @ 81EF76E +Route110_EventScript_RivalScene:: @ 81EF76E lockall checkplayergender compare VAR_RESULT, MALE - call_if_eq Route110_EventScript_1EF7E1 + call_if_eq Route110_EventScript_PlayMayMusic compare VAR_RESULT, FEMALE - call_if_eq Route110_EventScript_1EF7E6 + call_if_eq Route110_EventScript_PlayBrendanMusic applymovement 28, Common_Movement_WalkInPlaceFastestDown waitmovement 0 applymovement 28, Common_Movement_ExclamationMark @@ -391,110 +391,110 @@ Route110_EventScript_1EF76E:: @ 81EF76E waitmovement 0 delay 30 compare VAR_0x8008, 1 - call_if_eq Route110_EventScript_1EF94E + call_if_eq Route110_EventScript_RivalApproachPlayer1 compare VAR_0x8008, 2 - call_if_eq Route110_EventScript_1EF959 + call_if_eq Route110_EventScript_RivalApproachPlayer2 compare VAR_0x8008, 3 - call_if_eq Route110_EventScript_1EF964 + call_if_eq Route110_EventScript_RivalApproachPlayer3 checkplayergender compare VAR_RESULT, MALE - goto_if_eq Route110_EventScript_1EF7EB + goto_if_eq Route110_EventScript_MayBattle compare VAR_RESULT, FEMALE - goto_if_eq Route110_EventScript_1EF865 + goto_if_eq Route110_EventScript_BrendanBattle releaseall end -Route110_EventScript_1EF7E1:: @ 81EF7E1 +Route110_EventScript_PlayMayMusic:: @ 81EF7E1 playbgm MUS_GIRL_SUP, 1 return -Route110_EventScript_1EF7E6:: @ 81EF7E6 +Route110_EventScript_PlayBrendanMusic:: @ 81EF7E6 playbgm MUS_BOY_SUP, 1 return -Route110_EventScript_1EF7EB:: @ 81EF7EB - msgbox Route110_Text_1EFC48, MSGBOX_DEFAULT +Route110_EventScript_MayBattle:: @ 81EF7EB + msgbox Route110_Text_MayLetsBattle, MSGBOX_DEFAULT switch VAR_STARTER_MON - case 0, Route110_EventScript_1EF81A - case 1, Route110_EventScript_1EF82A - case 2, Route110_EventScript_1EF83A + case 0, Route110_EventScript_MayBattleTreecko + case 1, Route110_EventScript_MayBattleTorchic + case 2, Route110_EventScript_MayBattleMudkip end -Route110_EventScript_1EF81A:: @ 81EF81A - trainerbattle_no_intro TRAINER_MAY_5, Route110_Text_1EFCCB - goto Route110_EventScript_1EF84A +Route110_EventScript_MayBattleTreecko:: @ 81EF81A + trainerbattle_no_intro TRAINER_MAY_5, Route110_Text_MayDefeated + goto Route110_EventScript_MayDefeated end -Route110_EventScript_1EF82A:: @ 81EF82A - trainerbattle_no_intro TRAINER_MAY_8, Route110_Text_1EFCCB - goto Route110_EventScript_1EF84A +Route110_EventScript_MayBattleTorchic:: @ 81EF82A + trainerbattle_no_intro TRAINER_MAY_8, Route110_Text_MayDefeated + goto Route110_EventScript_MayDefeated end -Route110_EventScript_1EF83A:: @ 81EF83A - trainerbattle_no_intro TRAINER_MAY_2, Route110_Text_1EFCCB - goto Route110_EventScript_1EF84A +Route110_EventScript_MayBattleMudkip:: @ 81EF83A + trainerbattle_no_intro TRAINER_MAY_2, Route110_Text_MayDefeated + goto Route110_EventScript_MayDefeated end -Route110_EventScript_1EF84A:: @ 81EF84A - msgbox Route110_Text_1EFCF1, MSGBOX_DEFAULT - call Route110_EventScript_1EF8DF - msgbox Route110_Text_1EFD58, MSGBOX_DEFAULT - goto Route110_EventScript_1EF8EC +Route110_EventScript_MayDefeated:: @ 81EF84A + msgbox Route110_Text_MayTakeThis, MSGBOX_DEFAULT + call Route110_EventScript_GiveItemfinder + msgbox Route110_Text_MayExplainItemfinder, MSGBOX_DEFAULT + goto Route110_EventScript_RivalExit end -Route110_EventScript_1EF865:: @ 81EF865 - msgbox Route110_Text_1EFE3F, MSGBOX_DEFAULT +Route110_EventScript_BrendanBattle:: @ 81EF865 + msgbox Route110_Text_BrendayLetsBattle, MSGBOX_DEFAULT switch VAR_STARTER_MON - case 0, Route110_EventScript_1EF894 - case 1, Route110_EventScript_1EF8A4 - case 2, Route110_EventScript_1EF8B4 + case 0, Route110_EventScript_BrendanBattleTreecko + case 1, Route110_EventScript_BrendanBattleTorchic + case 2, Route110_EventScript_BrendanBattleMudkip end -Route110_EventScript_1EF894:: @ 81EF894 - trainerbattle_no_intro TRAINER_BRENDAN_5, Route110_Text_1EFEB4 - goto Route110_EventScript_1EF8C4 +Route110_EventScript_BrendanBattleTreecko:: @ 81EF894 + trainerbattle_no_intro TRAINER_BRENDAN_5, Route110_Text_BrendanDefeated + goto Route110_EventScript_BrendanDefeated end -Route110_EventScript_1EF8A4:: @ 81EF8A4 - trainerbattle_no_intro TRAINER_BRENDAN_8, Route110_Text_1EFEB4 - goto Route110_EventScript_1EF8C4 +Route110_EventScript_BrendanBattleTorchic:: @ 81EF8A4 + trainerbattle_no_intro TRAINER_BRENDAN_8, Route110_Text_BrendanDefeated + goto Route110_EventScript_BrendanDefeated end -Route110_EventScript_1EF8B4:: @ 81EF8B4 - trainerbattle_no_intro TRAINER_BRENDAN_2, Route110_Text_1EFEB4 - goto Route110_EventScript_1EF8C4 +Route110_EventScript_BrendanBattleMudkip:: @ 81EF8B4 + trainerbattle_no_intro TRAINER_BRENDAN_2, Route110_Text_BrendanDefeated + goto Route110_EventScript_BrendanDefeated end -Route110_EventScript_1EF8C4:: @ 81EF8C4 - msgbox Route110_Text_1EFECD, MSGBOX_DEFAULT - call Route110_EventScript_1EF8DF - msgbox Route110_Text_1EFF1C, MSGBOX_DEFAULT - goto Route110_EventScript_1EF8EC +Route110_EventScript_BrendanDefeated:: @ 81EF8C4 + msgbox Route110_Text_BrendanTakeThis, MSGBOX_DEFAULT + call Route110_EventScript_GiveItemfinder + msgbox Route110_Text_BrendanExplainItemfinder, MSGBOX_DEFAULT + goto Route110_EventScript_RivalExit end -Route110_EventScript_1EF8DF:: @ 81EF8DF +Route110_EventScript_GiveItemfinder:: @ 81EF8DF giveitem_std ITEM_ITEMFINDER return -Route110_EventScript_1EF8EC:: @ 81EF8EC +Route110_EventScript_RivalExit:: @ 81EF8EC closemessage compare VAR_0x8008, 1 - call_if_eq Route110_EventScript_1EF990 + call_if_eq Route110_EventScript_MoveRival1 compare VAR_0x8008, 2 - call_if_eq Route110_EventScript_1EF998 + call_if_eq Route110_EventScript_MoveRival2 compare VAR_0x8008, 3 - call_if_eq Route110_EventScript_1EF9A0 + call_if_eq Route110_EventScript_MoveRival3 setobjectmovementtype 28, MOVEMENT_TYPE_FACE_RIGHT setobjectmovementtype 29, MOVEMENT_TYPE_FACE_RIGHT removeobject 28 addobject 29 delay 45 compare VAR_0x8008, 1 - call_if_eq Route110_EventScript_1EF96F + call_if_eq Route110_EventScript_RivalExit1 compare VAR_0x8008, 2 - call_if_eq Route110_EventScript_1EF97A + call_if_eq Route110_EventScript_RivalExit2 compare VAR_0x8008, 3 - call_if_eq Route110_EventScript_1EF985 + call_if_eq Route110_EventScript_RivalExit3 removeobject 29 setvar VAR_ROUTE110_STATE, 1 savebgm MUS_DUMMY @@ -502,65 +502,65 @@ Route110_EventScript_1EF8EC:: @ 81EF8EC releaseall end -Route110_EventScript_1EF94E:: @ 81EF94E - applymovement 28, Route110_Movement_1EF9A8 +Route110_EventScript_RivalApproachPlayer1:: @ 81EF94E + applymovement 28, Route110_Movement_RivalApproachPlayer1 waitmovement 0 return -Route110_EventScript_1EF959:: @ 81EF959 - applymovement 28, Route110_Movement_1EF9AC +Route110_EventScript_RivalApproachPlayer2:: @ 81EF959 + applymovement 28, Route110_Movement_RivalApproachPlayer2 waitmovement 0 return -Route110_EventScript_1EF964:: @ 81EF964 - applymovement 28, Route110_Movement_1EF9AE +Route110_EventScript_RivalApproachPlayer3:: @ 81EF964 + applymovement 28, Route110_Movement_RivalApproachPlayer3 waitmovement 0 return -Route110_EventScript_1EF96F:: @ 81EF96F - applymovement 29, Route110_Movement_1EF9B2 +Route110_EventScript_RivalExit1:: @ 81EF96F + applymovement 29, Route110_Movement_RivalExit1 waitmovement 0 return -Route110_EventScript_1EF97A:: @ 81EF97A - applymovement 29, Route110_Movement_1EF9BA +Route110_EventScript_RivalExit2:: @ 81EF97A + applymovement 29, Route110_Movement_RivalExit2 waitmovement 0 return -Route110_EventScript_1EF985:: @ 81EF985 - applymovement 29, Route110_Movement_1EF9C3 +Route110_EventScript_RivalExit3:: @ 81EF985 + applymovement 29, Route110_Movement_RivalExit3 waitmovement 0 return -Route110_EventScript_1EF990:: @ 81EF990 +Route110_EventScript_MoveRival1:: @ 81EF990 setobjectxyperm 29, 33, 55 return -Route110_EventScript_1EF998:: @ 81EF998 +Route110_EventScript_MoveRival2:: @ 81EF998 setobjectxyperm 29, 34, 55 return -Route110_EventScript_1EF9A0:: @ 81EF9A0 +Route110_EventScript_MoveRival3:: @ 81EF9A0 setobjectxyperm 29, 35, 55 return -Route110_Movement_1EF9A8: @ 81EF9A8 +Route110_Movement_RivalApproachPlayer1: @ 81EF9A8 walk_down walk_left walk_in_place_fastest_down step_end -Route110_Movement_1EF9AC: @ 81EF9AC +Route110_Movement_RivalApproachPlayer2: @ 81EF9AC walk_down step_end -Route110_Movement_1EF9AE: @ 81EF9AE +Route110_Movement_RivalApproachPlayer3: @ 81EF9AE walk_down walk_right walk_in_place_fastest_down step_end -Route110_Movement_1EF9B2: @ 81EF9B2 +Route110_Movement_RivalExit1: @ 81EF9B2 walk_fast_up walk_fast_up walk_fast_up @@ -570,7 +570,7 @@ Route110_Movement_1EF9B2: @ 81EF9B2 walk_fast_up step_end -Route110_Movement_1EF9BA: @ 81EF9BA +Route110_Movement_RivalExit2: @ 81EF9BA walk_fast_up walk_fast_up walk_fast_up @@ -581,7 +581,7 @@ Route110_Movement_1EF9BA: @ 81EF9BA walk_fast_down step_end -Route110_Movement_1EF9C3: @ 81EF9C3 +Route110_Movement_RivalExit3: @ 81EF9C3 walk_fast_up walk_fast_up walk_fast_up @@ -591,29 +591,29 @@ Route110_Movement_1EF9C3: @ 81EF9C3 walk_fast_up step_end -Route110_EventScript_1EF9CB:: @ 81EF9CB +Route110_EventScript_BirchScene1:: @ 81EF9CB lockall setvar VAR_0x8008, 1 - goto Route110_EventScript_1EF9F7 + goto Route110_EventScript_BirchScene -Route110_EventScript_1EF9D6:: @ 81EF9D6 +Route110_EventScript_BirchScene2:: @ 81EF9D6 lockall setvar VAR_0x8008, 2 - goto Route110_EventScript_1EF9F7 + goto Route110_EventScript_BirchScene -Route110_EventScript_1EF9E1:: @ 81EF9E1 +Route110_EventScript_BirchScene3:: @ 81EF9E1 lockall setvar VAR_0x8008, 3 - goto Route110_EventScript_1EF9F7 + goto Route110_EventScript_BirchScene -Route110_EventScript_1EF9EC:: @ 81EF9EC +Route110_EventScript_BirchScene4:: @ 81EF9EC lockall setvar VAR_0x8008, 4 - goto Route110_EventScript_1EF9F7 + goto Route110_EventScript_BirchScene -Route110_EventScript_1EF9F7:: @ 81EF9F7 +Route110_EventScript_BirchScene:: @ 81EF9F7 addobject 36 - applymovement 36, Route110_Movement_1EFB30 + applymovement 36, Route110_Movement_BirchEntrance waitmovement 0 playse SE_PIN applymovement 36, Common_Movement_ExclamationMark @@ -621,14 +621,14 @@ Route110_EventScript_1EF9F7:: @ 81EF9F7 applymovement 36, Common_Movement_Delay48 waitmovement 0 compare VAR_0x8008, 1 - call_if_eq Route110_EventScript_1EFAD8 + call_if_eq Route110_EventScript_BirchApproachPlayer1 compare VAR_0x8008, 2 - call_if_eq Route110_EventScript_1EFAE3 + call_if_eq Route110_EventScript_BirchApproachPlayer2 compare VAR_0x8008, 3 - call_if_eq Route110_EventScript_1EFAEE + call_if_eq Route110_EventScript_BirchApproachPlayer3 compare VAR_0x8008, 4 - call_if_eq Route110_EventScript_1EFAF9 - msgbox Route110_Text_1F0AB5, MSGBOX_DEFAULT + call_if_eq Route110_EventScript_BirchApproachPlayer4 + msgbox Route110_Text_ImagineSeeingYouHere, MSGBOX_DEFAULT closemessage delay 20 applymovement 36, Common_Movement_WalkInPlaceFastestLeft @@ -640,101 +640,101 @@ Route110_EventScript_1EF9F7:: @ 81EF9F7 applymovement 36, Common_Movement_WalkInPlaceFastestDown waitmovement 0 delay 30 - msgbox Route110_Text_1F0AFF, MSGBOX_DEFAULT + msgbox Route110_Text_HeardYouInstallMatchCall, MSGBOX_DEFAULT closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox Route110_Text_1F0C0C, MSGBOX_DEFAULT + msgbox Route110_Text_RegisteredBirchInPokenav, MSGBOX_DEFAULT waitfanfare closemessage delay 30 setflag FLAG_ENABLE_PROF_BIRCH_MATCH_CALL - msgbox Route110_Text_1F0C33, MSGBOX_DEFAULT + msgbox Route110_Text_KeepAnEyeOutForRival, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 1 - call_if_eq Route110_EventScript_1EFB04 + call_if_eq Route110_EventScript_BirchExit1 compare VAR_0x8008, 2 - call_if_eq Route110_EventScript_1EFB0F + call_if_eq Route110_EventScript_BirchExit2 compare VAR_0x8008, 3 - call_if_eq Route110_EventScript_1EFB1A + call_if_eq Route110_EventScript_BirchExit3 compare VAR_0x8008, 4 - call_if_eq Route110_EventScript_1EFB25 + call_if_eq Route110_EventScript_BirchExit4 removeobject 36 setvar VAR_REGISTER_BIRCH_STATE, 2 releaseall end -Route110_EventScript_1EFAD8:: @ 81EFAD8 - applymovement 36, Route110_Movement_1EFB34 +Route110_EventScript_BirchApproachPlayer1:: @ 81EFAD8 + applymovement 36, Route110_Movement_BirchApproachPlayer1 waitmovement 0 return -Route110_EventScript_1EFAE3:: @ 81EFAE3 - applymovement 36, Route110_Movement_1EFB39 +Route110_EventScript_BirchApproachPlayer2:: @ 81EFAE3 + applymovement 36, Route110_Movement_BirchApproachPlayer2 waitmovement 0 return -Route110_EventScript_1EFAEE:: @ 81EFAEE - applymovement 36, Route110_Movement_1EFB3D +Route110_EventScript_BirchApproachPlayer3:: @ 81EFAEE + applymovement 36, Route110_Movement_BirchApproachPlayer3 waitmovement 0 return -Route110_EventScript_1EFAF9:: @ 81EFAF9 - applymovement 36, Route110_Movement_1EFB40 +Route110_EventScript_BirchApproachPlayer4:: @ 81EFAF9 + applymovement 36, Route110_Movement_BirchApproachPlayer4 waitmovement 0 return -Route110_EventScript_1EFB04:: @ 81EFB04 - applymovement 36, Route110_Movement_1EFB44 +Route110_EventScript_BirchExit1:: @ 81EFB04 + applymovement 36, Route110_Movement_BirchExit1 waitmovement 0 return -Route110_EventScript_1EFB0F:: @ 81EFB0F - applymovement 36, Route110_Movement_1EFB4B +Route110_EventScript_BirchExit2:: @ 81EFB0F + applymovement 36, Route110_Movement_BirchExit2 waitmovement 0 return -Route110_EventScript_1EFB1A:: @ 81EFB1A - applymovement 36, Route110_Movement_1EFB51 +Route110_EventScript_BirchExit3:: @ 81EFB1A + applymovement 36, Route110_Movement_BirchExit3 waitmovement 0 return -Route110_EventScript_1EFB25:: @ 81EFB25 - applymovement 36, Route110_Movement_1EFB57 +Route110_EventScript_BirchExit4:: @ 81EFB25 + applymovement 36, Route110_Movement_BirchExit4 waitmovement 0 return -Route110_Movement_1EFB30: @ 81EFB30 +Route110_Movement_BirchEntrance: @ 81EFB30 walk_down walk_down walk_down step_end -Route110_Movement_1EFB34: @ 81EFB34 +Route110_Movement_BirchApproachPlayer1: @ 81EFB34 walk_down walk_left walk_left walk_down step_end -Route110_Movement_1EFB39: @ 81EFB39 +Route110_Movement_BirchApproachPlayer2: @ 81EFB39 walk_down walk_left walk_down step_end -Route110_Movement_1EFB3D: @ 81EFB3D +Route110_Movement_BirchApproachPlayer3: @ 81EFB3D walk_down walk_down step_end -Route110_Movement_1EFB40: @ 81EFB40 +Route110_Movement_BirchApproachPlayer4: @ 81EFB40 walk_down walk_right walk_down step_end -Route110_Movement_1EFB44: @ 81EFB44 +Route110_Movement_BirchExit1: @ 81EFB44 walk_up walk_up walk_right @@ -743,7 +743,7 @@ Route110_Movement_1EFB44: @ 81EFB44 walk_up step_end -Route110_Movement_1EFB4B: @ 81EFB4B +Route110_Movement_BirchExit2: @ 81EFB4B walk_up walk_up walk_up @@ -751,7 +751,7 @@ Route110_Movement_1EFB4B: @ 81EFB4B walk_up step_end -Route110_Movement_1EFB51: @ 81EFB51 +Route110_Movement_BirchExit3: @ 81EFB51 walk_up walk_up walk_up @@ -759,7 +759,7 @@ Route110_Movement_1EFB51: @ 81EFB51 walk_up step_end -Route110_Movement_1EFB57: @ 81EFB57 +Route110_Movement_BirchExit4: @ 81EFB57 walk_up walk_up walk_up @@ -767,40 +767,40 @@ Route110_Movement_1EFB57: @ 81EFB57 walk_up step_end -Route110_Text_1EFB5D: @ 81EFB5D +Route110_Text_WeCantTalkAboutAquaActivities: @ 81EFB5D .string "TEAM AQUA's activities…\n" .string "We can't talk about them yet.$" -Route110_Text_1EFB93: @ 81EFB93 +Route110_Text_KickUpARuckus: @ 81EFB93 .string "I want to get going to SLATEPORT and\n" .string "kick up a ruckus!$" -Route110_Text_1EFBCA: @ 81EFBCA +Route110_Text_MyFirstJobInAqua: @ 81EFBCA .string "This is my first job after joining\n" .string "TEAM AQUA. It's a little scary.$" -Route110_Text_1EFC0D: @ 81EFC0D +Route110_Text_AquaActionsBringSmiles: @ 81EFC0D .string "TEAM AQUA's actions should bring\n" .string "smiles to people's faces!$" -Route110_Text_1EFC48: @ 81EFC48 +Route110_Text_MayLetsBattle: @ 81EFC48 .string "MAY: Hi, {PLAYER}{KUN}, long time no see!\p" .string "While I was searching for other\n" .string "POKéMON, my POKéMON grew stronger.\p" .string "So…\n" .string "How about a little battle?$" -Route110_Text_1EFCCB: @ 81EFCCB +Route110_Text_MayDefeated: @ 81EFCCB .string "Yikes!\n" .string "You're better than I expected!$" -Route110_Text_1EFCF1: @ 81EFCF1 +Route110_Text_MayTakeThis: @ 81EFCF1 .string "MAY: {PLAYER}{KUN}, you've been busy\n" .string "training, too, haven't you?\p" .string "I think you deserve a reward!\n" .string "This is from me!$" -Route110_Text_1EFD58: @ 81EFD58 +Route110_Text_MayExplainItemfinder: @ 81EFD58 .string "MAY: That's an ITEMFINDER.\p" .string "Try it out. If there is an item that's\n" .string "not visible, it emits a sound.\p" @@ -809,24 +809,24 @@ Route110_Text_1EFD58: @ 81EFD58 .string "me, but I think you should train a lot\l" .string "harder for the next time.$" -Route110_Text_1EFE3F: @ 81EFE3F +Route110_Text_BrendayLetsBattle: @ 81EFE3F .string "BRENDAN: Hey, {PLAYER}.\n" .string "So this is where you were.\l" .string "How's it going?\p" .string "Have you been raising your POKéMON?\n" .string "I'll check for you.$" -Route110_Text_1EFEB4: @ 81EFEB4 +Route110_Text_BrendanDefeated: @ 81EFEB4 .string "Hmm…\n" .string "You're pretty good.$" -Route110_Text_1EFECD: @ 81EFECD +Route110_Text_BrendanTakeThis: @ 81EFECD .string "BRENDAN: {PLAYER}, you've trained\n" .string "without me noticing…\p" .string "Good enough!\n" .string "Here, take this.$" -Route110_Text_1EFF1C: @ 81EFF1C +Route110_Text_BrendanExplainItemfinder: @ 81EFF1C .string "BRENDAN: That's an ITEMFINDER.\p" .string "Use it to root around for items that\n" .string "aren't visible.\p" @@ -835,16 +835,16 @@ Route110_Text_1EFF1C: @ 81EFF1C .string "Anyway, I'm off to look for new\n" .string "POKéMON.$" -Route110_Text_1EFFC3: @ 81EFFC3 +Route110_Text_RideBikeAtFullSpeed: @ 81EFFC3 .string "Wouldn't it be great to ride a BIKE\n" .string "at full speed on CYCLING ROAD?$" -Route110_Text_1F0006: @ 81F0006 +Route110_Text_HairStreamsBehindMe: @ 81F0006 .string "How do you like the way my raven-\n" .string "colored hair streams behind me?\p" .string "I grew my hair out just for that.$" -Route110_Text_1F006A: @ 81F006A +Route110_Text_YouGotBikeFromRydel: @ 81F006A .string "Oh, hey, you got that BIKE from RYDEL!\p" .string "Oh, it's glaringly obvious.\n" .string "It says right on your bike…\p" @@ -861,139 +861,139 @@ Route110_Text_1F006A: @ 81F006A .string "You should ride it around all over\n" .string "the place--it's good advertising!$" -Route110_Text_1F0261: @ 81F0261 +Route110_Text_TwoRoads: @ 81F0261 .string "The two roads, one above, one below…\p" .string "A road each for people and POKéMON.\n" .string "Perhaps that is right and fair.$" -Route110_Text_1F02CA: @ 81F02CA +Route110_Text_WalkOnTheLowRoad: @ 81F02CA .string "I don't have a BIKE, so I'll take\n" .string "a leisurely walk on the low road.$" -Route110_Text_1F030E: @ 81F030E +Route110_Text_BikeTechniques: @ 81F030E .string "Learning techniques will make BIKE\n" .string "riding even more fun.\p" .string "There are some places that you can\n" .string "reach only by using a BIKE technique.$" -Route110_Text_1F0390: @ 81F0390 +Route110_Text_WhichShouldIChoose: @ 81F0390 .string "Which should I choose?\p" .string "Make a beeline for MAUVILLE on\n" .string "CYCLING ROAD, or take the low road\l" .string "and look for POKéMON?$" -Route110_Text_1F03FF: @ 81F03FF +Route110_Text_CyclingChallengeResultSummary: @ 81F03FF .string "Number of collisions:\n" .string "… … {STR_VAR_1}!\p" .string "Total time:\n" .string "… … {STR_VAR_2}!$" -Route110_Text_1F0431: @ 81F0431 +Route110_Text_ChallengeReactionBest: @ 81F0431 .string "Bravo! Splendid showing!\p" .string "Your love of cycling comes from deep\n" .string "within your heart.\l" .string "You've shaken me to my very soul!$" -Route110_Text_1F04A4: @ 81F04A4 +Route110_Text_ChallengeReactionGood: @ 81F04A4 .string "Your technique is remarkable.\p" .string "I suggest you speed up a bit while\n" .string "still avoiding collisions.$" -Route110_Text_1F0500: @ 81F0500 +Route110_Text_ChallengeReactionOk: @ 81F0500 .string "I would consider you a work in\n" .string "progress.\p" .string "Still, I hope you don't forget the\n" .string "sheer pleasure of cycling.$" -Route110_Text_1F0567: @ 81F0567 +Route110_Text_ChallengeReactionBad: @ 81F0567 .string "My word… Your cycling skills border\n" .string "on terrifying.\p" .string "Most certainly, you need much more\n" .string "practice riding.$" -Route110_Text_1F05CE: @ 81F05CE +Route110_Text_ChallengeReactionWorst: @ 81F05CE .string "…I am aghast…\p" .string "You're perhaps not cut out for this\n" .string "unfortunate cycling business.\p" .string "You ought to give serious thought to\n" .string "returning that BIKE to RYDEL.$" -Route110_Text_1F0661: @ 81F0661 +Route110_Text_RatedForNumberOfCollisions: @ 81F0661 .string "This is CYCLING ROAD.\p" .string "If you were to ride from MAUVILLE to\n" .string "SLATEPORT on a MACH BIKE, you would\l" .string "be rated for the number of collisions\l" .string "and your total time.$" -Route110_Text_1F06FB: @ 81F06FB +Route110_Text_AlwaysAimHigher: @ 81F06FB .string "Regardless of the results, I count on\n" .string "seeing more challenges from you.\l" .string "Always aim higher!$" -Route110_Text_1F0755: @ 81F0755 +Route110_Text_AcroBikesDoNotQualify: @ 81F0755 .string "On this CYCLING ROAD, those riding\n" .string "MACH BIKES are rated for their number\l" .string "of collisions and their total times.\p" .string "ACRO BIKES do not qualify for rating.\n" .string "They are easy to turn, so it's not fair.$" -Route110_Text_1F0812: @ 81F0812 +Route110_Text_SlateportCitySign: @ 81F0812 .string "ROUTE 110\n" .string "{DOWN_ARROW} SLATEPORT CITY$" -Route110_Text_1F082D: @ 81F082D +Route110_Text_CyclingRoadSign: @ 81F082D .string "SEASIDE CYCLING ROAD$" -Route110_Text_1F0842: @ 81F0842 +Route110_Text_AquaWasHere: @ 81F0842 .string "“TEAM AQUA was here!”\p" .string "Someone painted that onto this sign,\n" .string "but then someone else painted over it.\p" .string "“TEAM MAGMA rules!” is what it\n" .string "says now.$" -Route110_Text_1F08CD: @ 81F08CD +Route110_Text_Route103Sign: @ 81F08CD .string "ROUTE 110\n" .string "{LEFT_ARROW} ROUTE 103$" -Route110_Text_1F08E3: @ 81F08E3 +Route110_Text_SeasideParkingSign: @ 81F08E3 .string "SEASIDE PARKING$" -Route110_Text_1F08F3: @ 81F08F3 +Route110_Text_MauvilleCitySign: @ 81F08F3 .string "ROUTE 110\n" .string "{UP_ARROW} MAUVILLE CITY$" -Route110_Text_1F090D: @ 81F090D +Route110_Text_TrainerTipsPrlzSleep: @ 81F090D .string "TRAINER TIPS\p" .string "The foe can be made helpless by\n" .string "paralyzing it or causing it to sleep.\p" .string "It is an important technique for\n" .string "POKéMON battles.$" -Route110_Text_1F0992: @ 81F0992 +Route110_Text_TrainerTipsRegisterItems: @ 81F0992 .string "TRAINER TIPS\p" .string "The items in the BAG can be reorganized\n" .string "by pressing SELECT.$" -Route110_Text_1F09DB: @ 81F09DB +Route110_Text_TrickHouseSign: @ 81F09DB .string "“Three steps {RIGHT_ARROW} and two steps {UP_ARROW}\n" .string "to reach the wondrous TRICK HOUSE.”$" -Route110_Text_1F0A1E: @ 81F0A1E +Route110_Text_BestRecord: @ 81F0A1E .string "THE BEST RECORD TO DATE…\p" .string "No. of collisions: {STR_VAR_1}\p" .string "Elapsed time: {STR_VAR_2}$" -Route110_Text_1F0A5E: @ 81F0A5E +Route110_Text_ThereIsNoRecord: @ 81F0A5E .string "THE BEST RECORD TO DATE…\p" .string "No one seems to have taken the\n" .string "challenge. There is no record…$" -Route110_Text_1F0AB5: @ 81F0AB5 +Route110_Text_ImagineSeeingYouHere: @ 81F0AB5 .string "PROF. BIRCH: Oh, {PLAYER}{KUN}!\n" .string "Imagine seeing you here!\p" .string "And where might my {RIVAL} be?$" -Route110_Text_1F0AFF: @ 81F0AFF +Route110_Text_HeardYouInstallMatchCall: @ 81F0AFF .string "Oh, I see!\n" .string "You two are running separately.\l" .string "Well, that's fine.\p" @@ -1005,11 +1005,11 @@ Route110_Text_1F0AFF: @ 81F0AFF .string "I can rate your POKéDEX anytime.\p" .string "… … … … … …$" -Route110_Text_1F0C0C: @ 81F0C0C +Route110_Text_RegisteredBirchInPokenav: @ 81F0C0C .string "Registered PROF. BIRCH\n" .string "in the POKéNAV.$" -Route110_Text_1F0C33: @ 81F0C33 +Route110_Text_KeepAnEyeOutForRival: @ 81F0C33 .string "PROF. BIRCH: {PLAYER}{KUN}…\p" .string "Please keep an eye out for my {RIVAL}.\n" .string "… … … … … …\p" diff --git a/data/maps/Route110_TrickHousePuzzle7/scripts.inc b/data/maps/Route110_TrickHousePuzzle7/scripts.inc index db651d8ce..b5303bc24 100644 --- a/data/maps/Route110_TrickHousePuzzle7/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle7/scripts.inc @@ -222,60 +222,60 @@ Route110_TrickHousePuzzle7_EventScript_26E31B:: @ 826E31B playse SE_MU_PACHI waitse playse SE_TU_SAA - mossdeepgym3 1 - mossdeepgym1 0 + initrotatingtilepuzzle TRUE + moverotatingtileobjects 0 waitmovement 0 - mossdeepgym2 + turnrotatingtileobjects waitmovement 0 - mossdeepgym4 + freerotatingtilepuzzle end Route110_TrickHousePuzzle7_EventScript_26E331:: @ 826E331 playse SE_MU_PACHI waitse playse SE_TU_SAA - mossdeepgym3 1 - mossdeepgym1 1 + initrotatingtilepuzzle TRUE + moverotatingtileobjects 1 waitmovement 0 - mossdeepgym2 + turnrotatingtileobjects waitmovement 0 - mossdeepgym4 + freerotatingtilepuzzle end Route110_TrickHousePuzzle7_EventScript_26E347:: @ 826E347 playse SE_MU_PACHI waitse playse SE_TU_SAA - mossdeepgym3 1 - mossdeepgym1 2 + initrotatingtilepuzzle TRUE + moverotatingtileobjects 2 waitmovement 0 - mossdeepgym2 + turnrotatingtileobjects waitmovement 0 - mossdeepgym4 + freerotatingtilepuzzle end Route110_TrickHousePuzzle7_EventScript_26E35D:: @ 826E35D playse SE_MU_PACHI waitse playse SE_TU_SAA - mossdeepgym3 1 - mossdeepgym1 3 + initrotatingtilepuzzle TRUE + moverotatingtileobjects 3 waitmovement 0 - mossdeepgym2 + turnrotatingtileobjects waitmovement 0 - mossdeepgym4 + freerotatingtilepuzzle end Route110_TrickHousePuzzle7_EventScript_26E373:: @ 826E373 playse SE_MU_PACHI waitse playse SE_TU_SAA - mossdeepgym3 1 - mossdeepgym1 4 + initrotatingtilepuzzle TRUE + moverotatingtileobjects 4 waitmovement 0 - mossdeepgym2 + turnrotatingtileobjects waitmovement 0 - mossdeepgym4 + freerotatingtilepuzzle end Route110_TrickHousePuzzle7_EventScript_26E389:: @ 826E389 diff --git a/data/maps/Route111/map.json b/data/maps/Route111/map.json index ef7e29999..0317366cd 100644 --- a/data/maps/Route111/map.json +++ b/data/maps/Route111/map.json @@ -196,7 +196,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route111_EventScript_28CDF6", + "script": "GabbyAndTy_EventScript_TyBattle1", "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1" }, { @@ -209,7 +209,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route111_EventScript_28CDD6", + "script": "GabbyAndTy_EventScript_GabbyBattle1", "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1" }, { @@ -300,7 +300,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route111_EventScript_28CE96", + "script": "GabbyAndTy_EventScript_GabbyBattle4", "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3" }, { @@ -313,7 +313,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route111_EventScript_28CEB6", + "script": "GabbyAndTy_EventScript_TyBattle4", "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3" }, { @@ -326,7 +326,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route111_EventScript_28CF16", + "script": "GabbyAndTy_EventScript_GabbyBattle6", "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2" }, { @@ -339,7 +339,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route111_EventScript_28CF36", + "script": "GabbyAndTy_EventScript_TyBattle6", "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2" }, { diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index fceacdfcc..8121265bb 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -46,7 +46,7 @@ Route111_OnTransition: @ 81F0D87 compare VAR_MIRAGE_TOWER_STATE, 2 call_if_eq Route111_EventScript_1F0E40 call Route111_EventScript_1F0DE6 - call Route111_EventScript_28CCC7 + call GabbyAndTy_EventScript_UpdateLocation checktrainerflag TRAINER_VICKY goto_if_lt Route111_EventScript_1F0E26 end diff --git a/data/maps/Route113/scripts.inc b/data/maps/Route113/scripts.inc index e8fb08ee4..3e1b1754f 100644 --- a/data/maps/Route113/scripts.inc +++ b/data/maps/Route113/scripts.inc @@ -4,7 +4,7 @@ Route113_MapScripts:: @ 81F2153 .byte 0 Route113_MapScript1_1F215E: @ 81F215E - setstepcallback 1 + setstepcallback STEP_CB_ASH end Route113_OnTransition: @ 81F2161 diff --git a/data/maps/Route118/map.json b/data/maps/Route118/map.json index e7737bf1e..40a988bad 100644 --- a/data/maps/Route118/map.json +++ b/data/maps/Route118/map.json @@ -92,7 +92,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route118_EventScript_28CE16", + "script": "GabbyAndTy_EventScript_GabbyBattle2", "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1" }, { @@ -105,7 +105,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route118_EventScript_28CE36", + "script": "GabbyAndTy_EventScript_TyBattle2", "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1" }, { @@ -131,7 +131,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route118_EventScript_28CED6", + "script": "Route118_EventScript_GabbyBattle5", "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2" }, { @@ -144,7 +144,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route118_EventScript_28CEF6", + "script": "Route118_EventScript_TyBattle5", "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2" }, { @@ -157,7 +157,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route118_EventScript_28CF16", + "script": "GabbyAndTy_EventScript_GabbyBattle6", "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3" }, { @@ -170,7 +170,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route118_EventScript_28CF36", + "script": "GabbyAndTy_EventScript_TyBattle6", "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3" }, { diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index 661bd938c..38b231111 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -5,7 +5,7 @@ Route118_MapScripts:: @ 81F3DBC .byte 0 Route118_OnTransition: @ 81F3DCC - call Route118_EventScript_28CCC7 + call GabbyAndTy_EventScript_UpdateLocation compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 call_if_eq UnusualWeather_EventScript_HideMapNamePopup compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_EAST diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index ac47539c7..1e415dd41 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -112,7 +112,7 @@ Route119_WeatherInstitute_2F_EventScript_2700AD:: @ 82700AD end Route119_WeatherInstitute_2F_EventScript_2700D0:: @ 82700D0 - call Route119_WeatherInstitute_2F_EventScript_2737A0 + call Common_EventScript_TransferredToPC goto Route119_WeatherInstitute_2F_EventScript_2700EA end diff --git a/data/maps/Route120/map.json b/data/maps/Route120/map.json index 47f472a3d..8bcfafc72 100644 --- a/data/maps/Route120/map.json +++ b/data/maps/Route120/map.json @@ -243,7 +243,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route120_EventScript_28CE76", + "script": "GabbyAndTy_EventScript_TyBattle3", "flag": "FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1" }, { @@ -256,7 +256,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route120_EventScript_28CE56", + "script": "GabbyAndTy_EventScript_GabbyBattle3", "flag": "FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1" }, { @@ -269,7 +269,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route120_EventScript_28CF16", + "script": "GabbyAndTy_EventScript_GabbyBattle6", "flag": "FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2" }, { @@ -282,7 +282,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route120_EventScript_28CF36", + "script": "GabbyAndTy_EventScript_TyBattle6", "flag": "FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2" }, { diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index 0629d8f0d..562416c1d 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -61,7 +61,7 @@ Route120_EventScript_1F54C8:: @ 81F54C8 return Route120_OnTransition: @ 81F54CD - call Route120_EventScript_28CCC7 + call GabbyAndTy_EventScript_UpdateLocation call Route120_EventScript_1F54D8 end diff --git a/data/maps/Route121_SafariZoneEntrance/map.json b/data/maps/Route121_SafariZoneEntrance/map.json index 90eedd773..6cf7b5791 100644 --- a/data/maps/Route121_SafariZoneEntrance/map.json +++ b/data/maps/Route121_SafariZoneEntrance/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route121_SafariZoneEntrance_EventScript_22BBE6", + "script": "Route121_SafariZoneEntrance_EventScript_WelcomeAttendant", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route121_SafariZoneEntrance_EventScript_22BBEF", + "script": "Route121_SafariZoneEntrance_EventScript_InfoAttendant", "flag": "0" }, { @@ -92,7 +92,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "Route121_SafariZoneEntrance_EventScript_22BC18" + "script": "Route121_SafariZoneEntrance_EventScript_EntranceCounterTrigger" } ], "bg_events": [ @@ -102,7 +102,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route121_SafariZoneEntrance_EventScript_22BD21" + "script": "Route121_SafariZoneEntrance_EventScript_TrainerTipSign" } ] }
\ No newline at end of file diff --git a/data/maps/Route121_SafariZoneEntrance/scripts.inc b/data/maps/Route121_SafariZoneEntrance/scripts.inc index 88c4ac03d..054f6cee8 100644 --- a/data/maps/Route121_SafariZoneEntrance/scripts.inc +++ b/data/maps/Route121_SafariZoneEntrance/scripts.inc @@ -1,20 +1,20 @@ Route121_SafariZoneEntrance_MapScripts:: @ 822BBBB - map_script MAP_SCRIPT_ON_FRAME_TABLE, Route121_SafariZoneEntrance_MapScript2_22BBC1 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route121_SafariZoneEntrance_OnFrame .byte 0 -Route121_SafariZoneEntrance_MapScript2_22BBC1: @ 822BBC1 - map_script_2 VAR_SAFARI_ZONE_STATE, 1, Route121_SafariZoneEntrance_EventScript_22BBCB +Route121_SafariZoneEntrance_OnFrame: @ 822BBC1 + map_script_2 VAR_SAFARI_ZONE_STATE, 1, Route121_SafariZoneEntrance_EventScript_ExitSafariZone .2byte 0 -Route121_SafariZoneEntrance_EventScript_22BBCB:: @ 822BBCB +Route121_SafariZoneEntrance_EventScript_ExitSafariZone:: @ 822BBCB lockall - applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_22BBDD + applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_ExitSafariZone waitmovement 0 setvar VAR_SAFARI_ZONE_STATE, 0 releaseall end -Route121_SafariZoneEntrance_Movement_22BBDD: @ 822BBDD +Route121_SafariZoneEntrance_Movement_ExitSafariZone: @ 822BBDD walk_up walk_right walk_right @@ -25,59 +25,59 @@ Route121_SafariZoneEntrance_Movement_22BBDD: @ 822BBDD walk_right step_end -Route121_SafariZoneEntrance_EventScript_22BBE6:: @ 822BBE6 - msgbox Route121_SafariZoneEntrance_Text_2A4D12, MSGBOX_NPC +Route121_SafariZoneEntrance_EventScript_WelcomeAttendant:: @ 822BBE6 + msgbox Route121_SafariZoneEntrance_Text_WelcomeToSafariZone, MSGBOX_NPC end -Route121_SafariZoneEntrance_EventScript_22BBEF:: @ 822BBEF +Route121_SafariZoneEntrance_EventScript_InfoAttendant:: @ 822BBEF lock faceplayer - msgbox Route121_SafariZoneEntrance_Text_2A4E46, MSGBOX_YESNO + msgbox Route121_SafariZoneEntrance_Text_WelcomeFirstTime, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq Route121_SafariZoneEntrance_EventScript_22BC0E - msgbox Route121_SafariZoneEntrance_Text_2A4E7E, MSGBOX_DEFAULT + goto_if_eq Route121_SafariZoneEntrance_EventScript_FirstTimeInfo + msgbox Route121_SafariZoneEntrance_Text_ComeInAndEnjoy, MSGBOX_DEFAULT release end -Route121_SafariZoneEntrance_EventScript_22BC0E:: @ 822BC0E - msgbox Route121_SafariZoneEntrance_Text_2A4EA1, MSGBOX_DEFAULT +Route121_SafariZoneEntrance_EventScript_FirstTimeInfo:: @ 822BC0E + msgbox Route121_SafariZoneEntrance_Text_FirstTimeInfo, MSGBOX_DEFAULT release end -Route121_SafariZoneEntrance_EventScript_22BC18:: @ 822BC18 +Route121_SafariZoneEntrance_EventScript_EntranceCounterTrigger:: @ 822BC18 lockall applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 showmoneybox 0, 0, 0 - msgbox Route121_SafariZoneEntrance_Text_2A4F74, MSGBOX_YESNO + msgbox Route121_SafariZoneEntrance_Text_WouldYouLikeToPlay, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq Route121_SafariZoneEntrance_EventScript_22BC48 - msgbox Route121_SafariZoneEntrance_Text_2A4FD7, MSGBOX_DEFAULT - goto Route121_SafariZoneEntrance_EventScript_22BD06 + goto_if_eq Route121_SafariZoneEntrance_EventScript_TryEnterSafariZone + msgbox Route121_SafariZoneEntrance_Text_PlayAnotherTime, MSGBOX_DEFAULT + goto Route121_SafariZoneEntrance_EventScript_MovePlayerBackFromCounter end -Route121_SafariZoneEntrance_EventScript_22BC48:: @ 822BC48 +Route121_SafariZoneEntrance_EventScript_TryEnterSafariZone:: @ 822BC48 checkitem ITEM_POKEBLOCK_CASE, 1 compare VAR_RESULT, 0 - goto_if_eq Route121_SafariZoneEntrance_EventScript_22BCEA - call Route121_SafariZoneEntrance_EventScript_22BCBF + goto_if_eq Route121_SafariZoneEntrance_EventScript_NoPokeblockCase + call Route121_SafariZoneEntrance_EventScript_CheckHasRoomForPokemon checkmoney 500, 0 compare VAR_RESULT, 0 - goto_if_eq Route121_SafariZoneEntrance_EventScript_22BCF8 + goto_if_eq Route121_SafariZoneEntrance_EventScript_NotEnoughMoney playse SE_REGI - msgbox Route121_SafariZoneEntrance_Text_2A501B, MSGBOX_DEFAULT + msgbox Route121_SafariZoneEntrance_Text_ThatWillBe500Please, MSGBOX_DEFAULT takemoney 500, 0 updatemoneybox 0, 0 - msgbox Route121_SafariZoneEntrance_Text_2A5036, MSGBOX_DEFAULT + msgbox Route121_SafariZoneEntrance_Text_HereAreYourSafariBalls, MSGBOX_DEFAULT playfanfare MUS_FANFA4 - message Route121_SafariZoneEntrance_Text_2A5052 + message Route121_SafariZoneEntrance_Text_Received30SafariBalls waitfanfare - msgbox Route121_SafariZoneEntrance_Text_2A506F, MSGBOX_DEFAULT + msgbox Route121_SafariZoneEntrance_Text_PleaseEnjoyYourself, MSGBOX_DEFAULT closemessage hidemoneybox nop nop - applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_22BD18 + applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_EnterSafariZone waitmovement 0 special EnterSafariMode setvar VAR_SAFARI_ZONE_STATE, 2 @@ -86,45 +86,45 @@ Route121_SafariZoneEntrance_EventScript_22BC48:: @ 822BC48 waitstate end -Route121_SafariZoneEntrance_EventScript_22BCBF:: @ 822BCBF +Route121_SafariZoneEntrance_EventScript_CheckHasRoomForPokemon:: @ 822BCBF getpartysize - compare VAR_RESULT, 6 - goto_if_ne Route121_SafariZoneEntrance_EventScript_22BCE9 + compare VAR_RESULT, PARTY_SIZE + goto_if_ne Route121_SafariZoneEntrance_EventScript_HasRoomForPokemon specialvar VAR_RESULT, ScriptCheckFreePokemonStorageSpace compare VAR_RESULT, 1 - goto_if_eq Route121_SafariZoneEntrance_EventScript_22BCE9 - msgbox Route121_SafariZoneEntrance_Text_2A50E5, MSGBOX_DEFAULT - goto Route121_SafariZoneEntrance_EventScript_22BD06 + goto_if_eq Route121_SafariZoneEntrance_EventScript_HasRoomForPokemon + msgbox Route121_SafariZoneEntrance_Text_PCIsFull, MSGBOX_DEFAULT + goto Route121_SafariZoneEntrance_EventScript_MovePlayerBackFromCounter end -Route121_SafariZoneEntrance_EventScript_22BCE9:: @ 822BCE9 +Route121_SafariZoneEntrance_EventScript_HasRoomForPokemon:: @ 822BCE9 return -Route121_SafariZoneEntrance_EventScript_22BCEA:: @ 822BCEA - msgbox Route121_SafariZoneEntrance_Text_2A5105, MSGBOX_DEFAULT - goto Route121_SafariZoneEntrance_EventScript_22BD06 +Route121_SafariZoneEntrance_EventScript_NoPokeblockCase:: @ 822BCEA + msgbox Route121_SafariZoneEntrance_Text_YouNeedPokeblockCase, MSGBOX_DEFAULT + goto Route121_SafariZoneEntrance_EventScript_MovePlayerBackFromCounter end -Route121_SafariZoneEntrance_EventScript_22BCF8:: @ 822BCF8 - msgbox Route121_SafariZoneEntrance_Text_2A4FF7, MSGBOX_DEFAULT - goto Route121_SafariZoneEntrance_EventScript_22BD06 +Route121_SafariZoneEntrance_EventScript_NotEnoughMoney:: @ 822BCF8 + msgbox Route121_SafariZoneEntrance_Text_NotEnoughMoney, MSGBOX_DEFAULT + goto Route121_SafariZoneEntrance_EventScript_MovePlayerBackFromCounter end -Route121_SafariZoneEntrance_EventScript_22BD06:: @ 822BD06 +Route121_SafariZoneEntrance_EventScript_MovePlayerBackFromCounter:: @ 822BD06 closemessage hidemoneybox nop nop - applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_22BD16 + applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_BackAwayFromCounter waitmovement 0 releaseall end -Route121_SafariZoneEntrance_Movement_22BD16: @ 822BD16 +Route121_SafariZoneEntrance_Movement_BackAwayFromCounter: @ 822BD16 walk_right step_end -Route121_SafariZoneEntrance_Movement_22BD18: @ 822BD18 +Route121_SafariZoneEntrance_Movement_EnterSafariZone: @ 822BD18 walk_left walk_left walk_left @@ -135,7 +135,7 @@ Route121_SafariZoneEntrance_Movement_22BD18: @ 822BD18 delay_16 step_end -Route121_SafariZoneEntrance_EventScript_22BD21:: @ 822BD21 - msgbox Route121_SafariZoneEntrance_Text_2A55BB, MSGBOX_SIGN +Route121_SafariZoneEntrance_EventScript_TrainerTipSign:: @ 822BD21 + msgbox Route121_SafariZoneEntrance_Text_TrainerTip, MSGBOX_SIGN end diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc index 0784f523c..acdcb9528 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc @@ -185,7 +185,7 @@ RustboroCity_DevonCorp_2F_EventScript_211A96:: @ 8211A96 end RustboroCity_DevonCorp_2F_EventScript_211AB9:: @ 8211AB9 - call RustboroCity_DevonCorp_2F_EventScript_2737A0 + call Common_EventScript_TransferredToPC goto RustboroCity_DevonCorp_2F_EventScript_211AD7 end @@ -234,7 +234,7 @@ RustboroCity_DevonCorp_2F_EventScript_211B39:: @ 8211B39 end RustboroCity_DevonCorp_2F_EventScript_211B5C:: @ 8211B5C - call RustboroCity_DevonCorp_2F_EventScript_2737A0 + call Common_EventScript_TransferredToPC goto RustboroCity_DevonCorp_2F_EventScript_211B7A end diff --git a/data/maps/SafariZone_North/map.json b/data/maps/SafariZone_North/map.json index 0dafeb180..90ecec8c2 100644 --- a/data/maps/SafariZone_North/map.json +++ b/data/maps/SafariZone_North/map.json @@ -40,7 +40,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SafariZone_North_EventScript_23D254", + "script": "SafariZone_North_EventScript_Fisherman", "flag": "0" }, { @@ -53,7 +53,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SafariZone_North_EventScript_23D25D", + "script": "SafariZone_North_EventScript_Man", "flag": "0" }, { diff --git a/data/maps/SafariZone_North/scripts.inc b/data/maps/SafariZone_North/scripts.inc index d98fdca88..365266b4b 100644 --- a/data/maps/SafariZone_North/scripts.inc +++ b/data/maps/SafariZone_North/scripts.inc @@ -1,11 +1,11 @@ SafariZone_North_MapScripts:: @ 823D253 .byte 0 -SafariZone_North_EventScript_23D254:: @ 823D254 - msgbox SafariZone_North_Text_2A5489, MSGBOX_NPC +SafariZone_North_EventScript_Fisherman:: @ 823D254 + msgbox SafariZone_North_Text_Fisherman, MSGBOX_NPC end -SafariZone_North_EventScript_23D25D:: @ 823D25D - msgbox SafariZone_North_Text_2A54F0, MSGBOX_NPC +SafariZone_North_EventScript_Man:: @ 823D25D + msgbox SafariZone_North_Text_Man, MSGBOX_NPC end diff --git a/data/maps/SafariZone_Northeast/map.json b/data/maps/SafariZone_Northeast/map.json index 798563263..d362f8de3 100644 --- a/data/maps/SafariZone_Northeast/map.json +++ b/data/maps/SafariZone_Northeast/map.json @@ -35,7 +35,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SafariZone_Northeast_EventScript_23D3C6", + "script": "SafariZone_Northeast_EventScript_Boy", "flag": "0" }, { @@ -48,7 +48,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SafariZone_Northeast_EventScript_23D3D8", + "script": "SafariZone_Northeast_EventScript_Girl", "flag": "0" }, { @@ -74,7 +74,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SafariZone_Northeast_EventScript_23D3CF", + "script": "SafariZone_Northeast_EventScript_Woman", "flag": "0" }, { diff --git a/data/maps/SafariZone_Northeast/scripts.inc b/data/maps/SafariZone_Northeast/scripts.inc index 207e2a584..a34d6ab95 100644 --- a/data/maps/SafariZone_Northeast/scripts.inc +++ b/data/maps/SafariZone_Northeast/scripts.inc @@ -1,3 +1,4 @@ SafariZone_Northeast_MapScripts:: @ 8242C02 .byte 0 +@ Event scripts for SafariZone_Northeast are in SafariZone_South/scripts.inc diff --git a/data/maps/SafariZone_Northwest/map.json b/data/maps/SafariZone_Northwest/map.json index 6ead6d714..7805c872e 100644 --- a/data/maps/SafariZone_Northwest/map.json +++ b/data/maps/SafariZone_Northwest/map.json @@ -35,7 +35,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SafariZone_Northwest_EventScript_23D24A", + "script": "SafariZone_Northwest_EventScript_Man", "flag": "0" }, { diff --git a/data/maps/SafariZone_Northwest/scripts.inc b/data/maps/SafariZone_Northwest/scripts.inc index a64c142fe..5e6261a2e 100644 --- a/data/maps/SafariZone_Northwest/scripts.inc +++ b/data/maps/SafariZone_Northwest/scripts.inc @@ -1,7 +1,7 @@ SafariZone_Northwest_MapScripts:: @ 823D249 .byte 0 -SafariZone_Northwest_EventScript_23D24A:: @ 823D24A - msgbox SafariZone_Northwest_Text_2A542C, MSGBOX_NPC +SafariZone_Northwest_EventScript_Man:: @ 823D24A + msgbox SafariZone_Northwest_Text_Man, MSGBOX_NPC end diff --git a/data/maps/SafariZone_RestHouse/map.json b/data/maps/SafariZone_RestHouse/map.json index db0ba8048..fd9ae9dcb 100644 --- a/data/maps/SafariZone_RestHouse/map.json +++ b/data/maps/SafariZone_RestHouse/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SafariZone_RestHouse_EventScript_242BE7", + "script": "SafariZone_RestHouse_EventScript_Youngster", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SafariZone_RestHouse_EventScript_242BF0", + "script": "SafariZone_RestHouse_EventScript_PsychicM", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SafariZone_RestHouse_EventScript_242BF9", + "script": "SafariZone_RestHouse_EventScript_FatMan", "flag": "0" } ], diff --git a/data/maps/SafariZone_RestHouse/scripts.inc b/data/maps/SafariZone_RestHouse/scripts.inc index e08cfe3da..bc5688f0f 100644 --- a/data/maps/SafariZone_RestHouse/scripts.inc +++ b/data/maps/SafariZone_RestHouse/scripts.inc @@ -1,15 +1,15 @@ SafariZone_RestHouse_MapScripts:: @ 8242BE6 .byte 0 -SafariZone_RestHouse_EventScript_242BE7:: @ 8242BE7 - msgbox SafariZone_RestHouse_Text_2A5639, MSGBOX_NPC +SafariZone_RestHouse_EventScript_Youngster:: @ 8242BE7 + msgbox SafariZone_RestHouse_Text_Youngster, MSGBOX_NPC end -SafariZone_RestHouse_EventScript_242BF0:: @ 8242BF0 - msgbox SafariZone_RestHouse_Text_2A56E1, MSGBOX_NPC +SafariZone_RestHouse_EventScript_PsychicM:: @ 8242BF0 + msgbox SafariZone_RestHouse_Text_PsychicM, MSGBOX_NPC end -SafariZone_RestHouse_EventScript_242BF9:: @ 8242BF9 - msgbox SafariZone_RestHouse_Text_2A5764, MSGBOX_NPC +SafariZone_RestHouse_EventScript_FatMan:: @ 8242BF9 + msgbox SafariZone_RestHouse_Text_FatMan, MSGBOX_NPC end diff --git a/data/maps/SafariZone_South/map.json b/data/maps/SafariZone_South/map.json index 371be2119..b23420ba4 100644 --- a/data/maps/SafariZone_South/map.json +++ b/data/maps/SafariZone_South/map.json @@ -40,7 +40,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SafariZone_South_EventScript_23D2E5", + "script": "SafariZone_South_EventScript_ExitAttendant", "flag": "0" }, { @@ -53,7 +53,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SafariZone_South_EventScript_23D2CA", + "script": "SafariZone_South_EventScript_Boy", "flag": "0" }, { @@ -66,7 +66,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SafariZone_South_EventScript_23D2D3", + "script": "SafariZone_South_EventScript_Man", "flag": "0" }, { @@ -79,7 +79,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SafariZone_South_EventScript_23D2DC", + "script": "SafariZone_South_EventScript_Youngster", "flag": "0" }, { @@ -92,7 +92,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SafariZone_South_EventScript_23D390", + "script": "SafariZone_South_EventScript_ConstructionWorker1", "flag": "FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS" }, { @@ -105,7 +105,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SafariZone_South_EventScript_23D3A2", + "script": "SafariZone_South_EventScript_ConstructionWorker2", "flag": "FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS" } ], diff --git a/data/maps/SafariZone_South/scripts.inc b/data/maps/SafariZone_South/scripts.inc index a6c3629bc..96a9a61ea 100644 --- a/data/maps/SafariZone_South/scripts.inc +++ b/data/maps/SafariZone_South/scripts.inc @@ -1,17 +1,17 @@ SafariZone_South_MapScripts:: @ 823D279 map_script MAP_SCRIPT_ON_TRANSITION, SafariZone_South_OnTransition - map_script MAP_SCRIPT_ON_FRAME_TABLE, SafariZone_South_MapScript2_23D284 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SafariZone_South_OnFrame .byte 0 -SafariZone_South_MapScript2_23D284: @ 823D284 - map_script_2 VAR_SAFARI_ZONE_STATE, 2, SafariZone_South_EventScript_23D28E +SafariZone_South_OnFrame: @ 823D284 + map_script_2 VAR_SAFARI_ZONE_STATE, 2, SafariZone_South_EventScript_EnterSafariZone .2byte 0 -SafariZone_South_EventScript_23D28E:: @ 823D28E +SafariZone_South_EventScript_EnterSafariZone:: @ 823D28E lockall - applymovement EVENT_OBJ_ID_PLAYER, SafariZone_South_Movement_23D2C5 + applymovement EVENT_OBJ_ID_PLAYER, SafariZone_South_Movement_PlayerEnter waitmovement 0 - applymovement 1, SafariZone_South_Movement_23D2C7 + applymovement 1, SafariZone_South_Movement_ExitAttendantBlockDoor waitmovement 0 setobjectxyperm 1, 32, 34 setvar VAR_SAFARI_ZONE_STATE, 0 @@ -20,133 +20,133 @@ SafariZone_South_EventScript_23D28E:: @ 823D28E SafariZone_South_OnTransition: @ 823D2B1 compare VAR_SAFARI_ZONE_STATE, 2 - call_if_eq SafariZone_South_EventScript_23D2BD + call_if_eq SafariZone_South_EventScript_SetExitAttendantAside end -SafariZone_South_EventScript_23D2BD:: @ 823D2BD +SafariZone_South_EventScript_SetExitAttendantAside:: @ 823D2BD setobjectxyperm 1, 31, 34 return -SafariZone_South_Movement_23D2C5: @ 823D2C5 +SafariZone_South_Movement_PlayerEnter: @ 823D2C5 walk_down step_end -SafariZone_South_Movement_23D2C7: @ 823D2C7 +SafariZone_South_Movement_ExitAttendantBlockDoor: @ 823D2C7 walk_right walk_in_place_fastest_down step_end -SafariZone_South_EventScript_23D2CA:: @ 823D2CA - msgbox SafariZone_South_Text_2A52EF, MSGBOX_NPC +SafariZone_South_EventScript_Boy:: @ 823D2CA + msgbox SafariZone_South_Text_Boy, MSGBOX_NPC end -SafariZone_South_EventScript_23D2D3:: @ 823D2D3 - msgbox SafariZone_South_Text_2A533B, MSGBOX_NPC +SafariZone_South_EventScript_Man:: @ 823D2D3 + msgbox SafariZone_South_Text_Man, MSGBOX_NPC end -SafariZone_South_EventScript_23D2DC:: @ 823D2DC - msgbox SafariZone_South_Text_2A553E, MSGBOX_NPC +SafariZone_South_EventScript_Youngster:: @ 823D2DC + msgbox SafariZone_South_Text_Youngster, MSGBOX_NPC end -SafariZone_South_EventScript_23D2E5:: @ 823D2E5 +SafariZone_South_EventScript_ExitAttendant:: @ 823D2E5 lock faceplayer - goto_if_unset FLAG_GOOD_LUCK_SAFARI_ZONE, SafariZone_South_EventScript_23D30D - msgbox SafariZone_South_Text_2A51D4, MSGBOX_YESNO + goto_if_unset FLAG_GOOD_LUCK_SAFARI_ZONE, SafariZone_South_EventScript_GoodLuck + msgbox SafariZone_South_Text_StillHaveTimeExit, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq SafariZone_South_EventScript_23D31A - msgbox SafariZone_South_Text_2A521A, MSGBOX_DEFAULT + goto_if_eq SafariZone_South_EventScript_ExitEarly + msgbox SafariZone_South_Text_EnjoyTheRestOfYourAdventure, MSGBOX_DEFAULT release end -SafariZone_South_EventScript_23D30D:: @ 823D30D +SafariZone_South_EventScript_GoodLuck:: @ 823D30D setflag FLAG_GOOD_LUCK_SAFARI_ZONE - msgbox SafariZone_South_Text_2A52AB, MSGBOX_DEFAULT + msgbox SafariZone_South_Text_GoodLuck, MSGBOX_DEFAULT release end -SafariZone_South_EventScript_23D31A:: @ 823D31A - msgbox SafariZone_South_Text_2A5248, MSGBOX_DEFAULT +SafariZone_South_EventScript_ExitEarly:: @ 823D31A + msgbox SafariZone_South_Text_ExitEarlyThankYouForPlaying, MSGBOX_DEFAULT closemessage switch VAR_FACING - case DIR_NORTH, SafariZone_South_EventScript_23D33F - case DIR_EAST, SafariZone_South_EventScript_23D359 + case DIR_NORTH, SafariZone_South_EventScript_ExitEarlyNorth + case DIR_EAST, SafariZone_South_EventScript_ExitEarlyEast end -SafariZone_South_EventScript_23D33F:: @ 823D33F - applymovement 1, SafariZone_South_Movement_23D38A +SafariZone_South_EventScript_ExitEarlyNorth:: @ 823D33F + applymovement 1, SafariZone_South_Movement_MoveExitAttendantNorth waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, SafariZone_South_Movement_23D385 + applymovement EVENT_OBJ_ID_PLAYER, SafariZone_South_Movement_PlayerExitNorth waitmovement 0 - goto SafariZone_South_EventScript_23D373 + goto SafariZone_South_EventScript_Exit end -SafariZone_South_EventScript_23D359:: @ 823D359 - applymovement 1, SafariZone_South_Movement_23D38D +SafariZone_South_EventScript_ExitEarlyEast:: @ 823D359 + applymovement 1, SafariZone_South_Movement_MoveExitAttendantEast waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, SafariZone_South_Movement_23D387 + applymovement EVENT_OBJ_ID_PLAYER, SafariZone_South_Movement_PlayerExitEast waitmovement 0 - goto SafariZone_South_EventScript_23D373 + goto SafariZone_South_EventScript_Exit end -SafariZone_South_EventScript_23D373:: @ 823D373 +SafariZone_South_EventScript_Exit:: @ 823D373 setvar VAR_SAFARI_ZONE_STATE, 1 special ExitSafariMode warpdoor MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5 waitstate end -SafariZone_South_Movement_23D385: @ 823D385 +SafariZone_South_Movement_PlayerExitNorth: @ 823D385 walk_up step_end -SafariZone_South_Movement_23D387: @ 823D387 +SafariZone_South_Movement_PlayerExitEast: @ 823D387 walk_right walk_in_place_fastest_up step_end -SafariZone_South_Movement_23D38A: @ 823D38A +SafariZone_South_Movement_MoveExitAttendantNorth: @ 823D38A walk_left walk_in_place_fastest_right step_end -SafariZone_South_Movement_23D38D: @ 823D38D +SafariZone_South_Movement_MoveExitAttendantEast: @ 823D38D walk_down walk_in_place_fastest_up step_end -SafariZone_South_EventScript_23D390:: @ 823D390 - msgbox SafariZone_South_Text_2A57EE, MSGBOX_NPC +SafariZone_South_EventScript_ConstructionWorker1:: @ 823D390 + msgbox SafariZone_South_Text_AreaOffLimits1, MSGBOX_NPC end -SafariZone_Southeast_EventScript_23D399:: @ 823D399 - msgbox SafariZone_Southeast_Text_2A582D, MSGBOX_NPC +SafariZone_Southeast_EventScript_ExpansionZoneAttendant:: @ 823D399 + msgbox SafariZone_Southeast_Text_ExpansionIsFinished, MSGBOX_NPC end -SafariZone_South_EventScript_23D3A2:: @ 823D3A2 - msgbox SafariZone_South_Text_2A5887, MSGBOX_NPC +SafariZone_South_EventScript_ConstructionWorker2:: @ 823D3A2 + msgbox SafariZone_South_Text_AreaOffLimits2, MSGBOX_NPC end -SafariZone_Southeast_EventScript_23D3AB:: @ 823D3AB - msgbox SafariZone_Southeast_Text_2A58C6, MSGBOX_NPC +SafariZone_Southeast_EventScript_LittleGirl:: @ 823D3AB + msgbox SafariZone_Southeast_Text_LittleGirl, MSGBOX_NPC end -SafariZone_Southeast_EventScript_23D3B4:: @ 823D3B4 - msgbox SafariZone_Southeast_Text_2A58FD, MSGBOX_NPC +SafariZone_Southeast_EventScript_FatMan:: @ 823D3B4 + msgbox SafariZone_Southeast_Text_FatMan, MSGBOX_NPC end -SafariZone_Southeast_EventScript_23D3BD:: @ 823D3BD - msgbox SafariZone_Southeast_Text_2A5960, MSGBOX_NPC +SafariZone_Southeast_EventScript_RichBoy:: @ 823D3BD + msgbox SafariZone_Southeast_Text_RichBoy, MSGBOX_NPC end -SafariZone_Northeast_EventScript_23D3C6:: @ 823D3C6 - msgbox SafariZone_Northeast_Text_2A59A4, MSGBOX_NPC +SafariZone_Northeast_EventScript_Boy:: @ 823D3C6 + msgbox SafariZone_Northeast_Text_Boy, MSGBOX_NPC end -SafariZone_Northeast_EventScript_23D3CF:: @ 823D3CF - msgbox SafariZone_Northeast_Text_2A5A09, MSGBOX_NPC +SafariZone_Northeast_EventScript_Woman:: @ 823D3CF + msgbox SafariZone_Northeast_Text_Woman, MSGBOX_NPC end -SafariZone_Northeast_EventScript_23D3D8:: @ 823D3D8 - msgbox SafariZone_Northeast_Text_2A5A44, MSGBOX_NPC +SafariZone_Northeast_EventScript_Girl:: @ 823D3D8 + msgbox SafariZone_Northeast_Text_Girl, MSGBOX_NPC end diff --git a/data/maps/SafariZone_Southeast/map.json b/data/maps/SafariZone_Southeast/map.json index cb293b149..f17a9acd3 100644 --- a/data/maps/SafariZone_Southeast/map.json +++ b/data/maps/SafariZone_Southeast/map.json @@ -35,7 +35,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SafariZone_Southeast_EventScript_23D3BD", + "script": "SafariZone_Southeast_EventScript_RichBoy", "flag": "0" }, { @@ -48,7 +48,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SafariZone_Southeast_EventScript_23D3B4", + "script": "SafariZone_Southeast_EventScript_FatMan", "flag": "0" }, { @@ -61,7 +61,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SafariZone_Southeast_EventScript_23D3AB", + "script": "SafariZone_Southeast_EventScript_LittleGirl", "flag": "0" }, { @@ -87,7 +87,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SafariZone_Southeast_EventScript_23D399", + "script": "SafariZone_Southeast_EventScript_ExpansionZoneAttendant", "flag": "FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION" } ], diff --git a/data/maps/SafariZone_Southeast/scripts.inc b/data/maps/SafariZone_Southeast/scripts.inc index f88cd22fb..658d88e56 100644 --- a/data/maps/SafariZone_Southeast/scripts.inc +++ b/data/maps/SafariZone_Southeast/scripts.inc @@ -1,3 +1,4 @@ SafariZone_Southeast_MapScripts:: @ 8242C03 .byte 0 +@ Event scripts for SafariZone_Southeast are in SafariZone_South/scripts.inc diff --git a/data/maps/SafariZone_Southwest/map.json b/data/maps/SafariZone_Southwest/map.json index 3784db801..261f7f49d 100644 --- a/data/maps/SafariZone_Southwest/map.json +++ b/data/maps/SafariZone_Southwest/map.json @@ -35,7 +35,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SafariZone_Southwest_EventScript_23D267", + "script": "SafariZone_Southwest_EventScript_Woman", "flag": "0" }, { @@ -69,7 +69,7 @@ "y": 7, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SafariZone_Southwest_EventScript_23D270" + "script": "SafariZone_Southwest_EventScript_RestHouseSign" } ] }
\ No newline at end of file diff --git a/data/maps/SafariZone_Southwest/scripts.inc b/data/maps/SafariZone_Southwest/scripts.inc index 069f22b49..c862f7906 100644 --- a/data/maps/SafariZone_Southwest/scripts.inc +++ b/data/maps/SafariZone_Southwest/scripts.inc @@ -1,11 +1,11 @@ SafariZone_Southwest_MapScripts:: @ 823D266 .byte 0 -SafariZone_Southwest_EventScript_23D267:: @ 823D267 - msgbox SafariZone_Southwest_Text_2A53B7, MSGBOX_NPC +SafariZone_Southwest_EventScript_Woman:: @ 823D267 + msgbox SafariZone_Southwest_Text_Woman, MSGBOX_NPC end -SafariZone_Southwest_EventScript_23D270:: @ 823D270 - msgbox SafariZone_Southwest_Text_2A5613, MSGBOX_SIGN +SafariZone_Southwest_EventScript_RestHouseSign:: @ 823D270 + msgbox SafariZone_Southwest_Text_RestHouseSign, MSGBOX_SIGN end diff --git a/data/maps/SkyPillar_2F/scripts.inc b/data/maps/SkyPillar_2F/scripts.inc index 6dd71f51b..8a02974ea 100644 --- a/data/maps/SkyPillar_2F/scripts.inc +++ b/data/maps/SkyPillar_2F/scripts.inc @@ -15,7 +15,7 @@ SkyPillar_2F_EventScript_CleanFloor:: @ 823964C return SkyPillar_2F_SetHoleWarp: @ 8239650 - setstepcallback 7 + setstepcallback STEP_CB_CRACKED_FLOOR setholewarp MAP_SKY_PILLAR_1F, 255, 0, 0 end diff --git a/data/maps/SkyPillar_4F/scripts.inc b/data/maps/SkyPillar_4F/scripts.inc index 009a1a567..af54deaff 100644 --- a/data/maps/SkyPillar_4F/scripts.inc +++ b/data/maps/SkyPillar_4F/scripts.inc @@ -15,7 +15,7 @@ SkyPillar_4F_EventScript_CleanFloor:: @ 8239692 return SkyPillar_4F_SetHoleWarp: @ 8239696 - setstepcallback 7 + setstepcallback STEP_CB_CRACKED_FLOOR setholewarp MAP_SKY_PILLAR_3F, 255, 0, 0 end diff --git a/data/maps/SootopolisCity_Gym_1F/map.json b/data/maps/SootopolisCity_Gym_1F/map.json index 6b8cab149..9726e98aa 100644 --- a/data/maps/SootopolisCity_Gym_1F/map.json +++ b/data/maps/SootopolisCity_Gym_1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SootopolisCity_Gym_1F_EventScript_224F44", + "script": "SootopolisCity_Gym_1F_EventScript_Juan", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SootopolisCity_Gym_1F_EventScript_225040", + "script": "SootopolisCity_Gym_1F_EventScript_GymGuide", "flag": "0" } ], @@ -72,7 +72,7 @@ "y": 24, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SootopolisCity_Gym_1F_EventScript_22505F" + "script": "SootopolisCity_Gym_1F_EventScript_LeftGymStatue" }, { "type": "sign", @@ -80,7 +80,7 @@ "y": 24, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "SootopolisCity_Gym_1F_EventScript_22506F" + "script": "SootopolisCity_Gym_1F_EventScript_RightGymStatue" } ] }
\ No newline at end of file diff --git a/data/maps/SootopolisCity_Gym_1F/scripts.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc index fa69aadc2..c45509225 100644 --- a/data/maps/SootopolisCity_Gym_1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc @@ -1,7 +1,7 @@ SootopolisCity_Gym_1F_MapScripts:: @ 8224E4C - map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_Gym_1F_MapScript2_224ECB - map_script MAP_SCRIPT_ON_RESUME, SootopolisCity_Gym_1F_MapScript1_224E67 - map_script MAP_SCRIPT_ON_LOAD, SootopolisCity_Gym_1F_MapScript1_224E6A + map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_Gym_1F_OnFrame + map_script MAP_SCRIPT_ON_RESUME, SootopolisCity_Gym_1F_OnResume + map_script MAP_SCRIPT_ON_LOAD, SootopolisCity_Gym_1F_OnLoad map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_Gym_1F_OnTransition .byte 0 @@ -9,71 +9,68 @@ SootopolisCity_Gym_1F_OnTransition: @ 8224E61 setvar VAR_ICE_STEP_COUNT, 1 end -SootopolisCity_Gym_1F_MapScript1_224E67: @ 8224E67 - setstepcallback 4 +SootopolisCity_Gym_1F_OnResume: @ 8224E67 + setstepcallback STEP_CB_SOOTOPOLIS_ICE end -SootopolisCity_Gym_1F_MapScript1_224E6A: @ 8224E6A - call SootopolisCity_Gym_1F_EventScript_224E73 +SootopolisCity_Gym_1F_OnLoad: @ 8224E6A + call SootopolisCity_Gym_1F_EventScript_CheckSetStairMetatiles special SetSootopolisGymCrackedIceMetatiles end -SootopolisCity_Gym_1F_EventScript_224E73:: @ 8224E73 +SootopolisCity_Gym_1F_EventScript_CheckSetStairMetatiles:: @ 8224E73 compare VAR_ICE_STEP_COUNT, 8 - goto_if_lt SootopolisCity_Gym_1F_EventScript_224ECA + goto_if_lt SootopolisCity_Gym_1F_EventScript_StopCheckingStairs @ All stairs ice compare VAR_ICE_STEP_COUNT, 28 - goto_if_lt SootopolisCity_Gym_1F_EventScript_224EB8 + goto_if_lt SootopolisCity_Gym_1F_EventScript_OpenFirstStairs compare VAR_ICE_STEP_COUNT, 67 - goto_if_lt SootopolisCity_Gym_1F_EventScript_224EA6 + goto_if_lt SootopolisCity_Gym_1F_EventScript_OpenFirstAndSecondStairs setmetatile 8, 4, METATILE_SootopolisGym_Stairs, 0 setmetatile 8, 5, METATILE_SootopolisGym_Stairs, 0 - -SootopolisCity_Gym_1F_EventScript_224EA6:: @ 8224EA6 +SootopolisCity_Gym_1F_EventScript_OpenFirstAndSecondStairs:: @ 8224EA6 setmetatile 8, 10, METATILE_SootopolisGym_Stairs, 0 setmetatile 8, 11, METATILE_SootopolisGym_Stairs, 0 - -SootopolisCity_Gym_1F_EventScript_224EB8:: @ 8224EB8 +SootopolisCity_Gym_1F_EventScript_OpenFirstStairs:: @ 8224EB8 setmetatile 8, 15, METATILE_SootopolisGym_Stairs, 0 setmetatile 8, 16, METATILE_SootopolisGym_Stairs, 0 - -SootopolisCity_Gym_1F_EventScript_224ECA:: @ 8224ECA +SootopolisCity_Gym_1F_EventScript_StopCheckingStairs:: @ 8224ECA return -SootopolisCity_Gym_1F_MapScript2_224ECB: @ 8224ECB - map_script_2 VAR_ICE_STEP_COUNT, 8, SootopolisCity_Gym_1F_EventScript_224EED - map_script_2 VAR_ICE_STEP_COUNT, 28, SootopolisCity_Gym_1F_EventScript_224F01 - map_script_2 VAR_ICE_STEP_COUNT, 67, SootopolisCity_Gym_1F_EventScript_224F15 - map_script_2 VAR_ICE_STEP_COUNT, 0, SootopolisCity_Gym_1F_EventScript_224F29 +SootopolisCity_Gym_1F_OnFrame: @ 8224ECB + map_script_2 VAR_ICE_STEP_COUNT, 8, SootopolisCity_Gym_1F_EventScript_UnlockFirstStairs + map_script_2 VAR_ICE_STEP_COUNT, 28, SootopolisCity_Gym_1F_EventScript_UnlockSecondStairs + map_script_2 VAR_ICE_STEP_COUNT, 67, SootopolisCity_Gym_1F_EventScript_UnlockThirdStairs + map_script_2 VAR_ICE_STEP_COUNT, 0, SootopolisCity_Gym_1F_EventScript_FallThroughIce .2byte 0 -SootopolisCity_Gym_1F_EventScript_224EED:: @ 8224EED +SootopolisCity_Gym_1F_EventScript_UnlockFirstStairs:: @ 8224EED addvar VAR_ICE_STEP_COUNT, 1 delay 40 playse SE_RU_GASHIN - call SootopolisCity_Gym_1F_EventScript_224E73 + call SootopolisCity_Gym_1F_EventScript_CheckSetStairMetatiles special DrawWholeMapView end -SootopolisCity_Gym_1F_EventScript_224F01:: @ 8224F01 +SootopolisCity_Gym_1F_EventScript_UnlockSecondStairs:: @ 8224F01 addvar VAR_ICE_STEP_COUNT, 1 delay 40 playse SE_RU_GASHIN - call SootopolisCity_Gym_1F_EventScript_224E73 + call SootopolisCity_Gym_1F_EventScript_CheckSetStairMetatiles special DrawWholeMapView end -SootopolisCity_Gym_1F_EventScript_224F15:: @ 8224F15 +SootopolisCity_Gym_1F_EventScript_UnlockThirdStairs:: @ 8224F15 addvar VAR_ICE_STEP_COUNT, 1 delay 40 playse SE_RU_GASHIN - call SootopolisCity_Gym_1F_EventScript_224E73 + call SootopolisCity_Gym_1F_EventScript_CheckSetStairMetatiles special DrawWholeMapView end -SootopolisCity_Gym_1F_EventScript_224F29:: @ 8224F29 +SootopolisCity_Gym_1F_EventScript_FallThroughIce:: @ 8224F29 lockall delay 20 - applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Gym_1F_Movement_224F42 + applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Gym_1F_Movement_FallThroughIce waitmovement 0 playse SE_RU_HYUU delay 60 @@ -81,26 +78,26 @@ SootopolisCity_Gym_1F_EventScript_224F29:: @ 8224F29 waitstate end -SootopolisCity_Gym_1F_Movement_224F42: @ 8224F42 +SootopolisCity_Gym_1F_Movement_FallThroughIce: @ 8224F42 set_invisible step_end -SootopolisCity_Gym_1F_EventScript_224F44:: @ 8224F44 - trainerbattle_single TRAINER_JUAN_1, SootopolisCity_Gym_1F_Text_225268, SootopolisCity_Gym_1F_Text_225432, SootopolisCity_Gym_1F_EventScript_224F82, NO_MUSIC +SootopolisCity_Gym_1F_EventScript_Juan:: @ 8224F44 + trainerbattle_single TRAINER_JUAN_1, SootopolisCity_Gym_1F_Text_JuanPreBattle, SootopolisCity_Gym_1F_Text_JuanDefeat, SootopolisCity_Gym_1F_EventScript_JuanDefeated, NO_MUSIC specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq SootopolisCity_Gym_1F_EventScript_225025 - goto_if_unset FLAG_RECEIVED_TM03, SootopolisCity_Gym_1F_EventScript_224FF7 - goto_if_unset FLAG_BADGE06_GET, SootopolisCity_Gym_1F_EventScript_22501B - msgbox SootopolisCity_Gym_1F_Text_225778, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq SootopolisCity_Gym_1F_EventScript_JuanRematch + goto_if_unset FLAG_RECEIVED_TM03, SootopolisCity_Gym_1F_EventScript_GiveWaterPulse2 + goto_if_unset FLAG_BADGE06_GET, SootopolisCity_Gym_1F_EventScript_GoGetFortreeBadge + msgbox SootopolisCity_Gym_1F_Text_JuanPostBattle, MSGBOX_DEFAULT release end -SootopolisCity_Gym_1F_EventScript_224F82:: @ 8224F82 - message SootopolisCity_Gym_1F_Text_225598 +SootopolisCity_Gym_1F_EventScript_JuanDefeated:: @ 8224F82 + message SootopolisCity_Gym_1F_Text_ReceivedRainBadge waitmessage call Common_EventScript_PlayGymBadgeFanfare - msgbox SootopolisCity_Gym_1F_Text_2255BE, MSGBOX_DEFAULT + msgbox SootopolisCity_Gym_1F_Text_ExplainRainBadgeTakeThis, MSGBOX_DEFAULT setflag FLAG_DEFEATED_SOOTOPOLIS_GYM setflag FLAG_BADGE08_GET setflag FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS @@ -110,11 +107,11 @@ SootopolisCity_Gym_1F_EventScript_224F82:: @ 8224F82 clearflag FLAG_HIDE_SOOTOPOLIS_CITY_MAN_1 setvar VAR_0x8008, 8 call Common_EventScript_SetGymTrainers - call SootopolisCity_Gym_1F_EventScript_224FD4 + call SootopolisCity_Gym_1F_EventScript_GiveWaterPulse closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox SootopolisCity_Gym_1F_Text_22574D, MSGBOX_DEFAULT + msgbox SootopolisCity_Gym_1F_Text_RegisteredJuan, MSGBOX_DEFAULT waitfanfare closemessage delay 30 @@ -122,69 +119,69 @@ SootopolisCity_Gym_1F_EventScript_224F82:: @ 8224F82 release end -SootopolisCity_Gym_1F_EventScript_224FD4:: @ 8224FD4 +SootopolisCity_Gym_1F_EventScript_GiveWaterPulse:: @ 8224FD4 giveitem_std ITEM_TM03 compare VAR_RESULT, 0 goto_if_eq Common_EventScript_BagIsFull - msgbox SootopolisCity_Gym_1F_Text_2256C1, MSGBOX_DEFAULT + msgbox SootopolisCity_Gym_1F_Text_ExplainWaterPulse, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM03 return -SootopolisCity_Gym_1F_EventScript_224FF7:: @ 8224FF7 +SootopolisCity_Gym_1F_EventScript_GiveWaterPulse2:: @ 8224FF7 giveitem_std ITEM_TM03 compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull - msgbox SootopolisCity_Gym_1F_Text_2256C1, MSGBOX_DEFAULT + msgbox SootopolisCity_Gym_1F_Text_ExplainWaterPulse, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM03 release end -SootopolisCity_Gym_1F_EventScript_22501B:: @ 822501B - msgbox SootopolisCity_Gym_1F_Text_225865, MSGBOX_DEFAULT +SootopolisCity_Gym_1F_EventScript_GoGetFortreeBadge:: @ 822501B + msgbox SootopolisCity_Gym_1F_Text_GoGetFortreeBadge, MSGBOX_DEFAULT release end -SootopolisCity_Gym_1F_EventScript_225025:: @ 8225025 - trainerbattle_rematch_double TRAINER_JUAN_1, SootopolisCity_Gym_1F_Text_225950, SootopolisCity_Gym_1F_Text_225A2E, SootopolisCity_Gym_1F_Text_225B48 - msgbox SootopolisCity_Gym_1F_Text_225A67, MSGBOX_AUTOCLOSE +SootopolisCity_Gym_1F_EventScript_JuanRematch:: @ 8225025 + trainerbattle_rematch_double TRAINER_JUAN_1, SootopolisCity_Gym_1F_Text_JuanPreRematch, SootopolisCity_Gym_1F_Text_JuanRematchDefeat, SootopolisCity_Gym_1F_Text_JuanRematchNeedTwoMons + msgbox SootopolisCity_Gym_1F_Text_JuanPostRematch, MSGBOX_AUTOCLOSE end -SootopolisCity_Gym_1F_EventScript_225040:: @ 8225040 +SootopolisCity_Gym_1F_EventScript_GymGuide:: @ 8225040 lock faceplayer - goto_if_set FLAG_DEFEATED_SOOTOPOLIS_GYM, SootopolisCity_Gym_1F_EventScript_225055 - msgbox SootopolisCity_Gym_1F_Text_225093, MSGBOX_DEFAULT + goto_if_set FLAG_DEFEATED_SOOTOPOLIS_GYM, SootopolisCity_Gym_1F_EventScript_GymGuidePostVictory + msgbox SootopolisCity_Gym_1F_Text_GymGuideAdvice, MSGBOX_DEFAULT release end -SootopolisCity_Gym_1F_EventScript_225055:: @ 8225055 - msgbox SootopolisCity_Gym_1F_Text_2251AF, MSGBOX_DEFAULT +SootopolisCity_Gym_1F_EventScript_GymGuidePostVictory:: @ 8225055 + msgbox SootopolisCity_Gym_1F_Text_GymGuidePostVictory, MSGBOX_DEFAULT release end -SootopolisCity_Gym_1F_EventScript_22505F:: @ 822505F +SootopolisCity_Gym_1F_EventScript_LeftGymStatue:: @ 822505F lockall - goto_if_set FLAG_BADGE08_GET, SootopolisCity_Gym_1F_EventScript_22507F - goto SootopolisCity_Gym_1F_EventScript_225089 + goto_if_set FLAG_BADGE08_GET, SootopolisCity_Gym_1F_EventScript_GymStatueCertified + goto SootopolisCity_Gym_1F_EventScript_GymStatue end -SootopolisCity_Gym_1F_EventScript_22506F:: @ 822506F +SootopolisCity_Gym_1F_EventScript_RightGymStatue:: @ 822506F lockall - goto_if_set FLAG_BADGE08_GET, SootopolisCity_Gym_1F_EventScript_22507F - goto SootopolisCity_Gym_1F_EventScript_225089 + goto_if_set FLAG_BADGE08_GET, SootopolisCity_Gym_1F_EventScript_GymStatueCertified + goto SootopolisCity_Gym_1F_EventScript_GymStatue end -SootopolisCity_Gym_1F_EventScript_22507F:: @ 822507F - msgbox SootopolisCity_Gym_1F_Text_225916, MSGBOX_DEFAULT +SootopolisCity_Gym_1F_EventScript_GymStatueCertified:: @ 822507F + msgbox SootopolisCity_Gym_1F_Text_GymStatueCertified, MSGBOX_DEFAULT releaseall end -SootopolisCity_Gym_1F_EventScript_225089:: @ 8225089 - msgbox SootopolisCity_Gym_1F_Text_2258FA, MSGBOX_DEFAULT +SootopolisCity_Gym_1F_EventScript_GymStatue:: @ 8225089 + msgbox SootopolisCity_Gym_1F_Text_GymStatue, MSGBOX_DEFAULT releaseall end -SootopolisCity_Gym_1F_Text_225093: @ 8225093 +SootopolisCity_Gym_1F_Text_GymGuideAdvice: @ 8225093 .string "Yo! How's it going, CHAMPION-\n" .string "bound {PLAYER}?\p" .string "SOOTOPOLIS's GYM LEADER JUAN is\n" @@ -196,14 +193,14 @@ SootopolisCity_Gym_1F_Text_225093: @ 8225093 .string "The rest of the way, you have to\n" .string "go for it yourself!$" -SootopolisCity_Gym_1F_Text_2251AF: @ 82251AF +SootopolisCity_Gym_1F_Text_GymGuidePostVictory: @ 82251AF .string "Yow! You've beaten even JUAN, who\n" .string "was supposedly the best in all HOENN!\p" .string "Okay! Check out your TRAINER CARD.\p" .string "If you've gotten all the BADGES, you're\n" .string "set for the POKéMON LEAGUE challenge!$" -SootopolisCity_Gym_1F_Text_225268: @ 8225268 +SootopolisCity_Gym_1F_Text_JuanPreBattle: @ 8225268 .string "Let me ask you.\n" .string "Did you know?\l" .string "Ah, I should not be so coy.\p" @@ -226,7 +223,7 @@ SootopolisCity_Gym_1F_Text_225268: @ 8225268 @ the gDisplayedStringBattle buffer that it's put into, and it stomps all over the gBattleTextBuffs @ after, as well as the otherwise unused array after that. One wonders if that's the reason for @ the existence of that unused array of ints. -SootopolisCity_Gym_1F_Text_225432: @ 8225432 +SootopolisCity_Gym_1F_Text_JuanDefeat: @ 8225432 .string "Ahahaha, excellent!\n" .string "Very well, you are the winner.\p" .string "From you, I sense the brilliant shine\n" @@ -241,11 +238,11 @@ SootopolisCity_Gym_1F_Text_225432: @ 8225432 .string "Rather than my clothes, I shall reward\n" .string "you with this, the RAIN BADGE!$" -SootopolisCity_Gym_1F_Text_225598: @ 8225598 +SootopolisCity_Gym_1F_Text_ReceivedRainBadge: @ 8225598 .string "{PLAYER} received the RAIN BADGE\n" .string "from JUAN.$" -SootopolisCity_Gym_1F_Text_2255BE: @ 82255BE +SootopolisCity_Gym_1F_Text_ExplainRainBadgeTakeThis: @ 82255BE .string "Having the RAIN BADGE shall assure you\n" .string "the full obedience of all your POKéMON\l" .string "to your every command.\p" @@ -255,18 +252,18 @@ SootopolisCity_Gym_1F_Text_2255BE: @ 82255BE .string "And, so that you never forget the\n" .string "battle we shared, take this…$" -SootopolisCity_Gym_1F_Text_2256C1: @ 82256C1 +SootopolisCity_Gym_1F_Text_ExplainWaterPulse: @ 82256C1 .string "The TECHNICAL MACHINE I handed you\n" .string "contains WATER PULSE.\p" .string "In use, it will occasionally confuse\n" .string "the target with ultrasonic waves.\p" .string "… … … … … …$" -SootopolisCity_Gym_1F_Text_22574D: @ 822574D +SootopolisCity_Gym_1F_Text_RegisteredJuan: @ 822574D .string "Registered GYM LEADER JUAN\n" .string "in the POKéNAV.$" -SootopolisCity_Gym_1F_Text_225778: @ 8225778 +SootopolisCity_Gym_1F_Text_JuanPostBattle: @ 8225778 .string "The TRAINERS who have gathered all\n" .string "the GYM BADGES of HOENN should make\l" .string "way to the ultimate destination.\p" @@ -276,22 +273,22 @@ SootopolisCity_Gym_1F_Text_225778: @ 8225778 .string "There, you shall find the POKéMON\n" .string "LEAGUE.$" -SootopolisCity_Gym_1F_Text_225865: @ 8225865 +SootopolisCity_Gym_1F_Text_GoGetFortreeBadge: @ 8225865 .string "There remains but one BADGE to\n" .string "obtain in HOENN.\p" .string "If you wish to challenge the POKéMON\n" .string "LEAGUE, you must obtain the last\l" .string "BADGE from the GYM in FORTREE.$" -SootopolisCity_Gym_1F_Text_2258FA: @ 82258FA +SootopolisCity_Gym_1F_Text_GymStatue: @ 82258FA .string "SOOTOPOLIS CITY POKéMON GYM$" -SootopolisCity_Gym_1F_Text_225916: @ 8225916 +SootopolisCity_Gym_1F_Text_GymStatueCertified: @ 8225916 .string "SOOTOPOLIS CITY POKéMON GYM\p" .string "JUAN'S CERTIFIED TRAINERS:\n" .string "{PLAYER}$" -SootopolisCity_Gym_1F_Text_225950: @ 8225950 +SootopolisCity_Gym_1F_Text_JuanPreRematch: @ 8225950 .string "JUAN: Ah, this GYM had returned to its\n" .string "usual state of serenity…\p" .string "But our young typhoon has returned\n" @@ -300,11 +297,11 @@ SootopolisCity_Gym_1F_Text_225950: @ 8225950 .string "I shall be delighted to dance with you\n" .string "as often as you wish!$" -SootopolisCity_Gym_1F_Text_225A2E: @ 8225A2E +SootopolisCity_Gym_1F_Text_JuanRematchDefeat: @ 8225A2E .string "Ahahaha, you are the winner!\n" .string "You have defeated me again!$" -SootopolisCity_Gym_1F_Text_225A67: @ 8225A67 +SootopolisCity_Gym_1F_Text_JuanPostRematch: @ 8225A67 .string "JUAN: If I told you to become my\n" .string "apprentice, you will refuse, I am sure.\p" .string "I would like to make a gift of my coat\n" @@ -314,7 +311,7 @@ SootopolisCity_Gym_1F_Text_225A67: @ 8225A67 .string "And that, my friend, is a certain sign\n" .string "of nobility!$" -SootopolisCity_Gym_1F_Text_225B48: @ 8225B48 +SootopolisCity_Gym_1F_Text_JuanRematchNeedTwoMons: @ 8225B48 .string "JUAN: Ah, this GYM had returned to its\n" .string "usual state of serenity…\p" .string "But our young typhoon has returned\n" diff --git a/data/maps/SootopolisCity_Gym_B1F/map.json b/data/maps/SootopolisCity_Gym_B1F/map.json index d378f84e2..0af53d062 100644 --- a/data/maps/SootopolisCity_Gym_B1F/map.json +++ b/data/maps/SootopolisCity_Gym_B1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "SootopolisCity_Gym_B1F_EventScript_225C8B", + "script": "SootopolisCity_Gym_B1F_EventScript_Andrea", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "SootopolisCity_Gym_B1F_EventScript_225CD0", + "script": "SootopolisCity_Gym_B1F_EventScript_Connie", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "SootopolisCity_Gym_B1F_EventScript_225CB9", + "script": "SootopolisCity_Gym_B1F_EventScript_Brianna", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "5", - "script": "SootopolisCity_Gym_B1F_EventScript_225CE7", + "script": "SootopolisCity_Gym_B1F_EventScript_Bridget", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "SootopolisCity_Gym_B1F_EventScript_225D15", + "script": "SootopolisCity_Gym_B1F_EventScript_Tiffany", "flag": "0" }, { @@ -89,7 +89,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "SootopolisCity_Gym_B1F_EventScript_225D2C", + "script": "SootopolisCity_Gym_B1F_EventScript_Bethany", "flag": "0" }, { @@ -102,7 +102,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "SootopolisCity_Gym_B1F_EventScript_225CA2", + "script": "SootopolisCity_Gym_B1F_EventScript_Crissy", "flag": "0" }, { @@ -115,7 +115,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "SootopolisCity_Gym_B1F_EventScript_225CFE", + "script": "SootopolisCity_Gym_B1F_EventScript_Olivia", "flag": "0" }, { @@ -128,7 +128,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "SootopolisCity_Gym_B1F_EventScript_225D5A", + "script": "SootopolisCity_Gym_B1F_EventScript_Daphne", "flag": "0" }, { @@ -141,7 +141,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "SootopolisCity_Gym_B1F_EventScript_225D43", + "script": "SootopolisCity_Gym_B1F_EventScript_Annika", "flag": "0" } ], diff --git a/data/maps/SootopolisCity_Gym_B1F/scripts.inc b/data/maps/SootopolisCity_Gym_B1F/scripts.inc index 0f402b930..fad5878fb 100644 --- a/data/maps/SootopolisCity_Gym_B1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_B1F/scripts.inc @@ -1,183 +1,183 @@ SootopolisCity_Gym_B1F_MapScripts:: @ 8225C8A .byte 0 -SootopolisCity_Gym_B1F_EventScript_225C8B:: @ 8225C8B - trainerbattle_single TRAINER_ANDREA, SootopolisCity_Gym_B1F_Text_225D71, SootopolisCity_Gym_B1F_Text_225DB6 - msgbox SootopolisCity_Gym_B1F_Text_225DCF, MSGBOX_AUTOCLOSE +SootopolisCity_Gym_B1F_EventScript_Andrea:: @ 8225C8B + trainerbattle_single TRAINER_ANDREA, SootopolisCity_Gym_B1F_Text_AndreaPreBattle, SootopolisCity_Gym_B1F_Text_AndreaDefeat + msgbox SootopolisCity_Gym_B1F_Text_AndreaPostBattle, MSGBOX_AUTOCLOSE end -SootopolisCity_Gym_B1F_EventScript_225CA2:: @ 8225CA2 - trainerbattle_single TRAINER_CRISSY, SootopolisCity_Gym_B1F_Text_225E04, SootopolisCity_Gym_B1F_Text_225E60 - msgbox SootopolisCity_Gym_B1F_Text_225E90, MSGBOX_AUTOCLOSE +SootopolisCity_Gym_B1F_EventScript_Crissy:: @ 8225CA2 + trainerbattle_single TRAINER_CRISSY, SootopolisCity_Gym_B1F_Text_CrissyPreBattle, SootopolisCity_Gym_B1F_Text_CrissyDefeat + msgbox SootopolisCity_Gym_B1F_Text_CrissyPostBattle, MSGBOX_AUTOCLOSE end -SootopolisCity_Gym_B1F_EventScript_225CB9:: @ 8225CB9 - trainerbattle_single TRAINER_BRIANNA, SootopolisCity_Gym_B1F_Text_22646E, SootopolisCity_Gym_B1F_Text_226495 - msgbox SootopolisCity_Gym_B1F_Text_2264BC, MSGBOX_AUTOCLOSE +SootopolisCity_Gym_B1F_EventScript_Brianna:: @ 8225CB9 + trainerbattle_single TRAINER_BRIANNA, SootopolisCity_Gym_B1F_Text_BriannaPreBattle, SootopolisCity_Gym_B1F_Text_BriannaDefeat + msgbox SootopolisCity_Gym_B1F_Text_BriannaPostBattle, MSGBOX_AUTOCLOSE end -SootopolisCity_Gym_B1F_EventScript_225CD0:: @ 8225CD0 - trainerbattle_single TRAINER_CONNIE, SootopolisCity_Gym_B1F_Text_225FBE, SootopolisCity_Gym_B1F_Text_225FEB - msgbox SootopolisCity_Gym_B1F_Text_225FFE, MSGBOX_AUTOCLOSE +SootopolisCity_Gym_B1F_EventScript_Connie:: @ 8225CD0 + trainerbattle_single TRAINER_CONNIE, SootopolisCity_Gym_B1F_Text_ConniePreBattle, SootopolisCity_Gym_B1F_Text_ConnieDefeat + msgbox SootopolisCity_Gym_B1F_Text_ConniePostBattle, MSGBOX_AUTOCLOSE end -SootopolisCity_Gym_B1F_EventScript_225CE7:: @ 8225CE7 - trainerbattle_single TRAINER_BRIDGET, SootopolisCity_Gym_B1F_Text_226061, SootopolisCity_Gym_B1F_Text_2260B6 - msgbox SootopolisCity_Gym_B1F_Text_2260D1, MSGBOX_AUTOCLOSE +SootopolisCity_Gym_B1F_EventScript_Bridget:: @ 8225CE7 + trainerbattle_single TRAINER_BRIDGET, SootopolisCity_Gym_B1F_Text_BridgetPreBattle, SootopolisCity_Gym_B1F_Text_BridgetDefeat + msgbox SootopolisCity_Gym_B1F_Text_BridgetPostBattle, MSGBOX_AUTOCLOSE end -SootopolisCity_Gym_B1F_EventScript_225CFE:: @ 8225CFE - trainerbattle_single TRAINER_OLIVIA, SootopolisCity_Gym_B1F_Text_226164, SootopolisCity_Gym_B1F_Text_2261A7 - msgbox SootopolisCity_Gym_B1F_Text_2261B5, MSGBOX_AUTOCLOSE +SootopolisCity_Gym_B1F_EventScript_Olivia:: @ 8225CFE + trainerbattle_single TRAINER_OLIVIA, SootopolisCity_Gym_B1F_Text_OliviaPreBattle, SootopolisCity_Gym_B1F_Text_OliviaDefeat + msgbox SootopolisCity_Gym_B1F_Text_OliviaPostBattle, MSGBOX_AUTOCLOSE end -SootopolisCity_Gym_B1F_EventScript_225D15:: @ 8225D15 - trainerbattle_single TRAINER_TIFFANY, SootopolisCity_Gym_B1F_Text_2261F7, SootopolisCity_Gym_B1F_Text_226274 - msgbox SootopolisCity_Gym_B1F_Text_226286, MSGBOX_AUTOCLOSE +SootopolisCity_Gym_B1F_EventScript_Tiffany:: @ 8225D15 + trainerbattle_single TRAINER_TIFFANY, SootopolisCity_Gym_B1F_Text_TiffanyPreBattle, SootopolisCity_Gym_B1F_Text_TiffanyDefeat + msgbox SootopolisCity_Gym_B1F_Text_TiffanyPostBattle, MSGBOX_AUTOCLOSE end -SootopolisCity_Gym_B1F_EventScript_225D2C:: @ 8225D2C - trainerbattle_single TRAINER_BETHANY, SootopolisCity_Gym_B1F_Text_2262F3, SootopolisCity_Gym_B1F_Text_22633B - msgbox SootopolisCity_Gym_B1F_Text_226341, MSGBOX_AUTOCLOSE +SootopolisCity_Gym_B1F_EventScript_Bethany:: @ 8225D2C + trainerbattle_single TRAINER_BETHANY, SootopolisCity_Gym_B1F_Text_BethanyPreBattle, SootopolisCity_Gym_B1F_Text_BethanyDefeat + msgbox SootopolisCity_Gym_B1F_Text_BethanyPostBattle, MSGBOX_AUTOCLOSE end -SootopolisCity_Gym_B1F_EventScript_225D43:: @ 8225D43 - trainerbattle_single TRAINER_ANNIKA, SootopolisCity_Gym_B1F_Text_226388, SootopolisCity_Gym_B1F_Text_2263BD - msgbox SootopolisCity_Gym_B1F_Text_2263F4, MSGBOX_AUTOCLOSE +SootopolisCity_Gym_B1F_EventScript_Annika:: @ 8225D43 + trainerbattle_single TRAINER_ANNIKA, SootopolisCity_Gym_B1F_Text_AnnikaPreBattle, SootopolisCity_Gym_B1F_Text_AnnikaDefeat + msgbox SootopolisCity_Gym_B1F_Text_AnnikaPostBattle, MSGBOX_AUTOCLOSE end -SootopolisCity_Gym_B1F_EventScript_225D5A:: @ 8225D5A - trainerbattle_single TRAINER_DAPHNE, SootopolisCity_Gym_B1F_Text_225ED6, SootopolisCity_Gym_B1F_Text_225F35 - msgbox SootopolisCity_Gym_B1F_Text_225F67, MSGBOX_AUTOCLOSE +SootopolisCity_Gym_B1F_EventScript_Daphne:: @ 8225D5A + trainerbattle_single TRAINER_DAPHNE, SootopolisCity_Gym_B1F_Text_DaphnePreBattle, SootopolisCity_Gym_B1F_Text_DaphneDefeat + msgbox SootopolisCity_Gym_B1F_Text_DaphnePostBattle, MSGBOX_AUTOCLOSE end -SootopolisCity_Gym_B1F_Text_225D71: @ 8225D71 +SootopolisCity_Gym_B1F_Text_AndreaPreBattle: @ 8225D71 .string "I'll show you the sublime techniques\n" .string "I learned from our LEADER JUAN!$" -SootopolisCity_Gym_B1F_Text_225DB6: @ 8225DB6 +SootopolisCity_Gym_B1F_Text_AndreaDefeat: @ 8225DB6 .string "Please forgive me, JUAN…$" -SootopolisCity_Gym_B1F_Text_225DCF: @ 8225DCF +SootopolisCity_Gym_B1F_Text_AndreaPostBattle: @ 8225DCF .string "Watch what happens if you crack all\n" .string "the floor tiles.$" -SootopolisCity_Gym_B1F_Text_225E04: @ 8225E04 +SootopolisCity_Gym_B1F_Text_CrissyPreBattle: @ 8225E04 .string "You came all the way here, but you won't\n" .string "get to see JUAN.\p" .string "Not if you lose to me, you won't!$" -SootopolisCity_Gym_B1F_Text_225E60: @ 8225E60 +SootopolisCity_Gym_B1F_Text_CrissyDefeat: @ 8225E60 .string "You're strong!\n" .string "I was fooled by your cute looks!$" -SootopolisCity_Gym_B1F_Text_225E90: @ 8225E90 +SootopolisCity_Gym_B1F_Text_CrissyPostBattle: @ 8225E90 .string "You might be good enough to avoid\n" .string "being wiped out in one hit by JUAN.$" -SootopolisCity_Gym_B1F_Text_225ED6: @ 8225ED6 +SootopolisCity_Gym_B1F_Text_DaphnePreBattle: @ 8225ED6 .string "The sight of JUAN conducting\n" .string "a battle…\p" .string "The very beauty of it compelled me to\n" .string "become a TRAINER.$" -SootopolisCity_Gym_B1F_Text_225F35: @ 8225F35 +SootopolisCity_Gym_B1F_Text_DaphneDefeat: @ 8225F35 .string "You battled with more beauty than\n" .string "I could muster…$" -SootopolisCity_Gym_B1F_Text_225F67: @ 8225F67 +SootopolisCity_Gym_B1F_Text_DaphnePostBattle: @ 8225F67 .string "The grace you bring to battle is\n" .string "fabulous.\p" .string "Oh… I'm so fortunate to have found\n" .string "POKéMON.$" -SootopolisCity_Gym_B1F_Text_225FBE: @ 8225FBE +SootopolisCity_Gym_B1F_Text_ConniePreBattle: @ 8225FBE .string "I should teach you how harsh battles\n" .string "can be.$" -SootopolisCity_Gym_B1F_Text_225FEB: @ 8225FEB +SootopolisCity_Gym_B1F_Text_ConnieDefeat: @ 8225FEB .string "Oh.\n" .string "You're strong.$" -SootopolisCity_Gym_B1F_Text_225FFE: @ 8225FFE +SootopolisCity_Gym_B1F_Text_ConniePostBattle: @ 8225FFE .string "I'll tell you something good.\p" .string "If you want to reach JUAN, you\n" .string "need to walk on each floor tile once.$" -SootopolisCity_Gym_B1F_Text_226061: @ 8226061 +SootopolisCity_Gym_B1F_Text_BridgetPreBattle: @ 8226061 .string "The POKéMON GYM of the highest level\n" .string "in the HOENN region…\p" .string "That's the SOOTOPOLIS GYM.$" -SootopolisCity_Gym_B1F_Text_2260B6: @ 82260B6 +SootopolisCity_Gym_B1F_Text_BridgetDefeat: @ 82260B6 .string "What a high level you are!$" -SootopolisCity_Gym_B1F_Text_2260D1: @ 82260D1 +SootopolisCity_Gym_B1F_Text_BridgetPostBattle: @ 82260D1 .string "Rather than being satisfied by being\n" .string "in a strong GYM, I imagine training in\l" .string "other places will make you stronger.\l" .string "But above all, it looks more fun.$" -SootopolisCity_Gym_B1F_Text_226164: @ 8226164 +SootopolisCity_Gym_B1F_Text_OliviaPreBattle: @ 8226164 .string "I train my POKéMON together with\n" .string "JUAN.\p" .string "Don't think I'm a pushover.$" -SootopolisCity_Gym_B1F_Text_2261A7: @ 82261A7 +SootopolisCity_Gym_B1F_Text_OliviaDefeat: @ 82261A7 .string "I was beaten…$" -SootopolisCity_Gym_B1F_Text_2261B5: @ 82261B5 +SootopolisCity_Gym_B1F_Text_OliviaPostBattle: @ 82261B5 .string "I think you have potential.\n" .string "Why don't you stay and train with us?$" -SootopolisCity_Gym_B1F_Text_2261F7: @ 82261F7 +SootopolisCity_Gym_B1F_Text_TiffanyPreBattle: @ 82261F7 .string "A graceful glide across the ice while\n" .string "crossing no lines…\p" .string "A TRAINER putting on that performance\n" .string "would be elegantly beautiful!$" -SootopolisCity_Gym_B1F_Text_226274: @ 8226274 +SootopolisCity_Gym_B1F_Text_TiffanyDefeat: @ 8226274 .string "Well, excuse me?!$" -SootopolisCity_Gym_B1F_Text_226286: @ 8226286 +SootopolisCity_Gym_B1F_Text_TiffanyPostBattle: @ 8226286 .string "This is really obvious, but how strong\n" .string "you are as a TRAINER has nothing to do\l" .string "with how young or old you are.$" -SootopolisCity_Gym_B1F_Text_2262F3: @ 82262F3 +SootopolisCity_Gym_B1F_Text_BethanyPreBattle: @ 82262F3 .string "When I'm with my POKéMON, the time\n" .string "flies by before you can say, “Oops!”$" -SootopolisCity_Gym_B1F_Text_22633B: @ 822633B +SootopolisCity_Gym_B1F_Text_BethanyDefeat: @ 822633B .string "Oops!$" -SootopolisCity_Gym_B1F_Text_226341: @ 8226341 +SootopolisCity_Gym_B1F_Text_BethanyPostBattle: @ 8226341 .string "I wish I could forget about lost causes\n" .string "before I can manage an “Oops!”$" -SootopolisCity_Gym_B1F_Text_226388: @ 8226388 +SootopolisCity_Gym_B1F_Text_AnnikaPreBattle: @ 8226388 .string "I can battle with really rare POKéMON\n" .string "if you'd like.$" -SootopolisCity_Gym_B1F_Text_2263BD: @ 82263BD +SootopolisCity_Gym_B1F_Text_AnnikaDefeat: @ 82263BD .string "Oh, there now! Did you have a good look\n" .string "at my POKéMON?$" -SootopolisCity_Gym_B1F_Text_2263F4: @ 82263F4 +SootopolisCity_Gym_B1F_Text_AnnikaPostBattle: @ 82263F4 .string "I came to this GYM because JUAN\n" .string "praised me for my darling POKéMON.\p" .string "Oh, if only I'd met JUAN years ago\n" .string "when I was younger…$" -SootopolisCity_Gym_B1F_Text_22646E: @ 822646E +SootopolisCity_Gym_B1F_Text_BriannaPreBattle: @ 822646E .string "Giggle…\n" .string "Your grim look is so charming.$" -SootopolisCity_Gym_B1F_Text_226495: @ 8226495 +SootopolisCity_Gym_B1F_Text_BriannaDefeat: @ 8226495 .string "Oh, dear.\n" .string "I went much too easy on you.$" -SootopolisCity_Gym_B1F_Text_2264BC: @ 82264BC +SootopolisCity_Gym_B1F_Text_BriannaPostBattle: @ 82264BC .string "You couldn't lay a finger on JUAN,\n" .string "I'm sure. Giggle…$" |