diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-11-01 17:50:54 -0400 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-11-01 17:22:45 -0500 |
| commit | 5f1fcdd0234d07b54637db05a4e7d658e89e4531 (patch) | |
| tree | a65609912785e76b35e3912b5a2176528f1c3c69 | |
| parent | dd01942c4f41d65fb861a42097108e5f5d9b93e9 (diff) | |
Document aqua/magma area scripts
26 files changed, 1197 insertions, 1175 deletions
diff --git a/data/maps/JaggedPass/map.json b/data/maps/JaggedPass/map.json index e695c826c..ea13d94c2 100644 --- a/data/maps/JaggedPass/map.json +++ b/data/maps/JaggedPass/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "JaggedPass_EventScript_230785", + "script": "JaggedPass_EventScript_Eric", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "JaggedPass_EventScript_2307FB", + "script": "JaggedPass_EventScript_Ethan", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "JaggedPass_EventScript_23079C", + "script": "JaggedPass_EventScript_Diana", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "JaggedPass_EventScript_230718", + "script": "JaggedPass_EventScript_MagmaHideoutGuard", "flag": "FLAG_HIDE_JAGGED_PASS_MAGMA_GUARD" }, { @@ -89,7 +89,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "JaggedPass_EventScript_230871", + "script": "JaggedPass_EventScript_Autumn", "flag": "0" }, { @@ -102,7 +102,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "JaggedPass_EventScript_23085A", + "script": "JaggedPass_EventScript_Julio", "flag": "0" } ], @@ -186,7 +186,7 @@ "elevation": 3, "var": "VAR_JAGGED_PASS_STATE", "var_value": "1", - "script": "JaggedPass_EventScript_2306BB" + "script": "JaggedPass_EventScript_OpenMagmaHideout" }, { "type": "trigger", @@ -195,7 +195,7 @@ "elevation": 3, "var": "VAR_JAGGED_PASS_STATE", "var_value": "1", - "script": "JaggedPass_EventScript_2306BB" + "script": "JaggedPass_EventScript_OpenMagmaHideout" }, { "type": "trigger", @@ -204,7 +204,7 @@ "elevation": 3, "var": "VAR_JAGGED_PASS_STATE", "var_value": "1", - "script": "JaggedPass_EventScript_2306BB" + "script": "JaggedPass_EventScript_OpenMagmaHideout" }, { "type": "trigger", @@ -213,7 +213,7 @@ "elevation": 3, "var": "VAR_JAGGED_PASS_STATE", "var_value": "1", - "script": "JaggedPass_EventScript_2306BB" + "script": "JaggedPass_EventScript_OpenMagmaHideout" }, { "type": "trigger", @@ -222,7 +222,7 @@ "elevation": 3, "var": "VAR_JAGGED_PASS_STATE", "var_value": "1", - "script": "JaggedPass_EventScript_2306BB" + "script": "JaggedPass_EventScript_OpenMagmaHideout" } ], "bg_events": [ diff --git a/data/maps/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc index a3a6234d3..d0a032ab2 100644 --- a/data/maps/JaggedPass/scripts.inc +++ b/data/maps/JaggedPass/scripts.inc @@ -1,46 +1,46 @@ JaggedPass_MapScripts:: @ 8230656 - map_script MAP_SCRIPT_ON_RESUME, JaggedPass_MapScript1_230666 + map_script MAP_SCRIPT_ON_RESUME, JaggedPass_OnResume map_script MAP_SCRIPT_ON_TRANSITION, JaggedPass_OnTransition - map_script MAP_SCRIPT_ON_LOAD, JaggedPass_MapScript1_23069C + map_script MAP_SCRIPT_ON_LOAD, JaggedPass_OnLoad .byte 0 -JaggedPass_MapScript1_230666: @ 8230666 +JaggedPass_OnResume: @ 8230666 setstepcallback STEP_CB_ASH compare VAR_JAGGED_PASS_STATE, 0 - call_if_eq JaggedPass_EventScript_230674 + call_if_eq JaggedPass_EventScript_CheckHasMagmaEmblem end -JaggedPass_EventScript_230674:: @ 8230674 +JaggedPass_EventScript_CheckHasMagmaEmblem:: @ 8230674 checkitem ITEM_MAGMA_EMBLEM, 1 compare VAR_RESULT, 1 - goto_if_eq JaggedPass_EventScript_230685 + goto_if_eq JaggedPass_EventScript_SetReadyToOpenHideout return -JaggedPass_EventScript_230685:: @ 8230685 +JaggedPass_EventScript_SetReadyToOpenHideout:: @ 8230685 setvar VAR_JAGGED_PASS_STATE, 1 return JaggedPass_OnTransition: @ 823068B compare VAR_JAGGED_PASS_ASH_WEATHER, 1 - call_if_eq JaggedPass_EventScript_230697 + call_if_eq JaggedPass_EventScript_SetWeatherAsh end -JaggedPass_EventScript_230697:: @ 8230697 +JaggedPass_EventScript_SetWeatherAsh:: @ 8230697 setweather WEATHER_ASH doweather return -JaggedPass_MapScript1_23069C: @ 823069C +JaggedPass_OnLoad: @ 823069C compare VAR_JAGGED_PASS_STATE, 1 - goto_if_le JaggedPass_EventScript_2306A8 + goto_if_le JaggedPass_EventScript_ConcealHideoutEntrance end -JaggedPass_EventScript_2306A8:: @ 82306A8 +JaggedPass_EventScript_ConcealHideoutEntrance:: @ 82306A8 setmetatile 16, 17, METATILE_Lavaridge_RockWall, 1 setmetatile 16, 18, METATILE_Lavaridge_RockWall, 1 end -JaggedPass_EventScript_2306BB:: @ 82306BB +JaggedPass_EventScript_OpenMagmaHideout:: @ 82306BB lockall setvar VAR_0x8004, 1 @ vertical pan setvar VAR_0x8005, 1 @ horizontal pan @@ -48,7 +48,7 @@ JaggedPass_EventScript_2306BB:: @ 82306BB setvar VAR_0x8007, 5 @ shake delay special ShakeCamera waitstate - msgbox JaggedPass_Text_230DBA, MSGBOX_DEFAULT + msgbox JaggedPass_Text_BoulderShakingInResponseToEmblem, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, 1 @ vertical pan setvar VAR_0x8005, 1 @ horizontal pan @@ -66,9 +66,9 @@ JaggedPass_EventScript_2306BB:: @ 82306BB releaseall end -JaggedPass_EventScript_230718:: @ 8230718 +JaggedPass_EventScript_MagmaHideoutGuard:: @ 8230718 lockall - goto_if_set FLAG_BEAT_MAGMA_GRUNT_JAGGED_PASS, JaggedPass_EventScript_230766 + goto_if_set FLAG_BEAT_MAGMA_GRUNT_JAGGED_PASS, JaggedPass_EventScript_GuardDefeated waitse playse SE_PIN applymovement 5, Common_Movement_ExclamationMark @@ -77,196 +77,196 @@ JaggedPass_EventScript_230718:: @ 8230718 waitmovement 0 applymovement 5, Common_Movement_FacePlayer waitmovement 0 - msgbox JaggedPass_Text_230CCB, MSGBOX_DEFAULT + msgbox JaggedPass_Text_Grunt30Intro, MSGBOX_DEFAULT closemessage - trainerbattle_no_intro TRAINER_GRUNT_30, JaggedPass_Text_230D2D + trainerbattle_no_intro TRAINER_GRUNT_30, JaggedPass_Text_Grunt30Defeat setflag FLAG_BEAT_MAGMA_GRUNT_JAGGED_PASS applymovement 5, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end -JaggedPass_EventScript_230766:: @ 8230766 +JaggedPass_EventScript_GuardDefeated:: @ 8230766 applymovement 5, Common_Movement_FacePlayer waitmovement 0 - msgbox JaggedPass_Text_230D65, MSGBOX_DEFAULT + msgbox JaggedPass_Text_GoWhereverYouWant, MSGBOX_DEFAULT closemessage applymovement 5, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end -JaggedPass_EventScript_230785:: @ 8230785 - trainerbattle_single TRAINER_ERIC, JaggedPass_Text_230888, JaggedPass_Text_2308FF - msgbox JaggedPass_Text_230916, MSGBOX_AUTOCLOSE +JaggedPass_EventScript_Eric:: @ 8230785 + trainerbattle_single TRAINER_ERIC, JaggedPass_Text_EricIntro, JaggedPass_Text_EricDefeat + msgbox JaggedPass_Text_EricPostBattle, MSGBOX_AUTOCLOSE end -JaggedPass_EventScript_23079C:: @ 823079C - trainerbattle_single TRAINER_DIANA_1, JaggedPass_Text_230974, JaggedPass_Text_2309B5, JaggedPass_EventScript_2307C8 +JaggedPass_EventScript_Diana:: @ 823079C + trainerbattle_single TRAINER_DIANA_1, JaggedPass_Text_DianaIntro, JaggedPass_Text_DianaDefeat, JaggedPass_EventScript_RegisterDiana specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if_eq JaggedPass_EventScript_2307E4 - msgbox JaggedPass_Text_2309D8, MSGBOX_DEFAULT + goto_if_eq JaggedPass_EventScript_DianaRematch + msgbox JaggedPass_Text_DianaPostBattle, MSGBOX_DEFAULT release end -JaggedPass_EventScript_2307C8:: @ 82307C8 +JaggedPass_EventScript_RegisterDiana:: @ 82307C8 special PlayerFaceTrainerAfterBattle - msgbox JaggedPass_Text_230A2C, MSGBOX_DEFAULT + msgbox JaggedPass_Text_DianaRegister, MSGBOX_DEFAULT register_matchcall TRAINER_DIANA_1 release end -JaggedPass_EventScript_2307E4:: @ 82307E4 - trainerbattle_rematch TRAINER_DIANA_1, JaggedPass_Text_230A76, JaggedPass_Text_230AAA - msgbox JaggedPass_Text_230AD7, MSGBOX_AUTOCLOSE +JaggedPass_EventScript_DianaRematch:: @ 82307E4 + trainerbattle_rematch TRAINER_DIANA_1, JaggedPass_Text_DianaRematchIntro, JaggedPass_Text_DianaRematchDefeat + msgbox JaggedPass_Text_DianaPostRematch, MSGBOX_AUTOCLOSE end -JaggedPass_EventScript_2307FB:: @ 82307FB - trainerbattle_single TRAINER_ETHAN_1, JaggedPass_Text_230B10, JaggedPass_Text_230B50, JaggedPass_EventScript_230827 +JaggedPass_EventScript_Ethan:: @ 82307FB + trainerbattle_single TRAINER_ETHAN_1, JaggedPass_Text_EthanIntro, JaggedPass_Text_EthanDefeat, JaggedPass_EventScript_RegisterEthan specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if_eq JaggedPass_EventScript_230843 - msgbox JaggedPass_Text_230B93, MSGBOX_DEFAULT + goto_if_eq JaggedPass_EventScript_EthanRematch + msgbox JaggedPass_Text_EthanPostBattle, MSGBOX_DEFAULT release end -JaggedPass_EventScript_230827:: @ 8230827 +JaggedPass_EventScript_RegisterEthan:: @ 8230827 special PlayerFaceTrainerAfterBattle - msgbox JaggedPass_Text_230BC6, MSGBOX_DEFAULT + msgbox JaggedPass_Text_EthanRegister, MSGBOX_DEFAULT register_matchcall TRAINER_ETHAN_1 release end -JaggedPass_EventScript_230843:: @ 8230843 - trainerbattle_rematch TRAINER_ETHAN_1, JaggedPass_Text_230C28, JaggedPass_Text_230C60 - msgbox JaggedPass_Text_230C94, MSGBOX_AUTOCLOSE +JaggedPass_EventScript_EthanRematch:: @ 8230843 + trainerbattle_rematch TRAINER_ETHAN_1, JaggedPass_Text_EthanRematchIntro, JaggedPass_Text_EthanRematchDefeat + msgbox JaggedPass_Text_EthanPostRematch, MSGBOX_AUTOCLOSE end -JaggedPass_EventScript_23085A:: @ 823085A - trainerbattle_single TRAINER_JULIO, JaggedPass_Text_230DF7, JaggedPass_Text_230E38 - msgbox JaggedPass_Text_230E57, MSGBOX_AUTOCLOSE +JaggedPass_EventScript_Julio:: @ 823085A + trainerbattle_single TRAINER_JULIO, JaggedPass_Text_JulioIntro, JaggedPass_Text_JulioDefeat + msgbox JaggedPass_Text_JulioPostBattle, MSGBOX_AUTOCLOSE end -JaggedPass_EventScript_230871:: @ 8230871 - trainerbattle_single TRAINER_AUTUMN, JaggedPass_Text_230E8E, JaggedPass_Text_230ECD - msgbox JaggedPass_Text_230EE3, MSGBOX_AUTOCLOSE +JaggedPass_EventScript_Autumn:: @ 8230871 + trainerbattle_single TRAINER_AUTUMN, JaggedPass_Text_AutumnIntro, JaggedPass_Text_AutumnDefeat + msgbox JaggedPass_Text_AutumnPostBattle, MSGBOX_AUTOCLOSE end -JaggedPass_Text_230888: @ 8230888 +JaggedPass_Text_EricIntro: @ 8230888 .string "MT. CHIMNEY's JAGGED PASS…\p" .string "Now this is what I've always wanted\n" .string "in a mountain.\p" .string "This jagged bumpiness…\n" .string "It rocks my soul!$" -JaggedPass_Text_2308FF: @ 82308FF +JaggedPass_Text_EricDefeat: @ 82308FF .string "Losing left me bitter!$" -JaggedPass_Text_230916: @ 8230916 +JaggedPass_Text_EricPostBattle: @ 8230916 .string "Yes, I did lose at POKéMON…\p" .string "But, when it comes to the love of\n" .string "the mountains, I have you beat!$" -JaggedPass_Text_230974: @ 8230974 +JaggedPass_Text_DianaIntro: @ 8230974 .string "This place isn't your casual hike.\n" .string "It's not suited for a picnic.$" -JaggedPass_Text_2309B5: @ 82309B5 +JaggedPass_Text_DianaDefeat: @ 82309B5 .string "Ohhh, no!\n" .string "The ground is too bumpy…$" -JaggedPass_Text_2309D8: @ 82309D8 +JaggedPass_Text_DianaPostBattle: @ 82309D8 .string "Did you know?\p" .string "Some people cleverly ride their\n" .string "bicycles up this horribly bumpy pass.$" -JaggedPass_Text_230A2C: @ 8230A2C +JaggedPass_Text_DianaRegister: @ 8230A2C .string "Will you ever be back in this area?\n" .string "If you do return, I'd like a rematch.$" -JaggedPass_Text_230A76: @ 8230A76 +JaggedPass_Text_DianaRematchIntro: @ 8230A76 .string "Picnics are fun wherever you go.\n" .string "Just like POKéMON!$" -JaggedPass_Text_230AAA: @ 8230AAA +JaggedPass_Text_DianaRematchDefeat: @ 8230AAA .string "I only lost because the ground is\n" .string "too bumpy!$" -JaggedPass_Text_230AD7: @ 8230AD7 +JaggedPass_Text_DianaPostRematch: @ 8230AD7 .string "I'll forget about losing and just\n" .string "enjoy this bumpy hike.$" -JaggedPass_Text_230B10: @ 8230B10 +JaggedPass_Text_EthanIntro: @ 8230B10 .string "JAGGED PASS is hard to walk on.\n" .string "It's a good place for training.$" -JaggedPass_Text_230B50: @ 8230B50 +JaggedPass_Text_EthanDefeat: @ 8230B50 .string "It was all over while we were still\n" .string "trying to find a good footing…$" -JaggedPass_Text_230B93: @ 8230B93 +JaggedPass_Text_EthanPostBattle: @ 8230B93 .string "If I had an ACRO BIKE, I'd be able to\n" .string "jump ledges.$" -JaggedPass_Text_230BC6: @ 8230BC6 +JaggedPass_Text_EthanRegister: @ 8230BC6 .string "When I get more used to this bumpiness,\n" .string "I'll be sure to win!\p" .string "Can you register me in your POKéNAV?$" -JaggedPass_Text_230C28: @ 8230C28 +JaggedPass_Text_EthanRematchIntro: @ 8230C28 .string "I got used to this bumpiness.\n" .string "I sing while I climb now.$" -JaggedPass_Text_230C60: @ 8230C60 +JaggedPass_Text_EthanRematchDefeat: @ 8230C60 .string "It's still not easy to battle on this\n" .string "bumpy ground…$" -JaggedPass_Text_230C94: @ 8230C94 +JaggedPass_Text_EthanPostRematch: @ 8230C94 .string "I should get an ACRO BIKE from RYDEL\n" .string "in MAUVILLE CITY…$" -JaggedPass_Text_230CCB: @ 8230CCB +JaggedPass_Text_Grunt30Intro: @ 8230CCB .string "Wah!\n" .string "What are you doing here?\p" .string "What am I doing in a place like this?\p" .string "What business is it of yours?$" -JaggedPass_Text_230D2D: @ 8230D2D +JaggedPass_Text_Grunt30Defeat: @ 8230D2D .string "Urrrgh…\p" .string "I should've ducked into our HIDEOUT\n" .string "right away…$" -JaggedPass_Text_230D65: @ 8230D65 +JaggedPass_Text_GoWhereverYouWant: @ 8230D65 .string "Okay, oh-kay!\n" .string "I admit it--you're strong!\p" .string "Don't worry about me.\n" .string "Go wherever you want!$" -JaggedPass_Text_230DBA: @ 8230DBA +JaggedPass_Text_BoulderShakingInResponseToEmblem: @ 8230DBA .string "Oh! This boulder is shaking in response\n" .string "to the MAGMA EMBLEM!$" -JaggedPass_Text_230DF7: @ 8230DF7 +JaggedPass_Text_JulioIntro: @ 8230DF7 .string "Aiyeeh! It's awfully scary to shoot\n" .string "down the mountain in one go!$" -JaggedPass_Text_230E38: @ 8230E38 +JaggedPass_Text_JulioDefeat: @ 8230E38 .string "I feel like I'm falling apart…$" -JaggedPass_Text_230E57: @ 8230E57 +JaggedPass_Text_JulioPostBattle: @ 8230E57 .string "My bicycle bounced around so much,\n" .string "my rear end's sore…$" -JaggedPass_Text_230E8E: @ 8230E8E +JaggedPass_Text_AutumnIntro: @ 8230E8E .string "I climb this hill every day.\n" .string "I have confidence in my strength!$" -JaggedPass_Text_230ECD: @ 8230ECD +JaggedPass_Text_AutumnDefeat: @ 8230ECD .string "Hmm…\n" .string "What went wrong?$" -JaggedPass_Text_230EE3: @ 8230EE3 +JaggedPass_Text_AutumnPostBattle: @ 8230EE3 .string "What is that odd rock protrusion\n" .string "a little up the hill from here?$" diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc index fc6a45d84..ec5e2bb70 100644 --- a/data/maps/MossdeepCity_Gym/scripts.inc +++ b/data/maps/MossdeepCity_Gym/scripts.inc @@ -77,7 +77,7 @@ MossdeepCity_Gym_EventScript_TateAndLizaDefeated:: @ 82208D1 clearflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_STEVEN setvar VAR_MOSSDEEP_CITY_STATE, 1 setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_STEVEN - setvar VAR_MOSSDEEP_SPACE_CENTER_STATE_2, 1 + setvar VAR_MOSSDEEP_SPACE_CENTER_STATE, 1 call MossdeepCity_Gym_EventScript_GiveCalmMind closemessage delay 30 diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/map.json b/data/maps/MossdeepCity_SpaceCenter_1F/map.json index 0d02d368a..b79f758cd 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/map.json +++ b/data/maps/MossdeepCity_SpaceCenter_1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_SpaceCenter_1F_EventScript_222FD8", + "script": "MossdeepCity_SpaceCenter_1F_EventScript_RocketLaunchCounter", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_SpaceCenter_1F_EventScript_223063", + "script": "MossdeepCity_SpaceCenter_1F_EventScript_Scientist", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_SpaceCenter_1F_EventScript_22308E", + "script": "MossdeepCity_SpaceCenter_1F_EventScript_SunStoneMan", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_SpaceCenter_1F_EventScript_223168", + "script": "MossdeepCity_SpaceCenter_1F_EventScript_OldMan", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_SpaceCenter_1F_EventScript_22312D", + "script": "MossdeepCity_SpaceCenter_1F_EventScript_Woman", "flag": "0" }, { @@ -89,7 +89,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "MossdeepCity_SpaceCenter_1F_EventScript_2231DA", + "script": "MossdeepCity_SpaceCenter_1F_EventScript_Grunt32", "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA" }, { @@ -102,7 +102,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "MossdeepCity_SpaceCenter_1F_EventScript_2231F1", + "script": "MossdeepCity_SpaceCenter_1F_EventScript_Grunt16", "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA" }, { @@ -115,7 +115,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "MossdeepCity_SpaceCenter_1F_EventScript_223208", + "script": "MossdeepCity_SpaceCenter_1F_EventScript_Grunt33", "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA" }, { @@ -128,7 +128,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_SpaceCenter_1F_EventScript_22321F", + "script": "MossdeepCity_SpaceCenter_1F_EventScript_Grunt23", "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA" }, { @@ -141,8 +141,8 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_SpaceCenter_1F_EventScript_2231CF", - "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_INVISIBLE_NINJA_BOY" + "script": "MossdeepCity_SpaceCenter_1F_EventScript_MagmaNote", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_MAGMA_NOTE" }, { "graphics_id": "EVENT_OBJ_GFX_STEVEN", @@ -154,7 +154,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_SpaceCenter_1F_EventScript_2231B9", + "script": "MossdeepCity_SpaceCenter_1F_EventScript_Steven", "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_STEVEN" } ], diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc index e5f43565c..17bf5c896 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc @@ -5,10 +5,10 @@ MossdeepCity_SpaceCenter_1F_MapScripts:: @ 8222F41 MossdeepCity_SpaceCenter_1F_OnTransition: @ 8222F4C compare VAR_MOSSDEEP_CITY_STATE, 2 - goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_222F58 + goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_MoveObjectsForTeamMagma end -MossdeepCity_SpaceCenter_1F_EventScript_222F58:: @ 8222F58 +MossdeepCity_SpaceCenter_1F_EventScript_MoveObjectsForTeamMagma:: @ 8222F58 setobjectxyperm 3, 1, 9 setobjectmovementtype 3, MOVEMENT_TYPE_FACE_RIGHT setobjectxyperm 5, 0, 8 @@ -18,291 +18,296 @@ MossdeepCity_SpaceCenter_1F_EventScript_222F58:: @ 8222F58 setobjectxyperm 1, 3, 4 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_RIGHT setobjectmovementtype 2, MOVEMENT_TYPE_FACE_RIGHT - compare VAR_MOSSDEEP_SPACE_CENTER_STATE_1, 1 - goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_222FAA - compare VAR_MOSSDEEP_SPACE_CENTER_STATE_1, 2 - goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_222FB2 - compare VAR_MOSSDEEP_SPACE_CENTER_STATE_1, 3 - goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_222FBA + compare VAR_MOSSDEEP_SPACE_CENTER_STAIR_GUARD_STATE, 1 + goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_MoveStairGuardLeft + compare VAR_MOSSDEEP_SPACE_CENTER_STAIR_GUARD_STATE, 2 + goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_MoveStairGuardDown + compare VAR_MOSSDEEP_SPACE_CENTER_STAIR_GUARD_STATE, 3 + goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_MoveStairGuardRight end -MossdeepCity_SpaceCenter_1F_EventScript_222FAA:: @ 8222FAA +MossdeepCity_SpaceCenter_1F_EventScript_MoveStairGuardLeft:: @ 8222FAA setobjectxyperm 9, 12, 2 end -MossdeepCity_SpaceCenter_1F_EventScript_222FB2:: @ 8222FB2 +MossdeepCity_SpaceCenter_1F_EventScript_MoveStairGuardDown:: @ 8222FB2 setobjectxyperm 9, 13, 3 end -MossdeepCity_SpaceCenter_1F_EventScript_222FBA:: @ 8222FBA +@ Functionally unused. See comment on MossdeepCity_SpaceCenter_1F_EventScript_MoveGruntFromStairsEast +MossdeepCity_SpaceCenter_1F_EventScript_MoveStairGuardRight:: @ 8222FBA setobjectxyperm 9, 14, 2 end MossdeepCity_SpaceCenter_1F_OnLoad: @ 8222FC2 compare VAR_MOSSDEEP_CITY_STATE, 2 - goto_if_le MossdeepCity_SpaceCenter_1F_EventScript_222FCE + goto_if_le MossdeepCity_SpaceCenter_1F_EventScript_SetMagmaNote end -MossdeepCity_SpaceCenter_1F_EventScript_222FCE:: @ 8222FCE +MossdeepCity_SpaceCenter_1F_EventScript_SetMagmaNote:: @ 8222FCE setmetatile 2, 5, METATILE_Facility_DataPad, 1 return -MossdeepCity_SpaceCenter_1F_EventScript_222FD8:: @ 8222FD8 +MossdeepCity_SpaceCenter_1F_EventScript_RocketLaunchCounter:: @ 8222FD8 lock faceplayer compare VAR_MOSSDEEP_CITY_STATE, 2 - goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_223024 + goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_RocketLaunchCounterMagma dotimebasedevents specialvar VAR_RESULT, GetWeekCount buffernumberstring 0, VAR_RESULT compare VAR_RESULT, 0 - call_if_eq MossdeepCity_SpaceCenter_1F_EventScript_223012 + call_if_eq MossdeepCity_SpaceCenter_1F_EventScript_NoLaunchesYet compare VAR_RESULT, 1 - call_if_ge MossdeepCity_SpaceCenter_1F_EventScript_22301B + call_if_ge MossdeepCity_SpaceCenter_1F_EventScript_ShowLaunchNumber closemessage applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end -MossdeepCity_SpaceCenter_1F_EventScript_223012:: @ 8223012 - msgbox MossdeepCity_SpaceCenter_1F_Text_2232A7, MSGBOX_DEFAULT +MossdeepCity_SpaceCenter_1F_EventScript_NoLaunchesYet:: @ 8223012 + msgbox MossdeepCity_SpaceCenter_1F_Text_RocketLaunchImminent, MSGBOX_DEFAULT return -MossdeepCity_SpaceCenter_1F_EventScript_22301B:: @ 822301B - msgbox MossdeepCity_SpaceCenter_1F_Text_2232C8, MSGBOX_DEFAULT +MossdeepCity_SpaceCenter_1F_EventScript_ShowLaunchNumber:: @ 822301B + msgbox MossdeepCity_SpaceCenter_1F_Text_SuccessfulLaunchNumber, MSGBOX_DEFAULT return -MossdeepCity_SpaceCenter_1F_EventScript_223024:: @ 8223024 +MossdeepCity_SpaceCenter_1F_EventScript_RocketLaunchCounterMagma:: @ 8223024 dotimebasedevents specialvar VAR_RESULT, GetWeekCount buffernumberstring 0, VAR_RESULT compare VAR_RESULT, 0 - call_if_eq MossdeepCity_SpaceCenter_1F_EventScript_223051 + call_if_eq MossdeepCity_SpaceCenter_1F_EventScript_NoLaunchesYetMagma compare VAR_RESULT, 1 - call_if_ge MossdeepCity_SpaceCenter_1F_EventScript_22305A + call_if_ge MossdeepCity_SpaceCenter_1F_EventScript_ShowLaunchNumberMagma closemessage applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestRight waitmovement 0 release end -MossdeepCity_SpaceCenter_1F_EventScript_223051:: @ 8223051 - msgbox MossdeepCity_SpaceCenter_1F_Text_223305, MSGBOX_DEFAULT +MossdeepCity_SpaceCenter_1F_EventScript_NoLaunchesYetMagma:: @ 8223051 + msgbox MossdeepCity_SpaceCenter_1F_Text_HaywireButRocketLaunchImminent, MSGBOX_DEFAULT return -MossdeepCity_SpaceCenter_1F_EventScript_22305A:: @ 822305A - msgbox MossdeepCity_SpaceCenter_1F_Text_22335E, MSGBOX_DEFAULT +MossdeepCity_SpaceCenter_1F_EventScript_ShowLaunchNumberMagma:: @ 822305A + msgbox MossdeepCity_SpaceCenter_1F_Text_HaywireButSuccessfulLaunchNumber, MSGBOX_DEFAULT return -MossdeepCity_SpaceCenter_1F_EventScript_223063:: @ 8223063 +MossdeepCity_SpaceCenter_1F_EventScript_Scientist:: @ 8223063 lock faceplayer compare VAR_MOSSDEEP_CITY_STATE, 2 - goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_22307A - msgbox MossdeepCity_SpaceCenter_1F_Text_2233D3, MSGBOX_DEFAULT + goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_ScientistMagma + msgbox MossdeepCity_SpaceCenter_1F_Text_RocketLaunchDemandsPerfection, MSGBOX_DEFAULT release end -MossdeepCity_SpaceCenter_1F_EventScript_22307A:: @ 822307A - msgbox MossdeepCity_SpaceCenter_1F_Text_2234B7, MSGBOX_DEFAULT +MossdeepCity_SpaceCenter_1F_EventScript_ScientistMagma:: @ 822307A + msgbox MossdeepCity_SpaceCenter_1F_Text_MagmaHaveSightsOnSpaceCenter, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestRight waitmovement 0 release end -MossdeepCity_SpaceCenter_1F_EventScript_22308E:: @ 822308E +MossdeepCity_SpaceCenter_1F_EventScript_SunStoneMan:: @ 822308E lock faceplayer compare VAR_MOSSDEEP_CITY_STATE, 2 - goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_2230DA - goto_if_set FLAG_RECEIVED_SUN_STONE_MOSSDEEP, MossdeepCity_SpaceCenter_1F_EventScript_2230D0 - msgbox MossdeepCity_SpaceCenter_1F_Text_223540, MSGBOX_DEFAULT + goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_SunStoneManMagma + goto_if_set FLAG_RECEIVED_SUN_STONE_MOSSDEEP, MossdeepCity_SpaceCenter_1F_EventScript_GaveSunStone + msgbox MossdeepCity_SpaceCenter_1F_Text_FoundThisYouCanHaveIt, MSGBOX_DEFAULT giveitem_std ITEM_SUN_STONE compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP - msgbox MossdeepCity_SpaceCenter_1F_Text_2235A6, MSGBOX_DEFAULT + msgbox MossdeepCity_SpaceCenter_1F_Text_HoennFamousForMeteorShowers, MSGBOX_DEFAULT release end -MossdeepCity_SpaceCenter_1F_EventScript_2230D0:: @ 82230D0 - msgbox MossdeepCity_SpaceCenter_1F_Text_2235A6, MSGBOX_DEFAULT +MossdeepCity_SpaceCenter_1F_EventScript_GaveSunStone:: @ 82230D0 + msgbox MossdeepCity_SpaceCenter_1F_Text_HoennFamousForMeteorShowers, MSGBOX_DEFAULT release end -MossdeepCity_SpaceCenter_1F_EventScript_2230DA:: @ 82230DA - goto_if_set FLAG_RECEIVED_SUN_STONE_MOSSDEEP, MossdeepCity_SpaceCenter_1F_EventScript_223119 - msgbox MossdeepCity_SpaceCenter_1F_Text_2235F0, MSGBOX_DEFAULT +MossdeepCity_SpaceCenter_1F_EventScript_SunStoneManMagma:: @ 82230DA + goto_if_set FLAG_RECEIVED_SUN_STONE_MOSSDEEP, MossdeepCity_SpaceCenter_1F_EventScript_GaveSunStoneMagma + msgbox MossdeepCity_SpaceCenter_1F_Text_MagmaCantStealFuelTakeThis, MSGBOX_DEFAULT giveitem_std ITEM_SUN_STONE compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP - msgbox MossdeepCity_SpaceCenter_1F_Text_223664, MSGBOX_DEFAULT + msgbox MossdeepCity_SpaceCenter_1F_Text_CantStrollOnBeachWithMagma, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestRight waitmovement 0 release end -MossdeepCity_SpaceCenter_1F_EventScript_223119:: @ 8223119 - msgbox MossdeepCity_SpaceCenter_1F_Text_223664, MSGBOX_DEFAULT +MossdeepCity_SpaceCenter_1F_EventScript_GaveSunStoneMagma:: @ 8223119 + msgbox MossdeepCity_SpaceCenter_1F_Text_CantStrollOnBeachWithMagma, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestRight waitmovement 0 release end -MossdeepCity_SpaceCenter_1F_EventScript_22312D:: @ 822312D +MossdeepCity_SpaceCenter_1F_EventScript_Woman:: @ 822312D lock faceplayer - goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_1F_EventScript_223154 + goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_1F_EventScript_WomanNormal compare VAR_MOSSDEEP_CITY_STATE, 2 - goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_22315E + goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_WomanMagma compare VAR_MOSSDEEP_CITY_STATE, 2 - goto_if_lt MossdeepCity_SpaceCenter_1F_EventScript_223154 - goto MossdeepCity_SpaceCenter_1F_EventScript_22315E + goto_if_lt MossdeepCity_SpaceCenter_1F_EventScript_WomanNormal + goto MossdeepCity_SpaceCenter_1F_EventScript_WomanMagma end -MossdeepCity_SpaceCenter_1F_EventScript_223154:: @ 8223154 - msgbox MossdeepCity_SpaceCenter_1F_Text_2236A6, MSGBOX_DEFAULT +MossdeepCity_SpaceCenter_1F_EventScript_WomanNormal:: @ 8223154 + msgbox MossdeepCity_SpaceCenter_1F_Text_DidPokemonComeFromSpace, MSGBOX_DEFAULT release end -MossdeepCity_SpaceCenter_1F_EventScript_22315E:: @ 822315E - msgbox MossdeepCity_SpaceCenter_1F_Text_2236E8, MSGBOX_DEFAULT +MossdeepCity_SpaceCenter_1F_EventScript_WomanMagma:: @ 822315E + msgbox MossdeepCity_SpaceCenter_1F_Text_AquaShouldBeatMagma, MSGBOX_DEFAULT release end -MossdeepCity_SpaceCenter_1F_EventScript_223168:: @ 8223168 +MossdeepCity_SpaceCenter_1F_EventScript_OldMan:: @ 8223168 lock faceplayer - goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_1F_EventScript_22318F + goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_1F_EventScript_OldManNormal compare VAR_MOSSDEEP_CITY_STATE, 2 - goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_2231A4 + goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_OldManMagma compare VAR_MOSSDEEP_CITY_STATE, 2 - goto_if_lt MossdeepCity_SpaceCenter_1F_EventScript_22318F - goto MossdeepCity_SpaceCenter_1F_EventScript_2231A4 + goto_if_lt MossdeepCity_SpaceCenter_1F_EventScript_OldManNormal + goto MossdeepCity_SpaceCenter_1F_EventScript_OldManMagma end -MossdeepCity_SpaceCenter_1F_EventScript_22318F:: @ 822318F - msgbox MossdeepCity_SpaceCenter_1F_Text_22375B, MSGBOX_DEFAULT +MossdeepCity_SpaceCenter_1F_EventScript_OldManNormal:: @ 822318F + msgbox MossdeepCity_SpaceCenter_1F_Text_RocketsBoggleMyMind, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end -MossdeepCity_SpaceCenter_1F_EventScript_2231A4:: @ 82231A4 - msgbox MossdeepCity_SpaceCenter_1F_Text_2237B5, MSGBOX_DEFAULT +MossdeepCity_SpaceCenter_1F_EventScript_OldManMagma:: @ 82231A4 + msgbox MossdeepCity_SpaceCenter_1F_Text_MagmaWantsToSpoilMyDream, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end -MossdeepCity_SpaceCenter_1F_EventScript_2231B9:: @ 82231B9 +MossdeepCity_SpaceCenter_1F_EventScript_Steven:: @ 82231B9 lock faceplayer - msgbox MossdeepCity_SpaceCenter_1F_Text_223849, MSGBOX_DEFAULT + msgbox MossdeepCity_SpaceCenter_1F_Text_StevenMagmaCantBeAllowedToTakeFuel, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end -MossdeepCity_SpaceCenter_1F_EventScript_2231CF:: @ 82231CF +MossdeepCity_SpaceCenter_1F_EventScript_MagmaNote:: @ 82231CF lockall - msgbox MossdeepCity_SpaceCenter_1F_Text_223C2C, MSGBOX_DEFAULT + msgbox MossdeepCity_SpaceCenter_1F_Text_MagmaIntentToStealNotice, MSGBOX_DEFAULT releaseall end -MossdeepCity_SpaceCenter_1F_EventScript_2231DA:: @ 82231DA - trainerbattle_single TRAINER_GRUNT_32, MossdeepCity_SpaceCenter_1F_Text_22396C, MossdeepCity_SpaceCenter_1F_Text_223999 - msgbox MossdeepCity_SpaceCenter_1F_Text_2239AA, MSGBOX_AUTOCLOSE +MossdeepCity_SpaceCenter_1F_EventScript_Grunt32:: @ 82231DA + trainerbattle_single TRAINER_GRUNT_32, MossdeepCity_SpaceCenter_1F_Text_Grunt32Intro, MossdeepCity_SpaceCenter_1F_Text_Grunt32Defeat + msgbox MossdeepCity_SpaceCenter_1F_Text_Grunt32PostBattle, MSGBOX_AUTOCLOSE end -MossdeepCity_SpaceCenter_1F_EventScript_2231F1:: @ 82231F1 - trainerbattle_single TRAINER_GRUNT_16, MossdeepCity_SpaceCenter_1F_Text_2239E6, MossdeepCity_SpaceCenter_1F_Text_223A21 - msgbox MossdeepCity_SpaceCenter_1F_Text_223A4B, MSGBOX_AUTOCLOSE +MossdeepCity_SpaceCenter_1F_EventScript_Grunt16:: @ 82231F1 + trainerbattle_single TRAINER_GRUNT_16, MossdeepCity_SpaceCenter_1F_Text_Grunt16Intro, MossdeepCity_SpaceCenter_1F_Text_Grunt16Defeat + msgbox MossdeepCity_SpaceCenter_1F_Text_Grunt16PostBattle, MSGBOX_AUTOCLOSE end -MossdeepCity_SpaceCenter_1F_EventScript_223208:: @ 8223208 - trainerbattle_single TRAINER_GRUNT_33, MossdeepCity_SpaceCenter_1F_Text_223A8A, MossdeepCity_SpaceCenter_1F_Text_223AFA - msgbox MossdeepCity_SpaceCenter_1F_Text_223B37, MSGBOX_AUTOCLOSE +MossdeepCity_SpaceCenter_1F_EventScript_Grunt33:: @ 8223208 + trainerbattle_single TRAINER_GRUNT_33, MossdeepCity_SpaceCenter_1F_Text_Grunt33Intro, MossdeepCity_SpaceCenter_1F_Text_Grunt33Defeat + msgbox MossdeepCity_SpaceCenter_1F_Text_Grunt33PostBattle, MSGBOX_AUTOCLOSE end -MossdeepCity_SpaceCenter_1F_EventScript_22321F:: @ 822321F +MossdeepCity_SpaceCenter_1F_EventScript_Grunt23:: @ 822321F lock faceplayer - goto_if_set FLAG_DEFEATED_GRUNT_SPACE_CENTER_1F, MossdeepCity_SpaceCenter_1F_EventScript_22326E - msgbox MossdeepCity_SpaceCenter_1F_Text_223B90, MSGBOX_DEFAULT - trainerbattle_no_intro TRAINER_GRUNT_23, MossdeepCity_SpaceCenter_1F_Text_223BC2 + goto_if_set FLAG_DEFEATED_GRUNT_SPACE_CENTER_1F, MossdeepCity_SpaceCenter_1F_EventScript_Grunt23Defeated + msgbox MossdeepCity_SpaceCenter_1F_Text_Grunt23Intro, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_GRUNT_23, MossdeepCity_SpaceCenter_1F_Text_Grunt23Defeat setflag FLAG_DEFEATED_GRUNT_SPACE_CENTER_1F copyobjectxytoperm 9 switch VAR_FACING - case DIR_WEST, MossdeepCity_SpaceCenter_1F_EventScript_223278 - case DIR_WEST, MossdeepCity_SpaceCenter_1F_EventScript_223289 - applymovement 9, MossdeepCity_SpaceCenter_1F_Movement_2232A2 + case DIR_WEST, MossdeepCity_SpaceCenter_1F_EventScript_MoveGruntFromStairsWest + case DIR_WEST, MossdeepCity_SpaceCenter_1F_EventScript_MoveGruntFromStairsEast @ BUG: This was meant to be case DIR_EAST + applymovement 9, MossdeepCity_SpaceCenter_1F_Movement_MoveGruntFromStairs waitmovement 0 - setvar VAR_MOSSDEEP_SPACE_CENTER_STATE_1, 2 + setvar VAR_MOSSDEEP_SPACE_CENTER_STAIR_GUARD_STATE, 2 release end -MossdeepCity_SpaceCenter_1F_EventScript_22326E:: @ 822326E - msgbox MossdeepCity_SpaceCenter_1F_Text_223BD3, MSGBOX_DEFAULT +MossdeepCity_SpaceCenter_1F_EventScript_Grunt23Defeated:: @ 822326E + msgbox MossdeepCity_SpaceCenter_1F_Text_Grunt23PostBattle, MSGBOX_DEFAULT release end -MossdeepCity_SpaceCenter_1F_EventScript_223278:: @ 8223278 - applymovement 9, MossdeepCity_SpaceCenter_1F_Movement_22329A +MossdeepCity_SpaceCenter_1F_EventScript_MoveGruntFromStairsWest:: @ 8223278 + applymovement 9, MossdeepCity_SpaceCenter_1F_Movement_MoveGruntFromStairsWest waitmovement 0 - setvar VAR_MOSSDEEP_SPACE_CENTER_STATE_1, 1 + setvar VAR_MOSSDEEP_SPACE_CENTER_STAIR_GUARD_STATE, 1 release end -MossdeepCity_SpaceCenter_1F_EventScript_223289:: @ 8223289 - applymovement 9, MossdeepCity_SpaceCenter_1F_Movement_22329E +@ Functionally unused by mistake. The movement is handled anyway after the switch (see above) +@ This also means VAR_MOSSDEEP_SPACE_CENTER_STAIR_GUARD_STATE can never be 3 +MossdeepCity_SpaceCenter_1F_EventScript_MoveGruntFromStairsEast:: @ 8223289 + applymovement 9, MossdeepCity_SpaceCenter_1F_Movement_MoveGruntFromStairsEast waitmovement 0 - setvar VAR_MOSSDEEP_SPACE_CENTER_STATE_1, 3 + setvar VAR_MOSSDEEP_SPACE_CENTER_STAIR_GUARD_STATE, 3 release end -MossdeepCity_SpaceCenter_1F_Movement_22329A: @ 822329A +MossdeepCity_SpaceCenter_1F_Movement_MoveGruntFromStairsWest: @ 822329A lock_facing_direction walk_left unlock_facing_direction step_end -MossdeepCity_SpaceCenter_1F_Movement_22329E: @ 822329E +@ Functionally unused. See above +MossdeepCity_SpaceCenter_1F_Movement_MoveGruntFromStairsEast: @ 822329E lock_facing_direction walk_right unlock_facing_direction step_end -MossdeepCity_SpaceCenter_1F_Movement_2232A2: @ 82232A2 +@ This was meant to only handle the player facing North, but by mistake(?) it also handles the player facing East +MossdeepCity_SpaceCenter_1F_Movement_MoveGruntFromStairs: @ 82232A2 face_left lock_facing_direction walk_right unlock_facing_direction step_end -MossdeepCity_SpaceCenter_1F_Text_2232A7: @ 82232A7 +MossdeepCity_SpaceCenter_1F_Text_RocketLaunchImminent: @ 82232A7 .string "The rocket's launch is imminent!$" -MossdeepCity_SpaceCenter_1F_Text_2232C8: @ 82232C8 +MossdeepCity_SpaceCenter_1F_Text_SuccessfulLaunchNumber: @ 82232C8 .string "The rocket launched safely!\n" .string "That's successful launch no. {STR_VAR_1}!$" -MossdeepCity_SpaceCenter_1F_Text_223305: @ 8223305 +MossdeepCity_SpaceCenter_1F_Text_HaywireButRocketLaunchImminent: @ 8223305 .string "I know that things are a little\n" .string "haywire right now, but…\p" .string "The rocket's launch is imminent!$" -MossdeepCity_SpaceCenter_1F_Text_22335E: @ 822335E +MossdeepCity_SpaceCenter_1F_Text_HaywireButSuccessfulLaunchNumber: @ 822335E .string "I know that things are a little\n" .string "haywire right now, but…\p" .string "The rocket launched safely!\n" .string "That's successful launch no. {STR_VAR_1}!$" -MossdeepCity_SpaceCenter_1F_Text_2233D3: @ 82233D3 +MossdeepCity_SpaceCenter_1F_Text_RocketLaunchDemandsPerfection: @ 82233D3 .string "A rocket launch demands perfection.\n" .string "Not even a 1% margin of error is allowed.\p" .string "Even if it's 99% okay, the whole thing\n" @@ -310,55 +315,55 @@ MossdeepCity_SpaceCenter_1F_Text_2233D3: @ 82233D3 .string "Despite that, we never stop trying.\n" .string "Why? It's a dream that never ends.$" -MossdeepCity_SpaceCenter_1F_Text_2234B7: @ 82234B7 +MossdeepCity_SpaceCenter_1F_Text_MagmaHaveSightsOnSpaceCenter: @ 82234B7 .string "Those MAGMA thugs have their sights\n" .string "set on our SPACE CENTER.\p" .string "But we can't allow anything that minor\n" .string "to interfere with our rocket launch!$" -MossdeepCity_SpaceCenter_1F_Text_223540: @ 8223540 +MossdeepCity_SpaceCenter_1F_Text_FoundThisYouCanHaveIt: @ 8223540 .string "I was taking a stroll down the beach\n" .string "when I found this.\p" .string "It's not anything I need, so you can\n" .string "have it.$" -MossdeepCity_SpaceCenter_1F_Text_2235A6: @ 82235A6 +MossdeepCity_SpaceCenter_1F_Text_HoennFamousForMeteorShowers: @ 82235A6 .string "The HOENN region has been famous for \n" .string "its meteor showers for a long time.$" -MossdeepCity_SpaceCenter_1F_Text_2235F0: @ 82235F0 +MossdeepCity_SpaceCenter_1F_Text_MagmaCantStealFuelTakeThis: @ 82235F0 .string "TEAM MAGMA can't be allowed to steal\n" .string "the rocket fuel.\p" .string "Oh, by the way, you can have this stone\n" .string "I found on the beach.$" -MossdeepCity_SpaceCenter_1F_Text_223664: @ 8223664 +MossdeepCity_SpaceCenter_1F_Text_CantStrollOnBeachWithMagma: @ 8223664 .string "With TEAM MAGMA around, I guess\n" .string "strolls on the beach aren't safe.$" -MossdeepCity_SpaceCenter_1F_Text_2236A6: @ 82236A6 +MossdeepCity_SpaceCenter_1F_Text_DidPokemonComeFromSpace: @ 82236A6 .string "Some people claim that POKéMON came\n" .string "from space. Could it be true?$" -MossdeepCity_SpaceCenter_1F_Text_2236E8: @ 82236E8 +MossdeepCity_SpaceCenter_1F_Text_AquaShouldBeatMagma: @ 82236E8 .string "TEAM AQUA should take care of\n" .string "TEAM MAGMA!\p" .string "But if they did that, TEAM AQUA will\n" .string "become bold and brazen, won't they?$" -MossdeepCity_SpaceCenter_1F_Text_22375B: @ 822375B +MossdeepCity_SpaceCenter_1F_Text_RocketsBoggleMyMind: @ 822375B .string "A giant chunk of metal bursts through\n" .string "the skies and flies into space…\p" .string "It boggles my mind!$" -MossdeepCity_SpaceCenter_1F_Text_2237B5: @ 82237B5 +MossdeepCity_SpaceCenter_1F_Text_MagmaWantsToSpoilMyDream: @ 82237B5 .string "A giant chunk of metal bursts through\n" .string "the skies and flies into space…\p" .string "But TEAM MAGMA wants to spoil\n" .string "that dream of mine!\p" .string "I'm not having any of that!$" -MossdeepCity_SpaceCenter_1F_Text_223849: @ 8223849 +MossdeepCity_SpaceCenter_1F_Text_StevenMagmaCantBeAllowedToTakeFuel: @ 8223849 .string "STEVEN: {PLAYER}{KUN}, have you read that\n" .string "proclamation already?\p" .string "TEAM MAGMA is coming after the rocket\n" @@ -370,57 +375,57 @@ MossdeepCity_SpaceCenter_1F_Text_223849: @ 8223849 .string "In the meantime, why don't you go\n" .string "check out the town?$" -MossdeepCity_SpaceCenter_1F_Text_22396C: @ 822396C +MossdeepCity_SpaceCenter_1F_Text_Grunt32Intro: @ 822396C .string "As promised, we've come for\n" .string "the rocket fuel!$" -MossdeepCity_SpaceCenter_1F_Text_223999: @ 8223999 +MossdeepCity_SpaceCenter_1F_Text_Grunt32Defeat: @ 8223999 .string "Ran out of fuel…$" -MossdeepCity_SpaceCenter_1F_Text_2239AA: @ 82239AA +MossdeepCity_SpaceCenter_1F_Text_Grunt32PostBattle: @ 82239AA .string "Don't think you're on a roll just\n" .string "because you've beaten me!$" -MossdeepCity_SpaceCenter_1F_Text_2239E6: @ 82239E6 +MossdeepCity_SpaceCenter_1F_Text_Grunt16Intro: @ 82239E6 .string "We gave you fair warning!\n" .string "There's nothing sneaky about us!$" -MossdeepCity_SpaceCenter_1F_Text_223A21: @ 8223A21 +MossdeepCity_SpaceCenter_1F_Text_Grunt16Defeat: @ 8223A21 .string "Grrr…\n" .string "We should've used sneaky treachery…$" -MossdeepCity_SpaceCenter_1F_Text_223A4B: @ 8223A4B +MossdeepCity_SpaceCenter_1F_Text_Grunt16PostBattle: @ 8223A4B .string "Okay, I get it already! The next time,\n" .string "we'll come unannounced.$" -MossdeepCity_SpaceCenter_1F_Text_223A8A: @ 8223A8A +MossdeepCity_SpaceCenter_1F_Text_Grunt33Intro: @ 8223A8A .string "The rocket fuel the SPACE CENTER has\n" .string "in storage--that's what we're after.\p" .string "We mean to take every last bit of it!$" -MossdeepCity_SpaceCenter_1F_Text_223AFA: @ 8223AFA +MossdeepCity_SpaceCenter_1F_Text_Grunt33Defeat: @ 8223AFA .string "Please, can you spare some fuel?\n" .string "Even a chintzy cup will do!$" -MossdeepCity_SpaceCenter_1F_Text_223B37: @ 8223B37 +MossdeepCity_SpaceCenter_1F_Text_Grunt33PostBattle: @ 8223B37 .string "What are we going to do with\n" .string "the rocket fuel?\p" .string "How would I know?\n" .string "Ask our leader upstairs!$" -MossdeepCity_SpaceCenter_1F_Text_223B90: @ 8223B90 +MossdeepCity_SpaceCenter_1F_Text_Grunt23Intro: @ 8223B90 .string "Our leader said no one, but no one,\n" .string "gets past me!$" -MossdeepCity_SpaceCenter_1F_Text_223BC2: @ 8223BC2 +MossdeepCity_SpaceCenter_1F_Text_Grunt23Defeat: @ 8223BC2 .string "Ack! Ack! Aaack!$" -MossdeepCity_SpaceCenter_1F_Text_223BD3: @ 8223BD3 +MossdeepCity_SpaceCenter_1F_Text_Grunt23PostBattle: @ 8223BD3 .string "Please, tell our leader that\n" .string "I never abandoned my post.\l" .string "That I stayed to the bitter end…$" -MossdeepCity_SpaceCenter_1F_Text_223C2C: @ 8223C2C +MossdeepCity_SpaceCenter_1F_Text_MagmaIntentToStealNotice: @ 8223C2C .string "This is…\n" .string "An intent-to-steal notice?\p" .string "“To the staff of the SPACE CENTER:\n" diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/map.json b/data/maps/MossdeepCity_SpaceCenter_2F/map.json index 5c758bf3e..9da580910 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/map.json +++ b/data/maps/MossdeepCity_SpaceCenter_2F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F03", + "script": "MossdeepCity_SpaceCenter_2F_EventScript_RichBoy", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_SpaceCenter_2F_EventScript_223EC8", + "script": "MossdeepCity_SpaceCenter_2F_EventScript_Gentleman", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_SpaceCenter_2F_EventScript_223E8D", + "script": "MossdeepCity_SpaceCenter_2F_EventScript_Scientist", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F7A", + "script": "MossdeepCity_SpaceCenter_2F_EventScript_Steven", "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_STEVEN" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F3E", + "script": "MossdeepCity_SpaceCenter_2F_EventScript_Grunt35", "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA" }, { @@ -89,7 +89,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F50", + "script": "MossdeepCity_SpaceCenter_2F_EventScript_Grunt34", "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA" }, { @@ -102,7 +102,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F47", + "script": "MossdeepCity_SpaceCenter_2F_EventScript_Grunt36", "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA" }, { @@ -115,7 +115,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F59", + "script": "MossdeepCity_SpaceCenter_2F_EventScript_Tabitha", "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA" }, { @@ -128,7 +128,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F6F", + "script": "MossdeepCity_SpaceCenter_2F_EventScript_Maxie", "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA" } ], diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc index 32c34ed23..e899192d3 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc @@ -1,16 +1,16 @@ MossdeepCity_SpaceCenter_2F_MapScripts:: @ 8223D58 map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_SpaceCenter_2F_OnTransition - map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_SpaceCenter_2F_MapScript2_223DB5 + map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_SpaceCenter_2F_OnFrame .byte 0 MossdeepCity_SpaceCenter_2F_OnTransition: @ 8223D63 compare VAR_MOSSDEEP_CITY_STATE, 2 - call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223D7A - compare VAR_MOSSDEEP_SPACE_CENTER_STATE_2, 2 - call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223D9F + call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_MoveStevenMaxieTabitha + compare VAR_MOSSDEEP_SPACE_CENTER_STATE, 2 + call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_MoveDefeatedGrunts end -MossdeepCity_SpaceCenter_2F_EventScript_223D7A:: @ 8223D7A +MossdeepCity_SpaceCenter_2F_EventScript_MoveStevenMaxieTabitha:: @ 8223D7A clearflag FLAG_INTERACTED_WITH_STEVEN_SPACE_CENTER setobjectxyperm 3, 5, 3 setobjectmovementtype 3, MOVEMENT_TYPE_FACE_RIGHT @@ -20,193 +20,194 @@ MossdeepCity_SpaceCenter_2F_EventScript_223D7A:: @ 8223D7A setobjectmovementtype 2, MOVEMENT_TYPE_FACE_RIGHT return -MossdeepCity_SpaceCenter_2F_EventScript_223D9F:: @ 8223D9F +MossdeepCity_SpaceCenter_2F_EventScript_MoveDefeatedGrunts:: @ 8223D9F setobjectxyperm 5, 11, 2 setobjectxyperm 7, 15, 2 setobjectxyperm 6, 13, 4 return -MossdeepCity_SpaceCenter_2F_MapScript2_223DB5: @ 8223DB5 - map_script_2 VAR_MOSSDEEP_SPACE_CENTER_STATE_2, 1, MossdeepCity_SpaceCenter_2F_EventScript_223DBF +MossdeepCity_SpaceCenter_2F_OnFrame: @ 8223DB5 + map_script_2 VAR_MOSSDEEP_SPACE_CENTER_STATE, 1, MossdeepCity_SpaceCenter_2F_EventScript_ThreeMagmaGrunts .2byte 0 -MossdeepCity_SpaceCenter_2F_EventScript_223DBF:: @ 8223DBF +MossdeepCity_SpaceCenter_2F_EventScript_ThreeMagmaGrunts:: @ 8223DBF playse SE_PIN applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_ExclamationMark waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_Delay48 waitmovement 0 - msgbox MossdeepCity_SpaceCenter_2F_Text_2243A4, MSGBOX_YESNO + msgbox MossdeepCity_SpaceCenter_2F_Text_YoureOutnumberedTakeUsOn, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223E09 - msgbox MossdeepCity_SpaceCenter_2F_Text_2243FE, MSGBOX_DEFAULT + goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_BattleThreeMagmaGrunts + msgbox MossdeepCity_SpaceCenter_2F_Text_GoodAnswer, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_SpaceCenter_2F_Movement_223E07 + applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_SpaceCenter_2F_Movement_PlayerExit waitmovement 0 warp MAP_MOSSDEEP_CITY_SPACE_CENTER_1F, 255, 13, 1 waitstate releaseall end -MossdeepCity_SpaceCenter_2F_Movement_223E07: @ 8223E07 +MossdeepCity_SpaceCenter_2F_Movement_PlayerExit: @ 8223E07 walk_up step_end -MossdeepCity_SpaceCenter_2F_EventScript_223E09:: @ 8223E09 - msgbox MossdeepCity_SpaceCenter_2F_Text_22442D, MSGBOX_DEFAULT - trainerbattle_no_intro TRAINER_GRUNT_34, MossdeepCity_SpaceCenter_2F_Text_224461 - applymovement 6, MossdeepCity_SpaceCenter_2F_Movement_223E85 +MossdeepCity_SpaceCenter_2F_EventScript_BattleThreeMagmaGrunts:: @ 8223E09 + msgbox MossdeepCity_SpaceCenter_2F_Text_Grunt34Intro, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_GRUNT_34, MossdeepCity_SpaceCenter_2F_Text_Grunt34Defeat + applymovement 6, MossdeepCity_SpaceCenter_2F_Movement_Grunt34Defeated waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - msgbox MossdeepCity_SpaceCenter_2F_Text_22446E, MSGBOX_DEFAULT - trainerbattle_no_intro TRAINER_GRUNT_35, MossdeepCity_SpaceCenter_2F_Text_224499 - applymovement 5, MossdeepCity_SpaceCenter_2F_Movement_223E81 + msgbox MossdeepCity_SpaceCenter_2F_Text_Grunt35Intro, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_GRUNT_35, MossdeepCity_SpaceCenter_2F_Text_Grunt35Defeat + applymovement 5, MossdeepCity_SpaceCenter_2F_Movement_Grunt35Defeated waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - msgbox MossdeepCity_SpaceCenter_2F_Text_2244AB, MSGBOX_DEFAULT - trainerbattle_no_intro TRAINER_GRUNT_36, MossdeepCity_SpaceCenter_2F_Text_2244F1 - applymovement 7, MossdeepCity_SpaceCenter_2F_Movement_223E89 + msgbox MossdeepCity_SpaceCenter_2F_Text_Grunt36Intro, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_GRUNT_36, MossdeepCity_SpaceCenter_2F_Text_Grunt36Defeat + applymovement 7, MossdeepCity_SpaceCenter_2F_Movement_Grunt36Defeated waitmovement 0 - setvar VAR_MOSSDEEP_SPACE_CENTER_STATE_2, 2 + setvar VAR_MOSSDEEP_SPACE_CENTER_STATE, 2 copyobjectxytoperm 5 copyobjectxytoperm 7 copyobjectxytoperm 6 releaseall end -MossdeepCity_SpaceCenter_2F_Movement_223E81: @ 8223E81 +MossdeepCity_SpaceCenter_2F_Movement_Grunt35Defeated: @ 8223E81 lock_facing_direction walk_left unlock_facing_direction step_end -MossdeepCity_SpaceCenter_2F_Movement_223E85: @ 8223E85 +MossdeepCity_SpaceCenter_2F_Movement_Grunt34Defeated: @ 8223E85 lock_facing_direction walk_down unlock_facing_direction step_end -MossdeepCity_SpaceCenter_2F_Movement_223E89: @ 8223E89 +MossdeepCity_SpaceCenter_2F_Movement_Grunt36Defeated: @ 8223E89 lock_facing_direction walk_right unlock_facing_direction step_end -MossdeepCity_SpaceCenter_2F_EventScript_223E8D:: @ 8223E8D +MossdeepCity_SpaceCenter_2F_EventScript_Scientist:: @ 8223E8D lock faceplayer - goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_2F_EventScript_223EB4 + goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_2F_EventScript_ScientistNormal compare VAR_MOSSDEEP_CITY_STATE, 2 - goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223EBE + goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_ScientistMagma compare VAR_MOSSDEEP_CITY_STATE, 2 - goto_if_lt MossdeepCity_SpaceCenter_2F_EventScript_223EB4 - goto MossdeepCity_SpaceCenter_2F_EventScript_223EBE + goto_if_lt MossdeepCity_SpaceCenter_2F_EventScript_ScientistNormal + goto MossdeepCity_SpaceCenter_2F_EventScript_ScientistMagma end -MossdeepCity_SpaceCenter_2F_EventScript_223EB4:: @ 8223EB4 - msgbox MossdeepCity_SpaceCenter_2F_Text_2241A1, MSGBOX_DEFAULT +MossdeepCity_SpaceCenter_2F_EventScript_ScientistNormal:: @ 8223EB4 + msgbox MossdeepCity_SpaceCenter_2F_Text_MossdeepIdealForRockets, MSGBOX_DEFAULT release end -MossdeepCity_SpaceCenter_2F_EventScript_223EBE:: @ 8223EBE - msgbox MossdeepCity_SpaceCenter_2F_Text_22420C, MSGBOX_DEFAULT +MossdeepCity_SpaceCenter_2F_EventScript_ScientistMagma:: @ 8223EBE + msgbox MossdeepCity_SpaceCenter_2F_Text_WhyWouldMagmaStealRocketFuel, MSGBOX_DEFAULT release end -MossdeepCity_SpaceCenter_2F_EventScript_223EC8:: @ 8223EC8 +MossdeepCity_SpaceCenter_2F_EventScript_Gentleman:: @ 8223EC8 lock faceplayer - goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_2F_EventScript_223EEF + goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_2F_EventScript_GentlemanNormal compare VAR_MOSSDEEP_CITY_STATE, 2 - goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223EF9 + goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_GentlemanMagma compare VAR_MOSSDEEP_CITY_STATE, 2 - goto_if_lt MossdeepCity_SpaceCenter_2F_EventScript_223EEF - goto MossdeepCity_SpaceCenter_2F_EventScript_223EF9 + goto_if_lt MossdeepCity_SpaceCenter_2F_EventScript_GentlemanNormal + goto MossdeepCity_SpaceCenter_2F_EventScript_GentlemanMagma end -MossdeepCity_SpaceCenter_2F_EventScript_223EEF:: @ 8223EEF - msgbox MossdeepCity_SpaceCenter_2F_Text_224253, MSGBOX_DEFAULT +MossdeepCity_SpaceCenter_2F_EventScript_GentlemanNormal:: @ 8223EEF + msgbox MossdeepCity_SpaceCenter_2F_Text_WouldveLikedToBeAstronaut, MSGBOX_DEFAULT release end -MossdeepCity_SpaceCenter_2F_EventScript_223EF9:: @ 8223EF9 - msgbox MossdeepCity_SpaceCenter_2F_Text_2242C5, MSGBOX_DEFAULT +MossdeepCity_SpaceCenter_2F_EventScript_GentlemanMagma:: @ 8223EF9 + msgbox MossdeepCity_SpaceCenter_2F_Text_MagmaCantGetAwayWithThis, MSGBOX_DEFAULT release end -MossdeepCity_SpaceCenter_2F_EventScript_223F03:: @ 8223F03 +MossdeepCity_SpaceCenter_2F_EventScript_RichBoy:: @ 8223F03 lock faceplayer - goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_2F_EventScript_223F2A + goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_2F_EventScript_RichBoyNormal compare VAR_MOSSDEEP_CITY_STATE, 2 - goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223F34 + goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_RichBoyMagma compare VAR_MOSSDEEP_CITY_STATE, 2 - goto_if_lt MossdeepCity_SpaceCenter_2F_EventScript_223F2A - goto MossdeepCity_SpaceCenter_2F_EventScript_223F34 + goto_if_lt MossdeepCity_SpaceCenter_2F_EventScript_RichBoyNormal + goto MossdeepCity_SpaceCenter_2F_EventScript_RichBoyMagma end -MossdeepCity_SpaceCenter_2F_EventScript_223F2A:: @ 8223F2A - msgbox MossdeepCity_SpaceCenter_2F_Text_224342, MSGBOX_DEFAULT +MossdeepCity_SpaceCenter_2F_EventScript_RichBoyNormal:: @ 8223F2A + msgbox MossdeepCity_SpaceCenter_2F_Text_WishOrdinaryPeopleCouldGoIntoSpace, MSGBOX_DEFAULT release end -MossdeepCity_SpaceCenter_2F_EventScript_223F34:: @ 8223F34 - msgbox MossdeepCity_SpaceCenter_2F_Text_224376, MSGBOX_DEFAULT +MossdeepCity_SpaceCenter_2F_EventScript_RichBoyMagma:: @ 8223F34 + msgbox MossdeepCity_SpaceCenter_2F_Text_DoesMagmaWantToGoToSpace, MSGBOX_DEFAULT release end -MossdeepCity_SpaceCenter_2F_EventScript_223F3E:: @ 8223F3E - msgbox MossdeepCity_SpaceCenter_2F_Text_22452C, MSGBOX_NPC +@ Battle for the below 3 grunts is handled in MossdeepCity_SpaceCenter_2F_EventScript_BattleThreeMagmaGrunts +MossdeepCity_SpaceCenter_2F_EventScript_Grunt35:: @ 8223F3E + msgbox MossdeepCity_SpaceCenter_2F_Text_Grunt35PostBattle, MSGBOX_NPC end -MossdeepCity_SpaceCenter_2F_EventScript_223F47:: @ 8223F47 - msgbox MossdeepCity_SpaceCenter_2F_Text_224570, MSGBOX_NPC +MossdeepCity_SpaceCenter_2F_EventScript_Grunt36:: @ 8223F47 + msgbox MossdeepCity_SpaceCenter_2F_Text_Grunt36PostBattle, MSGBOX_NPC end -MossdeepCity_SpaceCenter_2F_EventScript_223F50:: @ 8223F50 - msgbox MossdeepCity_SpaceCenter_2F_Text_2245AF, MSGBOX_NPC +MossdeepCity_SpaceCenter_2F_EventScript_Grunt34:: @ 8223F50 + msgbox MossdeepCity_SpaceCenter_2F_Text_Grunt34PostBattle, MSGBOX_NPC end -MossdeepCity_SpaceCenter_2F_EventScript_223F59:: @ 8223F59 +MossdeepCity_SpaceCenter_2F_EventScript_Tabitha:: @ 8223F59 lock faceplayer - msgbox MossdeepCity_SpaceCenter_2F_Text_2245D9, MSGBOX_DEFAULT + msgbox MossdeepCity_SpaceCenter_2F_Text_WellTakeCareOfYou, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end -MossdeepCity_SpaceCenter_2F_EventScript_223F6F:: @ 8223F6F +MossdeepCity_SpaceCenter_2F_EventScript_Maxie:: @ 8223F6F lockall - msgbox MossdeepCity_SpaceCenter_2F_Text_22467B, MSGBOX_DEFAULT + msgbox MossdeepCity_SpaceCenter_2F_Text_MaxieDontInterfere, MSGBOX_DEFAULT releaseall end -MossdeepCity_SpaceCenter_2F_EventScript_223F7A:: @ 8223F7A +MossdeepCity_SpaceCenter_2F_EventScript_Steven:: @ 8223F7A lockall - goto_if_set FLAG_INTERACTED_WITH_STEVEN_SPACE_CENTER, MossdeepCity_SpaceCenter_2F_EventScript_223FDA + goto_if_set FLAG_INTERACTED_WITH_STEVEN_SPACE_CENTER, MossdeepCity_SpaceCenter_2F_EventScript_ReadyForBattlePrompt setflag FLAG_INTERACTED_WITH_STEVEN_SPACE_CENTER - msgbox MossdeepCity_SpaceCenter_2F_Text_2246B2, MSGBOX_DEFAULT - msgbox MossdeepCity_SpaceCenter_2F_Text_2246F0, MSGBOX_DEFAULT + msgbox MossdeepCity_SpaceCenter_2F_Text_StevenWhyStealRocketFuel, MSGBOX_DEFAULT + msgbox MossdeepCity_SpaceCenter_2F_Text_MaxieUseFuelToEruptVolcano, MSGBOX_DEFAULT closemessage delay 30 playse SE_KOUKA_L switch VAR_FACING - case DIR_SOUTH, MossdeepCity_SpaceCenter_2F_EventScript_223FBA - applymovement 4, MossdeepCity_SpaceCenter_2F_Movement_223FC6 + case DIR_SOUTH, MossdeepCity_SpaceCenter_2F_EventScript_StevenFightMovementSouth + applymovement 4, MossdeepCity_SpaceCenter_2F_Movement_StevenFight waitmovement 0 releaseall end -MossdeepCity_SpaceCenter_2F_EventScript_223FBA:: @ 8223FBA - applymovement 4, MossdeepCity_SpaceCenter_2F_Movement_223FCF +MossdeepCity_SpaceCenter_2F_EventScript_StevenFightMovementSouth:: @ 8223FBA + applymovement 4, MossdeepCity_SpaceCenter_2F_Movement_StevenFightSouth waitmovement 0 releaseall end -MossdeepCity_SpaceCenter_2F_Movement_223FC6: @ 8223FC6 +MossdeepCity_SpaceCenter_2F_Movement_StevenFight: @ 8223FC6 lock_facing_direction walk_fast_up walk_fast_up @@ -217,7 +218,7 @@ MossdeepCity_SpaceCenter_2F_Movement_223FC6: @ 8223FC6 walk_slow_down step_end -MossdeepCity_SpaceCenter_2F_Movement_223FCF: @ 8223FCF +MossdeepCity_SpaceCenter_2F_Movement_StevenFightSouth: @ 8223FCF face_left lock_facing_direction walk_fast_right @@ -230,20 +231,20 @@ MossdeepCity_SpaceCenter_2F_Movement_223FCF: @ 8223FCF face_down step_end -MossdeepCity_SpaceCenter_2F_EventScript_223FDA:: @ 8223FDA +MossdeepCity_SpaceCenter_2F_EventScript_ReadyForBattlePrompt:: @ 8223FDA applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 - msgbox MossdeepCity_SpaceCenter_2F_Text_2247FF, MSGBOX_YESNO + msgbox MossdeepCity_SpaceCenter_2F_Text_StevenAreYouReadyToBattle, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_22400C - msgbox MossdeepCity_SpaceCenter_2F_Text_224854, MSGBOX_DEFAULT + goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_ChoosePartyForMultiBattle + msgbox MossdeepCity_SpaceCenter_2F_Text_StevenHurryGetReadyQuickly, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown waitmovement 0 releaseall end -MossdeepCity_SpaceCenter_2F_EventScript_22400C:: @ 822400C +MossdeepCity_SpaceCenter_2F_EventScript_ChoosePartyForMultiBattle:: @ 822400C applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown waitmovement 0 special SavePlayerParty @@ -251,11 +252,11 @@ MossdeepCity_SpaceCenter_2F_EventScript_22400C:: @ 822400C special ChooseHalfPartyForBattle waitstate compare VAR_RESULT, 0 - goto_if_ne MossdeepCity_SpaceCenter_2F_EventScript_224032 + goto_if_ne MossdeepCity_SpaceCenter_2F_EventScript_DoStevenMultiBattle special LoadPlayerParty - goto MossdeepCity_SpaceCenter_2F_EventScript_223FDA + goto MossdeepCity_SpaceCenter_2F_EventScript_ReadyForBattlePrompt -MossdeepCity_SpaceCenter_2F_EventScript_224032:: @ 8224032 +MossdeepCity_SpaceCenter_2F_EventScript_DoStevenMultiBattle:: @ 8224032 special ReducePlayerPartyToSelectedMons setvar VAR_0x8004, 2 setvar VAR_0x8005, 4 @@ -268,13 +269,13 @@ MossdeepCity_SpaceCenter_2F_EventScript_224032:: @ 8224032 special CallFrontierUtilFunc special LoadPlayerParty switch VAR_RESULT - case 1, MossdeepCity_SpaceCenter_2F_EventScript_224071 + case 1, MossdeepCity_SpaceCenter_2F_EventScript_DefeatedMaxieTabitha fadescreen 1 special SetCB2WhiteOut waitstate -MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071 - msgbox MossdeepCity_SpaceCenter_2F_Text_2248C2, MSGBOX_DEFAULT +MossdeepCity_SpaceCenter_2F_EventScript_DefeatedMaxieTabitha:: @ 8224071 + msgbox MossdeepCity_SpaceCenter_2F_Text_MaxieWeFailedIsAquaAlsoMisguided, MSGBOX_DEFAULT closemessage delay 20 applymovement 9, Common_Movement_WalkInPlaceFastestLeft @@ -285,12 +286,12 @@ MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071 applymovement 8, Common_Movement_WalkInPlaceFastestRight waitmovement 0 delay 20 - msgbox MossdeepCity_SpaceCenter_2F_Text_2249DC, MSGBOX_DEFAULT + msgbox MossdeepCity_SpaceCenter_2F_Text_MaxieWeWillGiveUp, MSGBOX_DEFAULT closemessage setvar VAR_MOSSDEEP_CITY_STATE, 3 fadedefaultbgm fadescreen 1 - setvar VAR_MOSSDEEP_SPACE_CENTER_STATE_2, 3 + setvar VAR_MOSSDEEP_SPACE_CENTER_STATE, 3 setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA setflag FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA @@ -305,15 +306,15 @@ MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071 turnobject 2, DIR_NORTH setobjectxy 1, 6, 2 turnobject 1, DIR_NORTH - call MossdeepCity_SpaceCenter_2F_EventScript_224131 + call MossdeepCity_SpaceCenter_2F_EventScript_StevenFacePlayer fadescreen 0 - msgbox MossdeepCity_SpaceCenter_2F_Text_224A4A, MSGBOX_DEFAULT + msgbox MossdeepCity_SpaceCenter_2F_Text_StevenThankYouComeSeeMeAtHome, MSGBOX_DEFAULT closemessage fadescreen 1 setflag FLAG_DEFEATED_MAGMA_SPACE_CENTER setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN removeobject 4 - setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_INVISIBLE_NINJA_BOY + setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_MAGMA_NOTE clearflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN setvar VAR_STEVENS_HOUSE_STATE, 1 setflag FLAG_HIDE_MOSSDEEP_CITY_SCOTT @@ -324,142 +325,142 @@ MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071 fadescreen 0 end -MossdeepCity_SpaceCenter_2F_EventScript_224131:: @ 8224131 +MossdeepCity_SpaceCenter_2F_EventScript_StevenFacePlayer:: @ 8224131 switch VAR_FACING - case DIR_SOUTH, MossdeepCity_SpaceCenter_2F_EventScript_22414D - case DIR_WEST, MossdeepCity_SpaceCenter_2F_EventScript_224152 + case DIR_SOUTH, MossdeepCity_SpaceCenter_2F_EventScript_StevenFacePlayerSouth + case DIR_WEST, MossdeepCity_SpaceCenter_2F_EventScript_StevenFacePlayerWest return -MossdeepCity_SpaceCenter_2F_EventScript_22414D:: @ 822414D +MossdeepCity_SpaceCenter_2F_EventScript_StevenFacePlayerSouth:: @ 822414D turnobject 4, DIR_NORTH return -MossdeepCity_SpaceCenter_2F_EventScript_224152:: @ 8224152 +MossdeepCity_SpaceCenter_2F_EventScript_StevenFacePlayerWest:: @ 8224152 turnobject 4, DIR_EAST return -MossdeepCity_SpaceCenter_2F_EventScript_224157:: @ 8224157 - trainerbattle TRAINER_BATTLE_SET_TRAINER_A, TRAINER_MAXIE_3, 0, MossdeepCity_SpaceCenter_2F_Text_22487C, MossdeepCity_SpaceCenter_2F_Text_22487C +MossdeepCity_SpaceCenter_2F_EventScript_MaxieTrainer:: @ 8224157 + trainerbattle TRAINER_BATTLE_SET_TRAINER_A, TRAINER_MAXIE_3, 0, MossdeepCity_SpaceCenter_2F_Text_JustWantToExpandLand, MossdeepCity_SpaceCenter_2F_Text_JustWantToExpandLand end -MossdeepCity_SpaceCenter_2F_EventScript_224166:: @ 8224166 - trainerbattle TRAINER_BATTLE_SET_TRAINER_B, TRAINER_TABITHA_1, 0, MossdeepCity_SpaceCenter_Text_2248AD, MossdeepCity_SpaceCenter_Text_2248AD +MossdeepCity_SpaceCenter_2F_EventScript_TabithaTrainer:: @ 8224166 + trainerbattle TRAINER_BATTLE_SET_TRAINER_B, TRAINER_TABITHA_1, 0, MossdeepCity_SpaceCenter_Text_TabithaDefeat, MossdeepCity_SpaceCenter_Text_TabithaDefeat end -MossdeepCity_SpaceCenter_2F_EventScript_224175:: @ 8224175 +MossdeepCity_SpaceCenter_2F_EventScript_RivalRayquazaCall:: @ 8224175 lockall checkplayergender compare VAR_RESULT, MALE - call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_224193 + call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_MayRayquazaCall compare VAR_RESULT, FEMALE - call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_22419A + call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_BrendanRayquazaCall closemessage clearflag FLAG_DEFEATED_MAGMA_SPACE_CENTER releaseall end -MossdeepCity_SpaceCenter_2F_EventScript_224193:: @ 8224193 - pokenavcall MossdeepCity_SpaceCenter_2F_Text_2B38C1 +MossdeepCity_SpaceCenter_2F_EventScript_MayRayquazaCall:: @ 8224193 + pokenavcall MossdeepCity_SpaceCenter_2F_Text_MayRayquazaCall waitmessage return -MossdeepCity_SpaceCenter_2F_EventScript_22419A:: @ 822419A - pokenavcall MossdeepCity_SpaceCenter_2F_Text_2B39C6 +MossdeepCity_SpaceCenter_2F_EventScript_BrendanRayquazaCall:: @ 822419A + pokenavcall MossdeepCity_SpaceCenter_2F_Text_BrendanRayquazaCall waitmessage return -MossdeepCity_SpaceCenter_2F_Text_2241A1: @ 82241A1 +MossdeepCity_SpaceCenter_2F_Text_MossdeepIdealForRockets: @ 82241A1 .string "MOSSDEEP has mainly sunny weather,\n" .string "and its winds are stable.\p" .string "It's an ideal location for launching\n" .string "rockets.$" -MossdeepCity_SpaceCenter_2F_Text_22420C: @ 822420C +MossdeepCity_SpaceCenter_2F_Text_WhyWouldMagmaStealRocketFuel: @ 822420C .string "Why would TEAM MAGMA want to steal\n" .string "our rocket fuel in the first place?$" -MossdeepCity_SpaceCenter_2F_Text_224253: @ 8224253 +MossdeepCity_SpaceCenter_2F_Text_WouldveLikedToBeAstronaut: @ 8224253 .string "If only I was a little younger, I would\n" .string "have liked being an astronaut…\p" .string "No… It's not too late!\n" .string "I can and will try!$" -MossdeepCity_SpaceCenter_2F_Text_2242C5: @ 82242C5 +MossdeepCity_SpaceCenter_2F_Text_MagmaCantGetAwayWithThis: @ 82242C5 .string "If TEAM MAGMA takes the rocket fuel,\n" .string "I won't be able to go to space!\p" .string "They can't be allowed to get away\n" .string "with such an outrage!$" -MossdeepCity_SpaceCenter_2F_Text_224342: @ 8224342 +MossdeepCity_SpaceCenter_2F_Text_WishOrdinaryPeopleCouldGoIntoSpace: @ 8224342 .string "I wish ordinary people could go into\n" .string "space one day…$" -MossdeepCity_SpaceCenter_2F_Text_224376: @ 8224376 +MossdeepCity_SpaceCenter_2F_Text_DoesMagmaWantToGoToSpace: @ 8224376 .string "TEAM MAGMA…\n" .string "Do they want to go to space, too?$" -MossdeepCity_SpaceCenter_2F_Text_2243A4: @ 82243A4 +MossdeepCity_SpaceCenter_2F_Text_YoureOutnumberedTakeUsOn: @ 82243A4 .string "What's wrong with you?\p" .string "You're outnumbered three to one,\n" .string "but you still want to take us on?$" -MossdeepCity_SpaceCenter_2F_Text_2243FE: @ 82243FE +MossdeepCity_SpaceCenter_2F_Text_GoodAnswer: @ 82243FE .string "Good answer!\n" .string "That's what a smart person'll do!$" -MossdeepCity_SpaceCenter_2F_Text_22442D: @ 822442D +MossdeepCity_SpaceCenter_2F_Text_Grunt34Intro: @ 822442D .string "A reckless go-getter, are you?\n" .string "Okay, I'll go first!$" -MossdeepCity_SpaceCenter_2F_Text_224461: @ 8224461 +MossdeepCity_SpaceCenter_2F_Text_Grunt34Defeat: @ 8224461 .string "I lost!\n" .string "But!$" -MossdeepCity_SpaceCenter_2F_Text_22446E: @ 822446E +MossdeepCity_SpaceCenter_2F_Text_Grunt35Intro: @ 822446E .string "It's too soon to be relieved!\n" .string "I'm up next!$" -MossdeepCity_SpaceCenter_2F_Text_224499: @ 8224499 +MossdeepCity_SpaceCenter_2F_Text_Grunt35Defeat: @ 8224499 .string "I lost, too!\n" .string "But!$" -MossdeepCity_SpaceCenter_2F_Text_2244AB: @ 82244AB +MossdeepCity_SpaceCenter_2F_Text_Grunt36Intro: @ 82244AB .string "I bet you want to take a break.\n" .string "But I'm not about to let you do that!$" -MossdeepCity_SpaceCenter_2F_Text_2244F1: @ 82244F1 +MossdeepCity_SpaceCenter_2F_Text_Grunt36Defeat: @ 82244F1 .string "We should've taken a break…\n" .string "That's what we should've done…$" -MossdeepCity_SpaceCenter_2F_Text_22452C: @ 822452C +MossdeepCity_SpaceCenter_2F_Text_Grunt35PostBattle: @ 822452C .string "Three of us here, and look at the sorry\n" .string "mess we got ourselves into.$" -MossdeepCity_SpaceCenter_2F_Text_224570: @ 8224570 +MossdeepCity_SpaceCenter_2F_Text_Grunt36PostBattle: @ 8224570 .string "We three losing like this…\n" .string "We look worse than usual by triple!$" -MossdeepCity_SpaceCenter_2F_Text_2245AF: @ 82245AF +MossdeepCity_SpaceCenter_2F_Text_Grunt34PostBattle: @ 82245AF .string "Are we being useful to our leader\n" .string "at all?$" -MossdeepCity_SpaceCenter_2F_Text_2245D9: @ 82245D9 +MossdeepCity_SpaceCenter_2F_Text_WellTakeCareOfYou: @ 82245D9 .string "Hehehe!\p" .string "We come all the way here to get some\n" .string "fuel, and we're interfered with again!\p" .string "If you're going to mess with us too,\n" .string "we'll take care of you at the same time!$" -MossdeepCity_SpaceCenter_2F_Text_22467B: @ 822467B +MossdeepCity_SpaceCenter_2F_Text_MaxieDontInterfere: @ 822467B .string "MAXIE: Clear out of the way!\n" .string "Don't you dare interfere!$" -MossdeepCity_SpaceCenter_2F_Text_2246B2: @ 82246B2 +MossdeepCity_SpaceCenter_2F_Text_StevenWhyStealRocketFuel: @ 82246B2 .string "STEVEN: TEAM MAGMA…\p" .string "What's the point of stealing rocket\n" .string "fuel?$" -MossdeepCity_SpaceCenter_2F_Text_2246F0: @ 82246F0 +MossdeepCity_SpaceCenter_2F_Text_MaxieUseFuelToEruptVolcano: @ 82246F0 .string "MAXIE: Fufufu… Since you're so\n" .string "curious, you deserve an explanation.\p" .string "We're going to jettison the entire\n" @@ -470,24 +471,24 @@ MossdeepCity_SpaceCenter_2F_Text_2246F0: @ 82246F0 .string "the volcano erupt!\p" .string "It will be savage!$" -MossdeepCity_SpaceCenter_2F_Text_2247FF: @ 82247FF +MossdeepCity_SpaceCenter_2F_Text_StevenAreYouReadyToBattle: @ 82247FF .string "STEVEN: {PLAYER}{KUN}!\n" .string "You're going to help me?\p" .string "Let's go into battle together!\n" .string "Are you ready?$" -MossdeepCity_SpaceCenter_2F_Text_224854: @ 8224854 +MossdeepCity_SpaceCenter_2F_Text_StevenHurryGetReadyQuickly: @ 8224854 .string "STEVEN: Then, hurry!\n" .string "Get ready quickly!$" -MossdeepCity_SpaceCenter_2F_Text_22487C: @ 822487C +MossdeepCity_SpaceCenter_2F_Text_JustWantToExpandLand: @ 822487C .string "All I want…\n" .string "I just want to expand the land mass…$" -MossdeepCity_SpaceCenter_Text_2248AD: @ 82248AD +MossdeepCity_SpaceCenter_Text_TabithaDefeat: @ 82248AD .string "I'm with our leader…$" -MossdeepCity_SpaceCenter_2F_Text_2248C2: @ 82248C2 +MossdeepCity_SpaceCenter_2F_Text_MaxieWeFailedIsAquaAlsoMisguided: @ 82248C2 .string "MAXIE: We failed to make the volcano\n" .string "erupt…\p" .string "We failed to control GROUDON after\n" @@ -502,13 +503,13 @@ MossdeepCity_SpaceCenter_2F_Text_2248C2: @ 82248C2 .string "Then might TEAM AQUA's goal to expand\n" .string "the sea also be equally misguided?$" -MossdeepCity_SpaceCenter_2F_Text_2249DC: @ 82249DC +MossdeepCity_SpaceCenter_2F_Text_MaxieWeWillGiveUp: @ 82249DC .string "MAXIE: All right…\n" .string "We will give up on the fuel…\p" .string "There appear to be more important\n" .string "matters that I must examine…$" -MossdeepCity_SpaceCenter_2F_Text_224A4A: @ 8224A4A +MossdeepCity_SpaceCenter_2F_Text_StevenThankYouComeSeeMeAtHome: @ 8224A4A .string "STEVEN: Whew, that was too tense.\n" .string "{PLAYER}{KUN}, thank you.\p" .string "I have something to give you as\n" diff --git a/data/maps/MtChimney/map.json b/data/maps/MtChimney/map.json index 2b19e7f8d..c0763b1bc 100644 --- a/data/maps/MtChimney/map.json +++ b/data/maps/MtChimney/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MtChimney_EventScript_22EDD5", + "script": "MtChimney_EventScript_Archie", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MtChimney_EventScript_22EE0B", + "script": "MtChimney_EventScript_Maxie", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "MtChimney_EventScript_22F06E", + "script": "MtChimney_EventScript_Tabitha", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MtChimney_EventScript_22F0C0", + "script": "MtChimney_EventScript_BusyMagmaGrunt5", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { @@ -76,7 +76,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MtChimney_EventScript_22F0B7", + "script": "MtChimney_EventScript_BusyMagmaGrunt4", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { @@ -89,7 +89,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MtChimney_EventScript_22F05C", + "script": "MtChimney_EventScript_BusyAquaGrunt2", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" }, { @@ -102,7 +102,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MtChimney_EventScript_22F053", + "script": "MtChimney_EventScript_BusyAquaGrunt1", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" }, { @@ -115,7 +115,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MtChimney_EventScript_22F065", + "script": "MtChimney_EventScript_BusyAquaGrunt3", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" }, { @@ -128,7 +128,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MtChimney_EventScript_22EEF3", + "script": "MtChimney_EventScript_LavaCookieLady", "flag": "FLAG_HIDE_MT_CHIMNEY_LAVA_COOKIE_LADY" }, { @@ -141,7 +141,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MtChimney_EventScript_22F0C9", + "script": "MtChimney_EventScript_BusyMagmaGrunt6", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { @@ -154,7 +154,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MtChimney_EventScript_22F0DB", + "script": "MtChimney_EventScript_AquaPoochyena", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" }, { @@ -167,7 +167,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MtChimney_EventScript_22F0D2", + "script": "MtChimney_EventScript_MagmaPoochyena", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { @@ -180,7 +180,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MtChimney_EventScript_22F0A5", + "script": "MtChimney_EventScript_BusyMagmaGrunt2", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { @@ -193,7 +193,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MtChimney_EventScript_22F0D2", + "script": "MtChimney_EventScript_MagmaPoochyena", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { @@ -206,7 +206,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MtChimney_EventScript_22F0D2", + "script": "MtChimney_EventScript_MagmaPoochyena", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { @@ -219,7 +219,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MtChimney_EventScript_22F0AE", + "script": "MtChimney_EventScript_BusyMagmaGrunt3", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { @@ -232,7 +232,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MtChimney_EventScript_22F09C", + "script": "MtChimney_EventScript_BusyMagmaGrunt1", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { @@ -245,7 +245,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MtChimney_EventScript_22F0DB", + "script": "MtChimney_EventScript_AquaPoochyena", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" }, { @@ -258,7 +258,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MtChimney_EventScript_22F0D2", + "script": "MtChimney_EventScript_MagmaPoochyena", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { @@ -271,7 +271,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MtChimney_EventScript_22F0DB", + "script": "MtChimney_EventScript_AquaPoochyena", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" }, { @@ -284,7 +284,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MtChimney_EventScript_22F0D2", + "script": "MtChimney_EventScript_MagmaPoochyena", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { @@ -297,7 +297,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "MtChimney_EventScript_22F085", + "script": "MtChimney_EventScript_Grunt31", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { @@ -310,7 +310,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MtChimney_EventScript_22F0DB", + "script": "MtChimney_EventScript_AquaPoochyena", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" }, { @@ -323,7 +323,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MtChimney_EventScript_22F0D2", + "script": "MtChimney_EventScript_MagmaPoochyena", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { @@ -336,7 +336,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "MtChimney_EventScript_22F14A", + "script": "MtChimney_EventScript_Shelby", "flag": "FLAG_HIDE_MT_CHIMNEY_TRAINERS" }, { @@ -349,7 +349,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "6", - "script": "MtChimney_EventScript_22F1AC", + "script": "MtChimney_EventScript_Melissa", "flag": "FLAG_HIDE_MT_CHIMNEY_TRAINERS" }, { @@ -362,7 +362,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "MtChimney_EventScript_22F1C3", + "script": "MtChimney_EventScript_Sheila", "flag": "FLAG_HIDE_MT_CHIMNEY_TRAINERS" }, { @@ -375,7 +375,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "MtChimney_EventScript_22F1DA", + "script": "MtChimney_EventScript_Shirley", "flag": "FLAG_HIDE_MT_CHIMNEY_TRAINERS" }, { @@ -388,7 +388,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "MtChimney_EventScript_22F1F1", + "script": "MtChimney_EventScript_Grunt24", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { @@ -401,7 +401,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "6", - "script": "MtChimney_EventScript_22F208", + "script": "MtChimney_EventScript_Sawyer", "flag": "FLAG_HIDE_MT_CHIMNEY_TRAINERS" } ], @@ -443,7 +443,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MtChimney_EventScript_22F0E4" + "script": "MtChimney_EventScript_MeteoriteMachine" }, { "type": "sign", @@ -451,7 +451,7 @@ "y": 37, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MtChimney_EventScript_22F141" + "script": "MtChimney_EventScript_RouteSign" } ] }
\ No newline at end of file diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc index 91cdb9e42..de2ce9e8f 100644 --- a/data/maps/MtChimney/scripts.inc +++ b/data/maps/MtChimney/scripts.inc @@ -1,5 +1,5 @@ MtChimney_MapScripts:: @ 822EDC1 - map_script MAP_SCRIPT_ON_RESUME, MtChimney_MapScript1_22EDD2 + map_script MAP_SCRIPT_ON_RESUME, MtChimney_OnResume map_script MAP_SCRIPT_ON_TRANSITION, MtChimney_OnTransition .byte 0 @@ -7,15 +7,15 @@ MtChimney_OnTransition: @ 822EDCC setvar VAR_JAGGED_PASS_ASH_WEATHER, 1 end -MtChimney_MapScript1_22EDD2: @ 822EDD2 +MtChimney_OnResume: @ 822EDD2 setstepcallback STEP_CB_ASH end -MtChimney_EventScript_22EDD5:: @ 822EDD5 +MtChimney_EventScript_Archie:: @ 822EDD5 lock faceplayer - call_if_unset FLAG_EVIL_LEADER_PLEASE_STOP, MtChimney_EventScript_22EDF9 - call_if_set FLAG_EVIL_LEADER_PLEASE_STOP, MtChimney_EventScript_22EE02 + call_if_unset FLAG_EVIL_LEADER_PLEASE_STOP, MtChimney_EventScript_ArchieGoStopTeamMagma + call_if_set FLAG_EVIL_LEADER_PLEASE_STOP, MtChimney_EventScript_ArchieBusyFighting closemessage applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 @@ -23,18 +23,18 @@ MtChimney_EventScript_22EDD5:: @ 822EDD5 release end -MtChimney_EventScript_22EDF9:: @ 822EDF9 - msgbox MtChimney_Text_22FAD2, MSGBOX_DEFAULT +MtChimney_EventScript_ArchieGoStopTeamMagma:: @ 822EDF9 + msgbox MtChimney_Text_ArchieGoStopTeamMagma, MSGBOX_DEFAULT return -MtChimney_EventScript_22EE02:: @ 822EE02 - msgbox MtChimney_Text_22FBC7, MSGBOX_DEFAULT +MtChimney_EventScript_ArchieBusyFighting:: @ 822EE02 + msgbox MtChimney_Text_ArchieIHaveMyHandsFull, MSGBOX_DEFAULT return -MtChimney_EventScript_22EE0B:: @ 822EE0B +MtChimney_EventScript_Maxie:: @ 822EE0B lockall playbgm MUS_MGM0, 0 - msgbox MtChimney_Text_22F26A, MSGBOX_DEFAULT + msgbox MtChimney_Text_MeteoriteWillActivateVolcano, MSGBOX_DEFAULT applymovement 2, Common_Movement_FacePlayer waitmovement 0 playse SE_PIN @@ -42,9 +42,9 @@ MtChimney_EventScript_22EE0B:: @ 822EE0B waitmovement 0 applymovement 2, Common_Movement_Delay48 waitmovement 0 - msgbox MtChimney_Text_22F32E, MSGBOX_DEFAULT - trainerbattle_no_intro TRAINER_MAXIE_2, MtChimney_Text_22F5CF - msgbox MtChimney_Text_22F5F7, MSGBOX_DEFAULT + msgbox MtChimney_Text_MaxieIntro, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_MAXIE_2, MtChimney_Text_MaxieDefeat + msgbox MtChimney_Text_MaxieYouHaventSeenLastOfMagma, MSGBOX_DEFAULT closemessage delay 30 fadescreen 1 @@ -57,17 +57,17 @@ MtChimney_EventScript_22EE0B:: @ 822EE0B setobjectxyperm 1, 10, 12 addobject 1 compare VAR_FACING, DIR_EAST - call_if_eq MtChimney_EventScript_22EEC7 + call_if_eq MtChimney_EventScript_ArchieApproachPlayerEast compare VAR_FACING, DIR_NORTH - call_if_eq MtChimney_EventScript_22EED2 + call_if_eq MtChimney_EventScript_ArchieApproachPlayerNorth applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - msgbox MtChimney_Text_22FC3D, MSGBOX_DEFAULT + msgbox MtChimney_Text_ArchieThankYou, MSGBOX_DEFAULT closemessage compare VAR_FACING, DIR_EAST - call_if_eq MtChimney_EventScript_22EEDD + call_if_eq MtChimney_EventScript_ArchieExitEast compare VAR_FACING, DIR_NORTH - call_if_eq MtChimney_EventScript_22EEE8 + call_if_eq MtChimney_EventScript_ArchieExitNorth removeobject 1 setflag FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA setflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY @@ -77,50 +77,50 @@ MtChimney_EventScript_22EE0B:: @ 822EE0B releaseall end -MtChimney_EventScript_22EEC7:: @ 822EEC7 - applymovement 1, MtChimney_Movement_22EF83 +MtChimney_EventScript_ArchieApproachPlayerEast:: @ 822EEC7 + applymovement 1, MtChimney_Movement_ArchieApproachPlayerEast waitmovement 0 return -MtChimney_EventScript_22EED2:: @ 822EED2 - applymovement 1, MtChimney_Movement_22EF94 +MtChimney_EventScript_ArchieApproachPlayerNorth:: @ 822EED2 + applymovement 1, MtChimney_Movement_ArchieApproachPlayerNorth waitmovement 0 return -MtChimney_EventScript_22EEDD:: @ 822EEDD - applymovement 1, MtChimney_Movement_22EF8B +MtChimney_EventScript_ArchieExitEast:: @ 822EEDD + applymovement 1, MtChimney_Movement_ArchieExitEast waitmovement 0 return -MtChimney_EventScript_22EEE8:: @ 822EEE8 - applymovement 1, MtChimney_Movement_22EF9C +MtChimney_EventScript_ArchieExitNorth:: @ 822EEE8 + applymovement 1, MtChimney_Movement_ArchieExitNorth waitmovement 0 return -MtChimney_EventScript_22EEF3:: @ 822EEF3 +MtChimney_EventScript_LavaCookieLady:: @ 822EEF3 lock faceplayer showmoneybox 0, 0, 0 - msgbox MtChimney_Text_22FE04, MSGBOX_YESNO + msgbox MtChimney_Text_LavaCookiesJust200, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq MtChimney_EventScript_22EF69 + goto_if_eq MtChimney_EventScript_DeclineLavaCookie checkmoney 200, 0 - compare VAR_RESULT, 0 - goto_if_eq MtChimney_EventScript_22EF76 - msgbox MtChimney_Text_22FE4D, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + goto_if_eq MtChimney_EventScript_NotEnoughMoney + msgbox MtChimney_Text_ThankYouDear, MSGBOX_DEFAULT checkitemspace ITEM_LAVA_COOKIE, 1 - compare VAR_RESULT, 1 - call_if_eq MtChimney_EventScript_22EF5E + compare VAR_RESULT, TRUE + call_if_eq MtChimney_EventScript_TakeMoney giveitem_std ITEM_LAVA_COOKIE - compare VAR_RESULT, 0 - goto_if_eq MtChimney_EventScript_22EF51 + compare VAR_RESULT, FALSE + goto_if_eq MtChimney_EventScript_BagIsFull hidemoneybox nop nop release end -MtChimney_EventScript_22EF51:: @ 822EF51 +MtChimney_EventScript_BagIsFull:: @ 822EF51 msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT hidemoneybox nop @@ -128,28 +128,28 @@ MtChimney_EventScript_22EF51:: @ 822EF51 release end -MtChimney_EventScript_22EF5E:: @ 822EF5E +MtChimney_EventScript_TakeMoney:: @ 822EF5E takemoney 200, 0 updatemoneybox 0, 0 return -MtChimney_EventScript_22EF69:: @ 822EF69 - msgbox MtChimney_Text_22FE9B, MSGBOX_DEFAULT +MtChimney_EventScript_DeclineLavaCookie:: @ 822EF69 + msgbox MtChimney_Text_OhFineThen, MSGBOX_DEFAULT hidemoneybox nop nop release end -MtChimney_EventScript_22EF76:: @ 822EF76 - msgbox MtChimney_Text_22FE5E, MSGBOX_DEFAULT +MtChimney_EventScript_NotEnoughMoney:: @ 822EF76 + msgbox MtChimney_Text_YouveNotGotTheMoney, MSGBOX_DEFAULT hidemoneybox nop nop release end -MtChimney_Movement_22EF83: @ 822EF83 +MtChimney_Movement_ArchieApproachPlayerEast: @ 822EF83 walk_up walk_up walk_up @@ -159,7 +159,7 @@ MtChimney_Movement_22EF83: @ 822EF83 walk_right step_end -MtChimney_Movement_22EF8B: @ 822EF8B +MtChimney_Movement_ArchieExitEast: @ 822EF8B walk_left walk_down walk_down @@ -170,7 +170,7 @@ MtChimney_Movement_22EF8B: @ 822EF8B walk_down step_end -MtChimney_Movement_22EF94: @ 822EF94 +MtChimney_Movement_ArchieApproachPlayerNorth: @ 822EF94 walk_up walk_up walk_up @@ -180,7 +180,7 @@ MtChimney_Movement_22EF94: @ 822EF94 walk_right step_end -MtChimney_Movement_22EF9C: @ 822EF9C +MtChimney_Movement_ArchieExitNorth: @ 822EF9C walk_left walk_left walk_down @@ -192,6 +192,7 @@ MtChimney_Movement_22EF9C: @ 822EF9C walk_down step_end +@ Unused MtChimney_Movement_22EFA6: @ 822EFA6 walk_down walk_down @@ -212,6 +213,7 @@ MtChimney_Movement_22EFA6: @ 822EFA6 walk_down step_end +@ Unused MtChimney_Movement_22EFB8: @ 822EFB8 walk_down walk_down @@ -223,6 +225,7 @@ MtChimney_Movement_22EFB8: @ 822EFB8 walk_down step_end +@ Unused MtChimney_Movement_22EFC1: @ 822EFC1 walk_right walk_down @@ -240,6 +243,7 @@ MtChimney_Movement_22EFC1: @ 822EFC1 walk_down step_end +@ Unused MtChimney_Movement_22EFD0: @ 822EFD0 walk_fast_down walk_fast_down @@ -267,6 +271,7 @@ MtChimney_Movement_22EFD0: @ 822EFD0 walk_down step_end +@ Unused MtChimney_Movement_22EFE9: @ 822EFE9 delay_16 delay_16 @@ -280,6 +285,7 @@ MtChimney_Movement_22EFE9: @ 822EFE9 walk_down step_end +@ Unused MtChimney_Movement_22EFF4: @ 822EFF4 delay_16 walk_left @@ -298,6 +304,7 @@ MtChimney_Movement_22EFF4: @ 822EFF4 walk_down step_end +@ Unused MtChimney_Movement_22F004: @ 822F004 delay_16 walk_left @@ -317,6 +324,7 @@ MtChimney_Movement_22F004: @ 822F004 walk_down step_end +@ Unused MtChimney_Movement_22F015: @ 822F015 delay_16 walk_down @@ -327,6 +335,7 @@ MtChimney_Movement_22F015: @ 822F015 walk_in_place_fastest_down step_end +@ Unused MtChimney_Movement_22F01D: @ 822F01D walk_down walk_down @@ -343,10 +352,12 @@ MtChimney_Movement_22F01D: @ 822F01D walk_down step_end +@ Unused MtChimney_Movement_22F02B: @ 822F02B walk_down step_end +@ Unused MtChimney_Movement_22F02D: @ 822F02D walk_down walk_down @@ -357,6 +368,7 @@ MtChimney_Movement_22F02D: @ 822F02D walk_down step_end +@ Unused MtChimney_Movement_22F035: @ 822F035 delay_16 delay_16 @@ -369,6 +381,7 @@ MtChimney_Movement_22F035: @ 822F035 walk_down step_end +@ Unused MtChimney_Movement_22F03F: @ 822F03F delay_16 delay_16 @@ -382,6 +395,7 @@ MtChimney_Movement_22F03F: @ 822F03F walk_down step_end +@ Unused MtChimney_Movement_22F04A: @ 822F04A lock_facing_direction walk_fast_left @@ -389,163 +403,164 @@ MtChimney_Movement_22F04A: @ 822F04A face_right step_end +@ Unused MtChimney_Movement_22F04F: @ 822F04F walk_left walk_in_place_fastest_right delay_16 step_end -MtChimney_EventScript_22F053:: @ 822F053 - msgbox MtChimney_Text_22FD1F, MSGBOX_SIGN +MtChimney_EventScript_BusyAquaGrunt1:: @ 822F053 + msgbox MtChimney_Text_MagmaOutnumbersUs, MSGBOX_SIGN end -MtChimney_EventScript_22F05C:: @ 822F05C - msgbox MtChimney_Text_22FD5B, MSGBOX_SIGN +MtChimney_EventScript_BusyAquaGrunt2:: @ 822F05C + msgbox MtChimney_Text_LessHabitatForWaterPokemon, MSGBOX_SIGN end -MtChimney_EventScript_22F065:: @ 822F065 - msgbox MtChimney_Text_22FDA1, MSGBOX_SIGN +MtChimney_EventScript_BusyAquaGrunt3:: @ 822F065 + msgbox MtChimney_Text_MagmasNameSimilar, MSGBOX_SIGN end -MtChimney_EventScript_22F06E:: @ 822F06E - trainerbattle_single TRAINER_TABITHA_2, MtChimney_Text_22F6AA, MtChimney_Text_22F72C - msgbox MtChimney_Text_22F76D, MSGBOX_AUTOCLOSE +MtChimney_EventScript_Tabitha:: @ 822F06E + trainerbattle_single TRAINER_TABITHA_2, MtChimney_Text_TabithaIntro, MtChimney_Text_TabithaDefeat + msgbox MtChimney_Text_TabithaPostBattle, MSGBOX_AUTOCLOSE end -MtChimney_EventScript_22F085:: @ 822F085 - trainerbattle_single TRAINER_GRUNT_31, MtChimney_Text_22F7A2, MtChimney_Text_22F83A - msgbox MtChimney_Text_22F859, MSGBOX_AUTOCLOSE +MtChimney_EventScript_Grunt31:: @ 822F085 + trainerbattle_single TRAINER_GRUNT_31, MtChimney_Text_Grunt31Intro, MtChimney_Text_Grunt31Defeat + msgbox MtChimney_Text_Grunt31PostBattle, MSGBOX_AUTOCLOSE end -MtChimney_EventScript_22F09C:: @ 822F09C - msgbox MtChimney_Text_22F978, MSGBOX_SIGN +MtChimney_EventScript_BusyMagmaGrunt1:: @ 822F09C + msgbox MtChimney_Text_TeamAquaAlwaysMessingWithPlans, MSGBOX_SIGN end -MtChimney_EventScript_22F0A5:: @ 822F0A5 - msgbox MtChimney_Text_22F9B2, MSGBOX_SIGN +MtChimney_EventScript_BusyMagmaGrunt2:: @ 822F0A5 + msgbox MtChimney_Text_MeteoritesPackAmazingPower, MSGBOX_SIGN end -MtChimney_EventScript_22F0AE:: @ 822F0AE - msgbox MtChimney_Text_22F9D1, MSGBOX_SIGN +MtChimney_EventScript_BusyMagmaGrunt3:: @ 822F0AE + msgbox MtChimney_Text_YouBetterNotMessWithUs, MSGBOX_SIGN end -MtChimney_EventScript_22F0B7:: @ 822F0B7 - msgbox MtChimney_Text_22FA2F, MSGBOX_SIGN +MtChimney_EventScript_BusyMagmaGrunt4:: @ 822F0B7 + msgbox MtChimney_Text_AquasNameSimilar, MSGBOX_SIGN end -MtChimney_EventScript_22F0C0:: @ 822F0C0 - msgbox MtChimney_Text_22FA8B, MSGBOX_SIGN +MtChimney_EventScript_BusyMagmaGrunt5:: @ 822F0C0 + msgbox MtChimney_Text_DouseThemInFire, MSGBOX_SIGN end -MtChimney_EventScript_22F0C9:: @ 822F0C9 - msgbox MtChimney_Text_22FAA5, MSGBOX_SIGN +MtChimney_EventScript_BusyMagmaGrunt6:: @ 822F0C9 + msgbox MtChimney_Text_KeepMakingMoreLand, MSGBOX_SIGN end -MtChimney_EventScript_22F0D2:: @ 822F0D2 - msgbox MtChimney_Text_22FACB, MSGBOX_SIGN +MtChimney_EventScript_MagmaPoochyena:: @ 822F0D2 + msgbox MtChimney_Text_Bufoh, MSGBOX_SIGN end -MtChimney_EventScript_22F0DB:: @ 822F0DB - msgbox MtChimney_Text_22FDFC, MSGBOX_SIGN +MtChimney_EventScript_AquaPoochyena:: @ 822F0DB + msgbox MtChimney_Text_Bushaa, MSGBOX_SIGN end -MtChimney_EventScript_22F0E4:: @ 822F0E4 +MtChimney_EventScript_MeteoriteMachine:: @ 822F0E4 lockall - goto_if_unset FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, MtChimney_EventScript_22F137 - goto_if_set FLAG_RECEIVED_METEORITE, MtChimney_EventScript_22F12D - msgbox MtChimney_Text_22FF12, MSGBOX_YESNO + goto_if_unset FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, MtChimney_EventScript_MachineOn + goto_if_set FLAG_RECEIVED_METEORITE, MtChimney_EventScript_MachineOff + msgbox MtChimney_Text_RemoveTheMeteorite, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq MtChimney_EventScript_22F123 - msgbox MtChimney_Text_22FF66, MSGBOX_DEFAULT + goto_if_eq MtChimney_EventScript_LeaveMeteoriteAlone + msgbox MtChimney_Text_PlayerRemovedMeteorite, MSGBOX_DEFAULT giveitem_std ITEM_METEORITE setflag FLAG_RECEIVED_METEORITE releaseall end -MtChimney_EventScript_22F123:: @ 822F123 - msgbox MtChimney_Text_22FF9C, MSGBOX_DEFAULT +MtChimney_EventScript_LeaveMeteoriteAlone:: @ 822F123 + msgbox MtChimney_Text_PlayerLeftMeteorite, MSGBOX_DEFAULT releaseall end -MtChimney_EventScript_22F12D:: @ 822F12D - msgbox MtChimney_Text_22FFC0, MSGBOX_DEFAULT +MtChimney_EventScript_MachineOff:: @ 822F12D + msgbox MtChimney_Text_MachineMakesNoResponse, MSGBOX_DEFAULT releaseall end -MtChimney_EventScript_22F137:: @ 822F137 - msgbox MtChimney_Text_22FEAA, MSGBOX_DEFAULT +MtChimney_EventScript_MachineOn:: @ 822F137 + msgbox MtChimney_Text_MetoriteFittedOnMachine, MSGBOX_DEFAULT releaseall end -MtChimney_EventScript_22F141:: @ 822F141 - msgbox MtChimney_Text_22FFFA, MSGBOX_SIGN +MtChimney_EventScript_RouteSign:: @ 822F141 + msgbox MtChimney_Text_RouteSign, MSGBOX_SIGN end -MtChimney_EventScript_22F14A:: @ 822F14A - trainerbattle_single TRAINER_SHELBY_1, MtChimney_Text_23001D, MtChimney_Text_230076, MtChimney_EventScript_22F176 +MtChimney_EventScript_Shelby:: @ 822F14A + trainerbattle_single TRAINER_SHELBY_1, MtChimney_Text_ShelbyIntro, MtChimney_Text_ShelbyDefeat, MtChimney_EventScript_DefeatedShelby specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq MtChimney_EventScript_22F195 - msgbox MtChimney_Text_2300A2, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq MtChimney_EventScript_RematchShelby + msgbox MtChimney_Text_ShelbyPostBattle, MSGBOX_DEFAULT release end -MtChimney_EventScript_22F176:: @ 822F176 +MtChimney_EventScript_DefeatedShelby:: @ 822F176 special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox MtChimney_Text_2300E3, MSGBOX_DEFAULT + msgbox MtChimney_Text_ShelbyRegister, MSGBOX_DEFAULT register_matchcall TRAINER_SHELBY_1 release end -MtChimney_EventScript_22F195:: @ 822F195 - trainerbattle_rematch TRAINER_SHELBY_1, MtChimney_Text_230153, MtChimney_Text_2301BB - msgbox MtChimney_Text_2301E7, MSGBOX_AUTOCLOSE +MtChimney_EventScript_RematchShelby:: @ 822F195 + trainerbattle_rematch TRAINER_SHELBY_1, MtChimney_Text_ShelbyRematchIntro, MtChimney_Text_ShelbyRematchDefeat + msgbox MtChimney_Text_ShelbyPostRematch, MSGBOX_AUTOCLOSE end -MtChimney_EventScript_22F1AC:: @ 822F1AC - trainerbattle_single TRAINER_MELISSA, MtChimney_Text_23022A, MtChimney_Text_23026D - msgbox MtChimney_Text_230292, MSGBOX_AUTOCLOSE +MtChimney_EventScript_Melissa:: @ 822F1AC + trainerbattle_single TRAINER_MELISSA, MtChimney_Text_MelissaIntro, MtChimney_Text_MelissaDefeat + msgbox MtChimney_Text_MelissaPostBattle, MSGBOX_AUTOCLOSE end -MtChimney_EventScript_22F1C3:: @ 822F1C3 - trainerbattle_single TRAINER_SHEILA, MtChimney_Text_2302BD, MtChimney_Text_230304 - msgbox MtChimney_Text_23033A, MSGBOX_AUTOCLOSE +MtChimney_EventScript_Sheila:: @ 822F1C3 + trainerbattle_single TRAINER_SHEILA, MtChimney_Text_SheilaIntro, MtChimney_Text_SheilaDefeat + msgbox MtChimney_Text_SheilaPostBattle, MSGBOX_AUTOCLOSE end -MtChimney_EventScript_22F1DA:: @ 822F1DA - trainerbattle_single TRAINER_SHIRLEY, MtChimney_Text_2303DF, MtChimney_Text_230436 - msgbox MtChimney_Text_230463, MSGBOX_AUTOCLOSE +MtChimney_EventScript_Shirley:: @ 822F1DA + trainerbattle_single TRAINER_SHIRLEY, MtChimney_Text_ShirleyIntro, MtChimney_Text_ShirleyDefeat + msgbox MtChimney_Text_ShirleyPostBattle, MSGBOX_AUTOCLOSE end -MtChimney_EventScript_22F1F1:: @ 822F1F1 - trainerbattle_single TRAINER_GRUNT_24, MtChimney_Text_22F8B6, MtChimney_Text_22F921 - msgbox MtChimney_Text_22F93A, MSGBOX_AUTOCLOSE +MtChimney_EventScript_Grunt24:: @ 822F1F1 + trainerbattle_single TRAINER_GRUNT_24, MtChimney_Text_Grunt24Intro, MtChimney_Text_Grunt24Defeat + msgbox MtChimney_Text_Grunt24PostBattle, MSGBOX_AUTOCLOSE end -MtChimney_EventScript_22F208:: @ 822F208 - trainerbattle_single TRAINER_SAWYER_1, MtChimney_Text_2304B3, MtChimney_Text_2304F7, MtChimney_EventScript_22F234 +MtChimney_EventScript_Sawyer:: @ 822F208 + trainerbattle_single TRAINER_SAWYER_1, MtChimney_Text_SawyerIntro, MtChimney_Text_SawyerDefeat, MtChimney_EventScript_SawyerDefeated specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq MtChimney_EventScript_22F253 - msgbox MtChimney_Text_230519, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq MtChimney_EventScript_SawyerRematch + msgbox MtChimney_Text_SawyerPostBattle, MSGBOX_DEFAULT release end -MtChimney_EventScript_22F234:: @ 822F234 +MtChimney_EventScript_SawyerDefeated:: @ 822F234 special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox MtChimney_Text_230557, MSGBOX_DEFAULT + msgbox MtChimney_Text_SawyerRegister, MSGBOX_DEFAULT register_matchcall TRAINER_SAWYER_1 release end -MtChimney_EventScript_22F253:: @ 822F253 - trainerbattle_rematch TRAINER_SAWYER_1, MtChimney_Text_23059C, MtChimney_Text_2305E3 - msgbox MtChimney_Text_230614, MSGBOX_AUTOCLOSE +MtChimney_EventScript_SawyerRematch:: @ 822F253 + trainerbattle_rematch TRAINER_SAWYER_1, MtChimney_Text_SawyerRematchIntro, MtChimney_Text_SawyerRematchDefeat + msgbox MtChimney_Text_SawyerPostRematch, MSGBOX_AUTOCLOSE end -MtChimney_Text_22F26A: @ 822F26A +MtChimney_Text_MeteoriteWillActivateVolcano: @ 822F26A .string "The power contained in the METEORITE…\p" .string "By amplifying its power with this\n" .string "machine, MT. CHIMNEY's volcanic\l" @@ -554,7 +569,7 @@ MtChimney_Text_22F26A: @ 822F26A .string "the crater and…\l" .string "Fufufu…$" -MtChimney_Text_22F32E: @ 822F32E +MtChimney_Text_MaxieIntro: @ 822F32E .string "MAXIE: Hm?\n" .string "Who are you?\p" .string "… … … … … …\n" @@ -582,11 +597,11 @@ MtChimney_Text_22F32E: @ 822F32E .string "I'll teach you the consequences of\l" .string "meddling in our grand design!$" -MtChimney_Text_22F5CF: @ 822F5CF +MtChimney_Text_MaxieDefeat: @ 822F5CF .string "What?!\p" .string "I, MAXIE, was caught off guard?!$" -MtChimney_Text_22F5F7: @ 822F5F7 +MtChimney_Text_MaxieYouHaventSeenLastOfMagma: @ 822F5F7 .string "MAXIE: But, enough.\n" .string "I will back off this time.\p" .string "But don't think that this is the last\n" @@ -595,81 +610,81 @@ MtChimney_Text_22F5F7: @ 822F5F7 .string "Even without the METEORITE, if we\n" .string "obtain that ORB… Fufufu…$" -MtChimney_Text_22F6AA: @ 822F6AA +MtChimney_Text_TabithaIntro: @ 822F6AA .string "Hehehe!\p" .string "So you've come all the way here!\p" .string "But you're too late!\n" .string "I've already delivered the METEORITE\l" .string "from METEOR FALLS to the BOSS!$" -MtChimney_Text_22F72C: @ 822F72C +MtChimney_Text_TabithaDefeat: @ 822F72C .string "Hehehe…\p" .string "Even though I've lost, if our leader\n" .string "awakens that thing…$" -MtChimney_Text_22F76D: @ 822F76D +MtChimney_Text_TabithaPostBattle: @ 822F76D .string "BOSS, hurry!\n" .string "Give it the METEORITE's energy!\p" .string "Hehehe…$" -MtChimney_Text_22F7A2: @ 822F7A2 +MtChimney_Text_Grunt31Intro: @ 822F7A2 .string "We of TEAM MAGMA are working hard for\n" .string "everyone's sake.\p" .string "Like, if that thing's power made more\n" .string "land, there'd be more places to live.\p" .string "Everyone'd be happy!$" -MtChimney_Text_22F83A: @ 822F83A +MtChimney_Text_Grunt31Defeat: @ 822F83A .string "Hunh?\n" .string "What do you mean I lost?$" -MtChimney_Text_22F859: @ 822F859 +MtChimney_Text_Grunt31PostBattle: @ 822F859 .string "Our BOSS says, “It will make everyone\n" .string "happy.”\p" .string "But why does everyone keep getting\n" .string "in our way?$" -MtChimney_Text_22F8B6: @ 822F8B6 +MtChimney_Text_Grunt24Intro: @ 822F8B6 .string "If there were more land, I'd be able\n" .string "to get a big house of my own!\p" .string "I'm going to build it on hardened lava!$" -MtChimney_Text_22F921: @ 822F921 +MtChimney_Text_Grunt24Defeat: @ 822F921 .string "My dream of a big house…$" -MtChimney_Text_22F93A: @ 822F93A +MtChimney_Text_Grunt24PostBattle: @ 822F93A .string "A kid like you, you ought to be\n" .string "splashing about in the waves!$" -MtChimney_Text_22F978: @ 822F978 +MtChimney_Text_TeamAquaAlwaysMessingWithPlans: @ 822F978 .string "That annoying TEAM AQUA…\n" .string "They always mess with our plans!$" -MtChimney_Text_22F9B2: @ 822F9B2 +MtChimney_Text_MeteoritesPackAmazingPower: @ 822F9B2 .string "METEORITES pack amazing power!$" -MtChimney_Text_22F9D1: @ 822F9D1 +MtChimney_Text_YouBetterNotMessWithUs: @ 822F9D1 .string "You'd better not mess with us!\p" .string "We're trying to awaken that thing\n" .string "for the benefit of everyone!$" -MtChimney_Text_22FA2F: @ 822FA2F +MtChimney_Text_AquasNameSimilar: @ 822FA2F .string "We're TEAM MAGMA!\p" .string "They're TEAM AQUA!\p" .string "It totally annoys me that they'd\n" .string "use a name like ours!$" -MtChimney_Text_22FA8B: @ 822FA8B +MtChimney_Text_DouseThemInFire: @ 822FA8B .string "Yeah!\n" .string "Douse them in fire!$" -MtChimney_Text_22FAA5: @ 822FAA5 +MtChimney_Text_KeepMakingMoreLand: @ 822FAA5 .string "We're going to keep making more land!$" -MtChimney_Text_22FACB: @ 822FACB +MtChimney_Text_Bufoh: @ 822FACB .string "Bufoh!$" -MtChimney_Text_22FAD2: @ 822FAD2 +MtChimney_Text_ArchieGoStopTeamMagma: @ 822FAD2 .string "ARCHIE: Grr, {PLAYER}!\n" .string "I should've guessed you'd show up!\p" .string "See for yourself what the fanatics\n" @@ -679,14 +694,14 @@ MtChimney_Text_22FAD2: @ 822FAD2 .string "Doing something like that will cause\n" .string "the volcano's eruption!$" -MtChimney_Text_22FBC7: @ 822FBC7 +MtChimney_Text_ArchieIHaveMyHandsFull: @ 822FBC7 .string "ARCHIE: Grrr…\p" .string "I want to stop that MAXIE,\n" .string "but I can't!\p" .string "Not when I have my hands full battling\n" .string "three opponents at once!$" -MtChimney_Text_22FC3D: @ 822FC3D +MtChimney_Text_ArchieThankYou: @ 822FC3D .string "ARCHIE: {PLAYER}!\n" .string "Thank you!\p" .string "With your help, we thwarted TEAM\n" @@ -698,161 +713,161 @@ MtChimney_Text_22FC3D: @ 822FC3D .string "our pursuit of TEAM MAGMA.\p" .string "{PLAYER}, we shall meet again!$" -MtChimney_Text_22FD1F: @ 822FD1F +MtChimney_Text_MagmaOutnumbersUs: @ 822FD1F .string "Darn… TEAM MAGMA outnumbers us!\n" .string "We can't keep up with them!$" -MtChimney_Text_22FD5B: @ 822FD5B +MtChimney_Text_LessHabitatForWaterPokemon: @ 822FD5B .string "If they expand the land, there'll be\n" .string "less habitats for WATER POKéMON!$" -MtChimney_Text_22FDA1: @ 822FDA1 +MtChimney_Text_MagmasNameSimilar: @ 822FDA1 .string "We're TEAM AQUA!\p" .string "They're TEAM MAGMA!\p" .string "It burns me up that they'd use such\n" .string "a confusing name!$" -MtChimney_Text_22FDFC: @ 822FDFC +MtChimney_Text_Bushaa: @ 822FDFC .string "Bushaa!$" -MtChimney_Text_22FE04: @ 822FE04 +MtChimney_Text_LavaCookiesJust200: @ 822FE04 .string "LAVA COOKIES are MT. CHIMNEY's local\n" .string "specialty.\p" .string "Try one. It's just ¥200.$" -MtChimney_Text_22FE4D: @ 822FE4D +MtChimney_Text_ThankYouDear: @ 822FE4D .string "Thank you, dear!$" -MtChimney_Text_22FE5E: @ 822FE5E +MtChimney_Text_YouveNotGotTheMoney: @ 822FE5E .string "Oh, dear. You can't buy a thing if\n" .string "you've not got the money.$" -MtChimney_Text_22FE9B: @ 822FE9B +MtChimney_Text_OhFineThen: @ 822FE9B .string "Oh, fine then.$" -MtChimney_Text_22FEAA: @ 822FEAA +MtChimney_Text_MetoriteFittedOnMachine: @ 822FEAA .string "A METEORITE is fitted on a mysterious\n" .string "machine…\p" .string "The machine seems to be storing\n" .string "energy in the METEORITE.$" -MtChimney_Text_22FF12: @ 822FF12 +MtChimney_Text_RemoveTheMeteorite: @ 822FF12 .string "A METEORITE is fitted on a mysterious\n" .string "machine…\p" .string "Do you want to remove the METEORITE?$" -MtChimney_Text_22FF66: @ 822FF66 +MtChimney_Text_PlayerRemovedMeteorite: @ 822FF66 .string "{PLAYER} removed the METEORITE from\n" .string "the mysterious machine.$" -MtChimney_Text_22FF9C: @ 822FF9C +MtChimney_Text_PlayerLeftMeteorite: @ 822FF9C .string "{PLAYER} left the METEORITE where\n" .string "it was.$" -MtChimney_Text_22FFC0: @ 822FFC0 +MtChimney_Text_MachineMakesNoResponse: @ 822FFC0 .string "This mysterious machine…\n" .string "It makes no response whatsoever.$" -MtChimney_Text_22FFFA: @ 822FFFA +MtChimney_Text_RouteSign: @ 822FFFA .string "{DOWN_ARROW} JAGGED PATH\n" .string "LAVARIDGE TOWN AHEAD$" -MtChimney_Text_23001D: @ 823001D +MtChimney_Text_ShelbyIntro: @ 823001D .string "I've been to the hot springs and\n" .string "refreshed my tired bones.\l" .string "Right now I'm feeling strong!$" -MtChimney_Text_230076: @ 8230076 +MtChimney_Text_ShelbyDefeat: @ 8230076 .string "Oh, my goodness.\n" .string "Now, aren't you something!$" -MtChimney_Text_2300A2: @ 82300A2 +MtChimney_Text_ShelbyPostBattle: @ 82300A2 .string "Well, well, I've lost. I can't call\n" .string "myself an EXPERT now, can I?$" -MtChimney_Text_2300E3: @ 82300E3 +MtChimney_Text_ShelbyRegister: @ 82300E3 .string "Thank you, child. It was fun, as if\n" .string "I were battling my own grandchild.\p" .string "Please, come see me again for\n" .string "a rematch.$" -MtChimney_Text_230153: @ 8230153 +MtChimney_Text_ShelbyRematchIntro: @ 8230153 .string "If you can mesh your heart with those\n" .string "of your POKéMON, why, you should be\l" .string "able to achieve great things.$" -MtChimney_Text_2301BB: @ 82301BB +MtChimney_Text_ShelbyRematchDefeat: @ 82301BB .string "Oh, my goodness.\n" .string "Now, aren't you something!$" -MtChimney_Text_2301E7: @ 82301E7 +MtChimney_Text_ShelbyPostRematch: @ 82301E7 .string "Perhaps your heart has become one\n" .string "with the hearts of your POKéMON.$" -MtChimney_Text_23022A: @ 823022A +MtChimney_Text_MelissaIntro: @ 823022A .string "I've got the fire in me, baby.\n" .string "I can't stand it! I have to battle!$" -MtChimney_Text_23026D: @ 823026D +MtChimney_Text_MelissaDefeat: @ 823026D .string "Ooh, that was a scorching-hot match!$" -MtChimney_Text_230292: @ 8230292 +MtChimney_Text_MelissaPostBattle: @ 8230292 .string "The heat of MT. CHIMNEY warms\n" .string "me up, baby!$" -MtChimney_Text_2302BD: @ 82302BD +MtChimney_Text_SheilaIntro: @ 82302BD .string "I've finally made it to MT. CHIMNEY.\n" .string "I want to make my POKéMON battle!$" -MtChimney_Text_230304: @ 8230304 +MtChimney_Text_SheilaDefeat: @ 8230304 .string "The way you battle…\n" .string "It's like a MT. CHIMNEY eruption!$" -MtChimney_Text_23033A: @ 823033A +MtChimney_Text_SheilaPostBattle: @ 823033A .string "Like I said, I've finally made it to\n" .string "MT. CHIMNEY. It would be a shame if\l" .string "I only do a little sightseeing…\p" .string "I want to get in some battles and buy\n" .string "COOKIES as souvenirs.$" -MtChimney_Text_2303DF: @ 82303DF +MtChimney_Text_ShirleyIntro: @ 82303DF .string "Since I bathed in the hot springs,\n" .string "I've been feeling great!\l" .string "I'm sure I'm going to win!$" -MtChimney_Text_230436: @ 8230436 +MtChimney_Text_ShirleyDefeat: @ 8230436 .string "Yowch!\n" .string "I'm getting a chill out of the water.$" -MtChimney_Text_230463: @ 8230463 +MtChimney_Text_ShirleyPostBattle: @ 8230463 .string "I'll have to take another dip in the\n" .string "hot springs. Want to join me?\p" .string "Just joking!$" -MtChimney_Text_2304B3: @ 82304B3 +MtChimney_Text_SawyerIntro: @ 82304B3 .string "This is one fine mountain! Plenty of\n" .string "hot people around for company!$" -MtChimney_Text_2304F7: @ 82304F7 +MtChimney_Text_SawyerDefeat: @ 82304F7 .string "Oh, you're a real firebrand, too!$" -MtChimney_Text_230519: @ 8230519 +MtChimney_Text_SawyerPostBattle: @ 8230519 .string "I think I need a dip in LAVARIDGE\n" .string "HOT SPRING with the locals!$" -MtChimney_Text_230557: @ 8230557 +MtChimney_Text_SawyerRegister: @ 8230557 .string "I like little fireballs like you.\n" .string "Let me register you in my POKéNAV.$" -MtChimney_Text_23059C: @ 823059C +MtChimney_Text_SawyerRematchIntro: @ 823059C .string "I'm happily surrounded by hot people\n" .string "around these parts. I won't lose!$" -MtChimney_Text_2305E3: @ 82305E3 +MtChimney_Text_SawyerRematchDefeat: @ 82305E3 .string "Gosh, you're still the same\n" .string "firebrand as before!$" -MtChimney_Text_230614: @ 8230614 +MtChimney_Text_SawyerPostRematch: @ 8230614 .string "Actually, it really is hot here.\n" .string "I'm overdressed for these parts.$" diff --git a/data/maps/MtPyre_Summit/map.json b/data/maps/MtPyre_Summit/map.json index 78780ba19..93bc0b755 100644 --- a/data/maps/MtPyre_Summit/map.json +++ b/data/maps/MtPyre_Summit/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MtPyre_Summit_EventScript_23213C", + "script": "MtPyre_Summit_EventScript_OldMan", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MtPyre_Summit_EventScript_2321A2", + "script": "MtPyre_Summit_EventScript_OldLady", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "MtPyre_Summit_EventScript_2323FD", + "script": "MtPyre_Summit_EventScript_Grunt17", "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA" }, { @@ -76,7 +76,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "MtPyre_Summit_EventScript_232414", + "script": "MtPyre_Summit_EventScript_Grunt18", "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA" }, { @@ -89,7 +89,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "MtPyre_Summit_EventScript_23242B", + "script": "MtPyre_Summit_EventScript_Grunt19", "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA" }, { @@ -102,7 +102,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "MtPyre_Summit_EventScript_232442", + "script": "MtPyre_Summit_EventScript_Grunt29", "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA" }, { @@ -150,7 +150,7 @@ "elevation": 3, "var": "VAR_MT_PYRE_STATE", "var_value": "0", - "script": "MtPyre_Summit_EventScript_232018" + "script": "MtPyre_Summit_EventScript_TeamAquaTrigger0" }, { "type": "trigger", @@ -159,7 +159,7 @@ "elevation": 3, "var": "VAR_MT_PYRE_STATE", "var_value": "0", - "script": "MtPyre_Summit_EventScript_232024" + "script": "MtPyre_Summit_EventScript_TeamAquaTrigger1" }, { "type": "trigger", @@ -168,7 +168,7 @@ "elevation": 3, "var": "VAR_MT_PYRE_STATE", "var_value": "0", - "script": "MtPyre_Summit_EventScript_232030" + "script": "MtPyre_Summit_EventScript_TeamAquaTrigger2" }, { "type": "trigger", @@ -177,7 +177,7 @@ "elevation": 3, "var": "VAR_MT_PYRE_STATE", "var_value": "2", - "script": "MtPyre_Summit_EventScript_2321EC" + "script": "MtPyre_Summit_EventScript_ArchieMaxieTrigger0" }, { "type": "trigger", @@ -186,7 +186,7 @@ "elevation": 3, "var": "VAR_MT_PYRE_STATE", "var_value": "2", - "script": "MtPyre_Summit_EventScript_2321F8" + "script": "MtPyre_Summit_EventScript_ArchieMaxieTrigger1" }, { "type": "trigger", @@ -195,7 +195,7 @@ "elevation": 3, "var": "VAR_MT_PYRE_STATE", "var_value": "2", - "script": "MtPyre_Summit_EventScript_232204" + "script": "MtPyre_Summit_EventScript_ArchieMaxieTrigger2" } ], "bg_events": [ diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc index 4049a1f29..3995cb25c 100644 --- a/data/maps/MtPyre_Summit/scripts.inc +++ b/data/maps/MtPyre_Summit/scripts.inc @@ -4,33 +4,33 @@ MtPyre_Summit_MapScripts:: @ 8231FF7 MtPyre_Summit_OnTransition: @ 8231FFD compare VAR_MT_PYRE_STATE, 2 - call_if_eq MtPyre_Summit_EventScript_232009 + call_if_eq MtPyre_Summit_EventScript_SetArchieMaxiePositions end -MtPyre_Summit_EventScript_232009:: @ 8232009 +MtPyre_Summit_EventScript_SetArchieMaxiePositions:: @ 8232009 setobjectxyperm 8, 23, 6 setobjectxyperm 2, 22, 6 end -MtPyre_Summit_EventScript_232018:: @ 8232018 +MtPyre_Summit_EventScript_TeamAquaTrigger0:: @ 8232018 lockall setvar VAR_0x8008, 0 - goto MtPyre_Summit_EventScript_23203C + goto MtPyre_Summit_EventScript_TeamAquaExits end -MtPyre_Summit_EventScript_232024:: @ 8232024 +MtPyre_Summit_EventScript_TeamAquaTrigger1:: @ 8232024 lockall setvar VAR_0x8008, 1 - goto MtPyre_Summit_EventScript_23203C + goto MtPyre_Summit_EventScript_TeamAquaExits end -MtPyre_Summit_EventScript_232030:: @ 8232030 +MtPyre_Summit_EventScript_TeamAquaTrigger2:: @ 8232030 lockall setvar VAR_0x8008, 2 - goto MtPyre_Summit_EventScript_23203C + goto MtPyre_Summit_EventScript_TeamAquaExits end -MtPyre_Summit_EventScript_23203C:: @ 823203C +MtPyre_Summit_EventScript_TeamAquaExits:: @ 823203C playbgm MUS_AQA_0, 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 @@ -38,12 +38,12 @@ MtPyre_Summit_EventScript_23203C:: @ 823203C waitmovement 0 delay 50 compare VAR_0x8008, 0 - call_if_eq MtPyre_Summit_EventScript_2320E0 + call_if_eq MtPyre_Summit_EventScript_ArchieFacePlayer0 compare VAR_0x8008, 1 - call_if_eq MtPyre_Summit_EventScript_2320EB + call_if_eq MtPyre_Summit_EventScript_ArchieFacePlayer1 compare VAR_0x8008, 2 - call_if_eq MtPyre_Summit_EventScript_2320EC - msgbox MtPyre_Summit_Text_23281A, MSGBOX_DEFAULT + call_if_eq MtPyre_Summit_EventScript_ArchieFacePlayer2 + msgbox MtPyre_Summit_Text_ArchieWeGotTheOrbLetsGo, MSGBOX_DEFAULT closemessage fadescreen 1 removeobject 2 @@ -58,164 +58,165 @@ MtPyre_Summit_EventScript_23203C:: @ 823203C delay 20 setvar VAR_MT_PYRE_STATE, 1 compare VAR_0x8008, 0 - call_if_eq MtPyre_Summit_EventScript_2320F7 + call_if_eq MtPyre_Summit_EventScript_OldLadyApproachPlayer0 compare VAR_0x8008, 1 - call_if_eq MtPyre_Summit_EventScript_23210C + call_if_eq MtPyre_Summit_EventScript_OldLadyApproachPlayer1 compare VAR_0x8008, 2 - call_if_eq MtPyre_Summit_EventScript_232117 - msgbox MtPyre_Summit_Text_23290E, MSGBOX_DEFAULT + call_if_eq MtPyre_Summit_EventScript_OldLadyApproachPlayer2 + msgbox MtPyre_Summit_Text_BothOrbsTakenMagmaLeftThis, MSGBOX_DEFAULT giveitem_std ITEM_MAGMA_EMBLEM setflag FLAG_RECEIVED_RED_OR_BLUE_ORB setflag FLAG_HIDE_JAGGED_PASS_MAGMA_GUARD releaseall end -MtPyre_Summit_EventScript_2320E0:: @ 82320E0 - applymovement 2, MtPyre_Summit_Movement_232136 +MtPyre_Summit_EventScript_ArchieFacePlayer0:: @ 82320E0 + applymovement 2, MtPyre_Summit_Movement_ArchieFacePlayer0 waitmovement 0 return -MtPyre_Summit_EventScript_2320EB:: @ 82320EB +@ Archie is already facing player +MtPyre_Summit_EventScript_ArchieFacePlayer1:: @ 82320EB return -MtPyre_Summit_EventScript_2320EC:: @ 82320EC - applymovement 2, MtPyre_Summit_Movement_232139 +MtPyre_Summit_EventScript_ArchieFacePlayer2:: @ 82320EC + applymovement 2, MtPyre_Summit_Movement_ArchieFacePlayer2 waitmovement 0 return -MtPyre_Summit_EventScript_2320F7:: @ 82320F7 - applymovement 3, MtPyre_Summit_Movement_23212C +MtPyre_Summit_EventScript_OldLadyApproachPlayer0:: @ 82320F7 + applymovement 3, MtPyre_Summit_Movement_OldLadyApproachPlayer0 waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return -MtPyre_Summit_EventScript_23210C:: @ 823210C - applymovement 3, MtPyre_Summit_Movement_232130 +MtPyre_Summit_EventScript_OldLadyApproachPlayer1:: @ 823210C + applymovement 3, MtPyre_Summit_Movement_OldLadyApproachPlayer1 waitmovement 0 return -MtPyre_Summit_EventScript_232117:: @ 8232117 - applymovement 3, MtPyre_Summit_Movement_232132 +MtPyre_Summit_EventScript_OldLadyApproachPlayer2:: @ 8232117 + applymovement 3, MtPyre_Summit_Movement_OldLadyApproachPlayer2 waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return -MtPyre_Summit_Movement_23212C: @ 823212C +MtPyre_Summit_Movement_OldLadyApproachPlayer0: @ 823212C walk_down walk_down walk_in_place_fastest_left step_end -MtPyre_Summit_Movement_232130: @ 8232130 +MtPyre_Summit_Movement_OldLadyApproachPlayer1: @ 8232130 walk_down step_end -MtPyre_Summit_Movement_232132: @ 8232132 +MtPyre_Summit_Movement_OldLadyApproachPlayer2: @ 8232132 walk_down walk_down walk_in_place_fastest_right step_end -MtPyre_Summit_Movement_232136: @ 8232136 +MtPyre_Summit_Movement_ArchieFacePlayer0: @ 8232136 walk_left walk_in_place_fastest_down step_end -MtPyre_Summit_Movement_232139: @ 8232139 +MtPyre_Summit_Movement_ArchieFacePlayer2: @ 8232139 walk_right walk_in_place_fastest_down step_end -MtPyre_Summit_EventScript_23213C:: @ 823213C +MtPyre_Summit_EventScript_OldMan:: @ 823213C lock faceplayer - goto_if_set FLAG_SOOTOPOLIS_ARCHIE_MAXIE_LEAVE, MtPyre_Summit_EventScript_232167 - msgbox MtPyre_Summit_Text_232E0C, MSGBOX_YESNO + goto_if_set FLAG_SOOTOPOLIS_ARCHIE_MAXIE_LEAVE, MtPyre_Summit_EventScript_OldManAfterRayquaza + msgbox MtPyre_Summit_Text_WillYouHearOutMyTale, MSGBOX_YESNO compare VAR_RESULT, 1 - call_if_eq MtPyre_Summit_EventScript_232187 + call_if_eq MtPyre_Summit_EventScript_OldManTale compare VAR_RESULT, 0 - call_if_eq MtPyre_Summit_EventScript_232190 + call_if_eq MtPyre_Summit_EventScript_DeclineOldManTale release end -MtPyre_Summit_EventScript_232167:: @ 8232167 - msgbox MtPyre_Summit_Text_2331A6, MSGBOX_YESNO +MtPyre_Summit_EventScript_OldManAfterRayquaza:: @ 8232167 + msgbox MtPyre_Summit_Text_HearTheNewLegendOfHoenn, MSGBOX_YESNO compare VAR_RESULT, 1 - call_if_eq MtPyre_Summit_EventScript_232199 + call_if_eq MtPyre_Summit_EventScript_OldManNewTale compare VAR_RESULT, 0 - call_if_eq MtPyre_Summit_EventScript_232190 + call_if_eq MtPyre_Summit_EventScript_DeclineOldManTale release end -MtPyre_Summit_EventScript_232187:: @ 8232187 - msgbox MtPyre_Summit_Text_232F27, MSGBOX_DEFAULT +MtPyre_Summit_EventScript_OldManTale:: @ 8232187 + msgbox MtPyre_Summit_Text_GroudonKyogreTale, MSGBOX_DEFAULT return -MtPyre_Summit_EventScript_232190:: @ 8232190 - msgbox MtPyre_Summit_Text_233162, MSGBOX_DEFAULT +MtPyre_Summit_EventScript_DeclineOldManTale:: @ 8232190 + msgbox MtPyre_Summit_Text_WellThatTooIsFine, MSGBOX_DEFAULT return -MtPyre_Summit_EventScript_232199:: @ 8232199 - msgbox MtPyre_Summit_Text_23325D, MSGBOX_DEFAULT +MtPyre_Summit_EventScript_OldManNewTale:: @ 8232199 + msgbox MtPyre_Summit_Text_HoennTrioTale, MSGBOX_DEFAULT return -MtPyre_Summit_EventScript_2321A2:: @ 82321A2 +MtPyre_Summit_EventScript_OldLady:: @ 82321A2 lock faceplayer - goto_if_set FLAG_RETURNED_RED_OR_BLUE_ORB, MtPyre_Summit_EventScript_2321E2 + goto_if_set FLAG_RETURNED_RED_OR_BLUE_ORB, MtPyre_Summit_EventScript_OldLadyAfterOrbsReturned compare VAR_MT_PYRE_STATE, 3 - call_if_ge MtPyre_Summit_EventScript_2321CB - goto_if_set FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, MtPyre_Summit_EventScript_2321D8 - msgbox MtPyre_Summit_Text_232AD8, MSGBOX_DEFAULT + call_if_ge MtPyre_Summit_EventScript_OldLadyOrbsReturned + goto_if_set FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, MtPyre_Summit_EventScript_OldLadyLegendariesAwake + msgbox MtPyre_Summit_Text_OrbsHaveBeenTaken, MSGBOX_DEFAULT release end -MtPyre_Summit_EventScript_2321CB:: @ 82321CB - msgbox MtPyre_Summit_Text_232CA6, MSGBOX_DEFAULT +MtPyre_Summit_EventScript_OldLadyOrbsReturned:: @ 82321CB + msgbox MtPyre_Summit_Text_ThoseTwoMenReturnedOrbs, MSGBOX_DEFAULT setflag FLAG_RETURNED_RED_OR_BLUE_ORB release end -MtPyre_Summit_EventScript_2321D8:: @ 82321D8 - msgbox MtPyre_Summit_Text_232B4F, MSGBOX_DEFAULT +MtPyre_Summit_EventScript_OldLadyLegendariesAwake:: @ 82321D8 + msgbox MtPyre_Summit_Text_GroudonKyogreAwakened, MSGBOX_DEFAULT release end -MtPyre_Summit_EventScript_2321E2:: @ 82321E2 - msgbox MtPyre_Summit_Text_232D1E, MSGBOX_DEFAULT +MtPyre_Summit_EventScript_OldLadyAfterOrbsReturned:: @ 82321E2 + msgbox MtPyre_Summit_Text_SuperAncientPokemonTaughtUs, MSGBOX_DEFAULT release end -MtPyre_Summit_EventScript_2321EC:: @ 82321EC +MtPyre_Summit_EventScript_ArchieMaxieTrigger0:: @ 82321EC lockall setvar VAR_0x8008, 0 - goto MtPyre_Summit_EventScript_232210 + goto MtPyre_Summit_EventScript_ArchieMaxieReturnOrbs end -MtPyre_Summit_EventScript_2321F8:: @ 82321F8 +MtPyre_Summit_EventScript_ArchieMaxieTrigger1:: @ 82321F8 lockall setvar VAR_0x8008, 1 - goto MtPyre_Summit_EventScript_232210 + goto MtPyre_Summit_EventScript_ArchieMaxieReturnOrbs end -MtPyre_Summit_EventScript_232204:: @ 8232204 +MtPyre_Summit_EventScript_ArchieMaxieTrigger2:: @ 8232204 lockall setvar VAR_0x8008, 2 - goto MtPyre_Summit_EventScript_232210 + goto MtPyre_Summit_EventScript_ArchieMaxieReturnOrbs end -MtPyre_Summit_EventScript_232210:: @ 8232210 +MtPyre_Summit_EventScript_ArchieMaxieReturnOrbs:: @ 8232210 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 delay 60 compare VAR_0x8008, 0 - call_if_eq MtPyre_Summit_EventScript_2322C4 + call_if_eq MtPyre_Summit_EventScript_ArchieMaxieBeginExit0 compare VAR_0x8008, 1 - call_if_eq MtPyre_Summit_EventScript_2322DD + call_if_eq MtPyre_Summit_EventScript_ArchieMaxieBeginExit1 compare VAR_0x8008, 2 - call_if_eq MtPyre_Summit_EventScript_2322F6 + call_if_eq MtPyre_Summit_EventScript_ArchieMaxieBeginExit2 playse SE_PIN applymovement 8, Common_Movement_ExclamationMark waitmovement 0 @@ -223,22 +224,22 @@ MtPyre_Summit_EventScript_232210:: @ 8232210 waitmovement 0 delay 30 compare VAR_0x8008, 0 - call_if_eq MtPyre_Summit_EventScript_23230F + call_if_eq MtPyre_Summit_EventScript_MaxieApproachPlayer0 compare VAR_0x8008, 1 - call_if_eq MtPyre_Summit_EventScript_232328 + call_if_eq MtPyre_Summit_EventScript_MaxieApproachPlayer1 compare VAR_0x8008, 2 - call_if_eq MtPyre_Summit_EventScript_232341 - msgbox MtPyre_Summit_Text_233183, MSGBOX_DEFAULT + call_if_eq MtPyre_Summit_EventScript_MaxieApproachPlayer2 + msgbox MtPyre_Summit_Text_MaxieSilence, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 0 - call_if_eq MtPyre_Summit_EventScript_23235A + call_if_eq MtPyre_Summit_EventScript_MaxieApproachArchie0 compare VAR_0x8008, 1 - call_if_eq MtPyre_Summit_EventScript_232376 + call_if_eq MtPyre_Summit_EventScript_MaxieApproachArchie1 compare VAR_0x8008, 2 - call_if_eq MtPyre_Summit_EventScript_232392 + call_if_eq MtPyre_Summit_EventScript_MaxieApproachArchie2 delay 30 - applymovement 2, MtPyre_Summit_Movement_2323B6 - applymovement 8, MtPyre_Summit_Movement_2323BD + applymovement 2, MtPyre_Summit_Movement_MaxieExit + applymovement 8, MtPyre_Summit_Movement_ArchieExit waitmovement 0 removeobject 2 removeobject 8 @@ -246,85 +247,85 @@ MtPyre_Summit_EventScript_232210:: @ 8232210 releaseall end -MtPyre_Summit_EventScript_2322C4:: @ 82322C4 - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323C4 - applymovement 2, MtPyre_Summit_Movement_2323B6 - applymovement 8, MtPyre_Summit_Movement_2323BD +MtPyre_Summit_EventScript_ArchieMaxieBeginExit0:: @ 82322C4 + applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchArchieMaxieExit0 + applymovement 2, MtPyre_Summit_Movement_MaxieExit + applymovement 8, MtPyre_Summit_Movement_ArchieExit waitmovement 0 return -MtPyre_Summit_EventScript_2322DD:: @ 82322DD - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323CB - applymovement 2, MtPyre_Summit_Movement_2323B6 - applymovement 8, MtPyre_Summit_Movement_2323BD +MtPyre_Summit_EventScript_ArchieMaxieBeginExit1:: @ 82322DD + applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchArchieMaxieExit1 + applymovement 2, MtPyre_Summit_Movement_MaxieExit + applymovement 8, MtPyre_Summit_Movement_ArchieExit waitmovement 0 return -MtPyre_Summit_EventScript_2322F6:: @ 82322F6 - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323D2 - applymovement 2, MtPyre_Summit_Movement_2323B6 - applymovement 8, MtPyre_Summit_Movement_2323BD +MtPyre_Summit_EventScript_ArchieMaxieBeginExit2:: @ 82322F6 + applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchArchieMaxieExit2 + applymovement 2, MtPyre_Summit_Movement_MaxieExit + applymovement 8, MtPyre_Summit_Movement_ArchieExit waitmovement 0 return -MtPyre_Summit_EventScript_23230F:: @ 823230F - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323AE - applymovement 2, MtPyre_Summit_Movement_2323E7 - applymovement 8, MtPyre_Summit_Movement_2323D8 +MtPyre_Summit_EventScript_MaxieApproachPlayer0:: @ 823230F + applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_PlayerFaceMaxie0 + applymovement 2, MtPyre_Summit_Movement_ArchieWatchMaxie + applymovement 8, MtPyre_Summit_Movement_MaxieApproachPlayer0 waitmovement 0 return -MtPyre_Summit_EventScript_232328:: @ 8232328 - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323B2 - applymovement 2, MtPyre_Summit_Movement_2323E7 - applymovement 8, MtPyre_Summit_Movement_2323DD +MtPyre_Summit_EventScript_MaxieApproachPlayer1:: @ 8232328 + applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_PlayerFaceMaxie + applymovement 2, MtPyre_Summit_Movement_ArchieWatchMaxie + applymovement 8, MtPyre_Summit_Movement_MaxieApproachPlayer1 waitmovement 0 return -MtPyre_Summit_EventScript_232341:: @ 8232341 - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323B2 - applymovement 2, MtPyre_Summit_Movement_2323E7 - applymovement 8, MtPyre_Summit_Movement_2323E2 +MtPyre_Summit_EventScript_MaxieApproachPlayer2:: @ 8232341 + applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_PlayerFaceMaxie + applymovement 2, MtPyre_Summit_Movement_ArchieWatchMaxie + applymovement 8, MtPyre_Summit_Movement_MaxieApproachPlayer2 waitmovement 0 return -MtPyre_Summit_EventScript_23235A:: @ 823235A - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323EA - applymovement 8, MtPyre_Summit_Movement_2323ED +MtPyre_Summit_EventScript_MaxieApproachArchie0:: @ 823235A + applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchMaxie + applymovement 8, MtPyre_Summit_Movement_MaxieApproachArchie0 waitmovement 0 applymovement 2, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return -MtPyre_Summit_EventScript_232376:: @ 8232376 - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323EA - applymovement 8, MtPyre_Summit_Movement_2323F3 +MtPyre_Summit_EventScript_MaxieApproachArchie1:: @ 8232376 + applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchMaxie + applymovement 8, MtPyre_Summit_Movement_MaxieApproachArchie1 waitmovement 0 applymovement 2, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return -MtPyre_Summit_EventScript_232392:: @ 8232392 - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323EA - applymovement 8, MtPyre_Summit_Movement_2323F8 +MtPyre_Summit_EventScript_MaxieApproachArchie2:: @ 8232392 + applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchMaxie + applymovement 8, MtPyre_Summit_Movement_MaxieApproachArchie2 waitmovement 0 applymovement 2, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return -MtPyre_Summit_Movement_2323AE: @ 82323AE +MtPyre_Summit_Movement_PlayerFaceMaxie0: @ 82323AE delay_16 delay_16 walk_in_place_fastest_right step_end -MtPyre_Summit_Movement_2323B2: @ 82323B2 +MtPyre_Summit_Movement_PlayerFaceMaxie: @ 82323B2 delay_16 delay_16 walk_in_place_fastest_left step_end -MtPyre_Summit_Movement_2323B6: @ 82323B6 +MtPyre_Summit_Movement_MaxieExit: @ 82323B6 walk_down walk_down walk_down @@ -333,7 +334,7 @@ MtPyre_Summit_Movement_2323B6: @ 82323B6 walk_down step_end -MtPyre_Summit_Movement_2323BD: @ 82323BD +MtPyre_Summit_Movement_ArchieExit: @ 82323BD walk_down walk_down walk_down @@ -342,7 +343,7 @@ MtPyre_Summit_Movement_2323BD: @ 82323BD walk_down step_end -MtPyre_Summit_Movement_2323C4: @ 82323C4 +MtPyre_Summit_Movement_PlayerWatchArchieMaxieExit0: @ 82323C4 delay_16 delay_8 walk_left @@ -351,7 +352,7 @@ MtPyre_Summit_Movement_2323C4: @ 82323C4 walk_in_place_fastest_down step_end -MtPyre_Summit_Movement_2323CB: @ 82323CB +MtPyre_Summit_Movement_PlayerWatchArchieMaxieExit1: @ 82323CB delay_16 delay_8 walk_right @@ -360,7 +361,7 @@ MtPyre_Summit_Movement_2323CB: @ 82323CB walk_in_place_fastest_down step_end -MtPyre_Summit_Movement_2323D2: @ 82323D2 +MtPyre_Summit_Movement_PlayerWatchArchieMaxieExit2: @ 82323D2 delay_16 delay_8 walk_in_place_fastest_left @@ -368,38 +369,38 @@ MtPyre_Summit_Movement_2323D2: @ 82323D2 walk_in_place_fastest_down step_end -MtPyre_Summit_Movement_2323D8: @ 82323D8 +MtPyre_Summit_Movement_MaxieApproachPlayer0: @ 82323D8 walk_up walk_up walk_up walk_left step_end -MtPyre_Summit_Movement_2323DD: @ 82323DD +MtPyre_Summit_Movement_MaxieApproachPlayer1: @ 82323DD walk_up walk_up walk_up walk_in_place_fastest_right step_end -MtPyre_Summit_Movement_2323E2: @ 82323E2 +MtPyre_Summit_Movement_MaxieApproachPlayer2: @ 82323E2 walk_up walk_up walk_up walk_in_place_fastest_right step_end -MtPyre_Summit_Movement_2323E7: @ 82323E7 +MtPyre_Summit_Movement_ArchieWatchMaxie: @ 82323E7 delay_16 walk_in_place_fastest_up step_end -MtPyre_Summit_Movement_2323EA: @ 82323EA +MtPyre_Summit_Movement_PlayerWatchMaxie: @ 82323EA delay_16 walk_in_place_fastest_down step_end -MtPyre_Summit_Movement_2323ED: @ 82323ED +MtPyre_Summit_Movement_MaxieApproachArchie0: @ 82323ED walk_down walk_right walk_down @@ -407,54 +408,54 @@ MtPyre_Summit_Movement_2323ED: @ 82323ED walk_in_place_fastest_left step_end -MtPyre_Summit_Movement_2323F3: @ 82323F3 +MtPyre_Summit_Movement_MaxieApproachArchie1: @ 82323F3 walk_down walk_down walk_down walk_in_place_fastest_left step_end -MtPyre_Summit_Movement_2323F8: @ 82323F8 +MtPyre_Summit_Movement_MaxieApproachArchie2: @ 82323F8 walk_down walk_down walk_down walk_in_place_fastest_left step_end -MtPyre_Summit_EventScript_2323FD:: @ 82323FD - trainerbattle_single TRAINER_GRUNT_17, MtPyre_Summit_Text_232459, MtPyre_Summit_Text_2324A0 - msgbox MtPyre_Summit_Text_2324E0, MSGBOX_AUTOCLOSE +MtPyre_Summit_EventScript_Grunt17:: @ 82323FD + trainerbattle_single TRAINER_GRUNT_17, MtPyre_Summit_Text_Grunt17Intro, MtPyre_Summit_Text_Grunt17Defeat + msgbox MtPyre_Summit_Text_Grunt17PostBattle, MSGBOX_AUTOCLOSE end -MtPyre_Summit_EventScript_232414:: @ 8232414 - trainerbattle_single TRAINER_GRUNT_18, MtPyre_Summit_Text_232513, MtPyre_Summit_Text_2325B0 - msgbox MtPyre_Summit_Text_2325E4, MSGBOX_AUTOCLOSE +MtPyre_Summit_EventScript_Grunt18:: @ 8232414 + trainerbattle_single TRAINER_GRUNT_18, MtPyre_Summit_Text_Grunt18Intro, MtPyre_Summit_Text_Grunt18Defeat + msgbox MtPyre_Summit_Text_Grunt18PostBattle, MSGBOX_AUTOCLOSE end -MtPyre_Summit_EventScript_23242B:: @ 823242B - trainerbattle_single TRAINER_GRUNT_19, MtPyre_Summit_Text_23261D, MtPyre_Summit_Text_232678 - msgbox MtPyre_Summit_Text_2326B3, MSGBOX_AUTOCLOSE +MtPyre_Summit_EventScript_Grunt19:: @ 823242B + trainerbattle_single TRAINER_GRUNT_19, MtPyre_Summit_Text_Grunt19Intro, MtPyre_Summit_Text_Grunt19Defeat + msgbox MtPyre_Summit_Text_Grunt19PostBattle, MSGBOX_AUTOCLOSE end -MtPyre_Summit_EventScript_232442:: @ 8232442 - trainerbattle_single TRAINER_GRUNT_29, MtPyre_Summit_Text_23271B, MtPyre_Summit_Text_23279A - msgbox MtPyre_Summit_Text_2327D8, MSGBOX_AUTOCLOSE +MtPyre_Summit_EventScript_Grunt29:: @ 8232442 + trainerbattle_single TRAINER_GRUNT_29, MtPyre_Summit_Text_Grunt29Intro, MtPyre_Summit_Text_Grunt29Defeat + msgbox MtPyre_Summit_Text_Grunt29PostBattle, MSGBOX_AUTOCLOSE end -MtPyre_Summit_Text_232459: @ 8232459 +MtPyre_Summit_Text_Grunt17Intro: @ 8232459 .string "No! Those TEAM MAGMA goons got\n" .string "here ahead of us!\p" .string "We can't fall behind!$" -MtPyre_Summit_Text_2324A0: @ 82324A0 +MtPyre_Summit_Text_Grunt17Defeat: @ 82324A0 .string "I thought you were one of the MAGMAS\n" .string "who happened to come back…$" -MtPyre_Summit_Text_2324E0: @ 82324E0 +MtPyre_Summit_Text_Grunt17PostBattle: @ 82324E0 .string "Yeah, so you are strong…\n" .string "But there're a lot of us!$" -MtPyre_Summit_Text_232513: @ 8232513 +MtPyre_Summit_Text_Grunt18Intro: @ 8232513 .string "Hah!\n" .string "Too bad for you!\p" .string "If you came earlier, you only would've\n" @@ -462,46 +463,46 @@ MtPyre_Summit_Text_232513: @ 8232513 .string "But since you arrived now, you have\n" .string "to take on us toughies!$" -MtPyre_Summit_Text_2325B0: @ 82325B0 +MtPyre_Summit_Text_Grunt18Defeat: @ 82325B0 .string "Urgh… I should've let you take on\n" .string "TEAM MAGMA first…$" -MtPyre_Summit_Text_2325E4: @ 82325E4 +MtPyre_Summit_Text_Grunt18PostBattle: @ 82325E4 .string "You don't know anything!\n" .string "So why are you messing with us?$" -MtPyre_Summit_Text_23261D: @ 823261D +MtPyre_Summit_Text_Grunt19Intro: @ 823261D .string "You…\n" .string "We saw you at MT. CHIMNEY.\p" .string "You don't belong to either TEAM,\n" .string "so why would you be here?$" -MtPyre_Summit_Text_232678: @ 8232678 +MtPyre_Summit_Text_Grunt19Defeat: @ 8232678 .string "If you're going to mess with anyone,\n" .string "let it be TEAM MAGMA…$" -MtPyre_Summit_Text_2326B3: @ 82326B3 +MtPyre_Summit_Text_Grunt19PostBattle: @ 82326B3 .string "Heh, it doesn't matter!\n" .string "We bought ourselves some time!\p" .string "The BOSS should have snatched what\n" .string "he was after!$" -MtPyre_Summit_Text_23271B: @ 823271B +MtPyre_Summit_Text_Grunt29Intro: @ 823271B .string "Oh, I know!\n" .string "You tried to join TEAM MAGMA,\l" .string "but they wouldn't have you!\p" .string "Well, don't think that we'll let you\n" .string "join our TEAM AQUA!$" -MtPyre_Summit_Text_23279A: @ 823279A +MtPyre_Summit_Text_Grunt29Defeat: @ 823279A .string "If you want to join TEAM AQUA that\n" .string "badly, we can consider it…$" -MtPyre_Summit_Text_2327D8: @ 82327D8 +MtPyre_Summit_Text_Grunt29PostBattle: @ 82327D8 .string "We have a great combination going\n" .string "with us members and our leader.$" -MtPyre_Summit_Text_23281A: @ 823281A +MtPyre_Summit_Text_ArchieWeGotTheOrbLetsGo: @ 823281A .string "ARCHIE: TEAM MAGMA's MAXIE got ahead\n" .string "of us, but we also got what we wanted.\p" .string "The RED ORB preserved at MT. PYRE…\n" @@ -511,7 +512,7 @@ MtPyre_Summit_Text_23281A: @ 823281A .string "Okay, TEAM!\n" .string "We're pulling out!$" -MtPyre_Summit_Text_23290E: @ 823290E +MtPyre_Summit_Text_BothOrbsTakenMagmaLeftThis: @ 823290E .string "Oh, no…\n" .string "This cannot happen…\p" .string "Not only the BLUE ORB, but even\n" @@ -531,13 +532,13 @@ MtPyre_Summit_Text_23290E: @ 823290E .string "I would like you to have it.\n" .string "Perhaps it will be useful in some way.$" -MtPyre_Summit_Text_232AD8: @ 8232AD8 +MtPyre_Summit_Text_OrbsHaveBeenTaken: @ 8232AD8 .string "The BLUE ORB and RED ORB taken by\n" .string "those sinister men…\p" .string "They must never be apart…\n" .string "I fear something terrible will happen…$" -MtPyre_Summit_Text_232B4F: @ 8232B4F +MtPyre_Summit_Text_GroudonKyogreAwakened: @ 8232B4F .string "Oh, my goodness…\p" .string "You say that both GROUDON and KYOGRE\n" .string "have been awakened?\p" @@ -551,13 +552,13 @@ MtPyre_Summit_Text_232B4F: @ 8232B4F .string "It could be a human, or perhaps\n" .string "a POKéMON, but no one knows.$" -MtPyre_Summit_Text_232CA6: @ 8232CA6 +MtPyre_Summit_Text_ThoseTwoMenReturnedOrbs: @ 8232CA6 .string "The two men who took the ORBS came\n" .string "back to return them on their own.\p" .string "Those men…\n" .string "Perhaps they are not so evil after all…$" -MtPyre_Summit_Text_232D1E: @ 8232D1E +MtPyre_Summit_Text_SuperAncientPokemonTaughtUs: @ 8232D1E .string "The embodiments of the land, sea,\n" .string "and the sky…\p" .string "That is said to be the identities of\n" @@ -568,7 +569,7 @@ MtPyre_Summit_Text_232D1E: @ 8232D1E .string "The super-ancient POKéMON have\n" .string "taught us that…$" -MtPyre_Summit_Text_232E0C: @ 8232E0C +MtPyre_Summit_Text_WillYouHearOutMyTale: @ 8232E0C .string "MT. PYRE is where we calm the spirits\n" .string "of POKéMON that have passed on…\p" .string "This is a high place where one can\n" @@ -579,7 +580,7 @@ MtPyre_Summit_Text_232E0C: @ 8232E0C .string "Will you hear out my tale? A tale long\n" .string "told in the HOENN region?$" -MtPyre_Summit_Text_232F27: @ 8232F27 +MtPyre_Summit_Text_GroudonKyogreTale: @ 8232F27 .string "It happened long, long ago…\p" .string "The world was wracked by a ferocious\n" .string "clash between the POKéMON of the land\l" @@ -599,16 +600,16 @@ MtPyre_Summit_Text_232F27: @ 8232F27 .string "the sea where eventually they\l" .string "disappeared…$" -MtPyre_Summit_Text_233162: @ 8233162 +MtPyre_Summit_Text_WellThatTooIsFine: @ 8233162 .string "I see…\n" .string "Well, that, too, is fine…$" -MtPyre_Summit_Text_233183: @ 8233183 +MtPyre_Summit_Text_MaxieSilence: @ 8233183 .string "MAXIE: {PLAYER}…\p" .string "… … … … … …\n" .string "… … … … … …$" -MtPyre_Summit_Text_2331A6: @ 82331A6 +MtPyre_Summit_Text_HearTheNewLegendOfHoenn: @ 82331A6 .string "It is my role to pass on the legends\n" .string "of HOENN to future generations.\p" .string "And the crisis that just ended in\n" @@ -616,7 +617,7 @@ MtPyre_Summit_Text_2331A6: @ 82331A6 .string "Have you the time to hear the new\n" .string "legend of HOENN?$" -MtPyre_Summit_Text_23325D: @ 823325D +MtPyre_Summit_Text_HoennTrioTale: @ 823325D .string "It happened long, long ago…\p" .string "The world was wracked by a ferocious\n" .string "clash between the POKéMON of the land\l" diff --git a/data/maps/Route119_WeatherInstitute_1F/map.json b/data/maps/Route119_WeatherInstitute_1F/map.json index 8200c20df..74629d77e 100644 --- a/data/maps/Route119_WeatherInstitute_1F/map.json +++ b/data/maps/Route119_WeatherInstitute_1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route119_WeatherInstitute_1F_EventScript_26FB29", + "script": "Route119_WeatherInstitute_1F_EventScript_Grunt11", "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route119_WeatherInstitute_1F_EventScript_26FB40", + "script": "Route119_WeatherInstitute_1F_EventScript_Grunt20", "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route119_WeatherInstitute_1F_EventScript_26FB0F", + "script": "Route119_WeatherInstitute_1F_EventScript_InstituteWorker2", "flag": "FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route119_WeatherInstitute_1F_EventScript_26FAC8", + "script": "Route119_WeatherInstitute_1F_EventScript_InstituteWorker1", "flag": "FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route119_WeatherInstitute_1F_EventScript_26FAA4", + "script": "Route119_WeatherInstitute_1F_EventScript_LittleBoy", "flag": "0" } ], @@ -111,7 +111,7 @@ "y": 2, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route119_WeatherInstitute_1F_EventScript_26FB18" + "script": "Route119_WeatherInstitute_1F_EventScript_Bed" }, { "type": "sign", @@ -119,7 +119,7 @@ "y": 3, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route119_WeatherInstitute_1F_EventScript_26FB18" + "script": "Route119_WeatherInstitute_1F_EventScript_Bed" }, { "type": "sign", @@ -127,7 +127,7 @@ "y": 2, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route119_WeatherInstitute_1F_EventScript_26FB18" + "script": "Route119_WeatherInstitute_1F_EventScript_Bed" }, { "type": "sign", @@ -135,7 +135,7 @@ "y": 3, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route119_WeatherInstitute_1F_EventScript_26FB18" + "script": "Route119_WeatherInstitute_1F_EventScript_Bed" } ] }
\ No newline at end of file diff --git a/data/maps/Route119_WeatherInstitute_1F/scripts.inc b/data/maps/Route119_WeatherInstitute_1F/scripts.inc index b4b309d80..630f69a29 100644 --- a/data/maps/Route119_WeatherInstitute_1F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_1F/scripts.inc @@ -4,111 +4,111 @@ Route119_WeatherInstitute_1F_MapScripts:: @ 826FA86 Route119_WeatherInstitute_1F_OnTransition: @ 826FA8C compare VAR_WEATHER_INSTITUTE_STATE, 0 - call_if_eq Route119_WeatherInstitute_1F_EventScript_26FA98 + call_if_eq Route119_WeatherInstitute_1F_EventScript_SetLittleBoyPos end -Route119_WeatherInstitute_1F_EventScript_26FA98:: @ 826FA98 +Route119_WeatherInstitute_1F_EventScript_SetLittleBoyPos:: @ 826FA98 setobjectxyperm 5, 0, 5 setobjectmovementtype 5, MOVEMENT_TYPE_FACE_RIGHT return -Route119_WeatherInstitute_1F_EventScript_26FAA4:: @ 826FAA4 +Route119_WeatherInstitute_1F_EventScript_LittleBoy:: @ 826FAA4 lock faceplayer special GetPlayerBigGuyGirlString compare VAR_WEATHER_INSTITUTE_STATE, 0 - goto_if_eq Route119_WeatherInstitute_1F_EventScript_26FABE - msgbox Route119_WeatherInstitute_1F_Text_26FCE5, MSGBOX_DEFAULT + goto_if_eq Route119_WeatherInstitute_1F_EventScript_LittleBoyTeamAquaHere + msgbox Route119_WeatherInstitute_1F_Text_WowYoureStrong, MSGBOX_DEFAULT release end -Route119_WeatherInstitute_1F_EventScript_26FABE:: @ 826FABE - msgbox Route119_WeatherInstitute_1F_Text_26FCB7, MSGBOX_DEFAULT +Route119_WeatherInstitute_1F_EventScript_LittleBoyTeamAquaHere:: @ 826FABE + msgbox Route119_WeatherInstitute_1F_Text_EveryoneWentUpstairs, MSGBOX_DEFAULT release end -Route119_WeatherInstitute_1F_EventScript_26FAC8:: @ 826FAC8 +Route119_WeatherInstitute_1F_EventScript_InstituteWorker1:: @ 826FAC8 lock faceplayer - goto_if_unset FLAG_SYS_GAME_CLEAR, Route119_WeatherInstitute_1F_EventScript_26FB05 + goto_if_unset FLAG_SYS_GAME_CLEAR, Route119_WeatherInstitute_1F_EventScript_StudyingRain setvar VAR_0x8004, 0 - call_if_set FLAG_DEFEATED_KYOGRE, Route119_WeatherInstitute_1F_EventScript_26FAFF - call_if_set FLAG_DEFEATED_GROUDON, Route119_WeatherInstitute_1F_EventScript_26FAFF - compare VAR_0x8004, 2 - goto_if_eq Route119_WeatherInstitute_1F_EventScript_26FB05 - msgbox Route119_WeatherInstitute_1F_Text_26FDE8, MSGBOX_DEFAULT + call_if_set FLAG_DEFEATED_KYOGRE, Route119_WeatherInstitute_1F_EventScript_LegendaryDefeated + call_if_set FLAG_DEFEATED_GROUDON, Route119_WeatherInstitute_1F_EventScript_LegendaryDefeated + compare VAR_0x8004, 2 @ Both defeated + goto_if_eq Route119_WeatherInstitute_1F_EventScript_StudyingRain + msgbox Route119_WeatherInstitute_1F_Text_NoticingUnusualWeather, MSGBOX_DEFAULT release end -Route119_WeatherInstitute_1F_EventScript_26FAFF:: @ 826FAFF +Route119_WeatherInstitute_1F_EventScript_LegendaryDefeated:: @ 826FAFF addvar VAR_0x8004, 1 return -Route119_WeatherInstitute_1F_EventScript_26FB05:: @ 826FB05 - msgbox Route119_WeatherInstitute_1F_Text_26FD2E, MSGBOX_DEFAULT +Route119_WeatherInstitute_1F_EventScript_StudyingRain:: @ 826FB05 + msgbox Route119_WeatherInstitute_1F_Text_ProfStudyingRain, MSGBOX_DEFAULT release end -Route119_WeatherInstitute_1F_EventScript_26FB0F:: @ 826FB0F - msgbox Route119_WeatherInstitute_1F_Text_26FE94, MSGBOX_NPC +Route119_WeatherInstitute_1F_EventScript_InstituteWorker2:: @ 826FB0F + msgbox Route119_WeatherInstitute_1F_Text_WhatWereAquasUpTo, MSGBOX_NPC end -Route119_WeatherInstitute_1F_EventScript_26FB18:: @ 826FB18 +Route119_WeatherInstitute_1F_EventScript_Bed:: @ 826FB18 lockall - msgbox Route119_WeatherInstitute_1F_Text_26FEFC, MSGBOX_DEFAULT + msgbox Route119_WeatherInstitute_1F_Text_TakeRestInBed, MSGBOX_DEFAULT closemessage call Common_EventScript_OutOfCenterPartyHeal releaseall end -Route119_WeatherInstitute_1F_EventScript_26FB29:: @ 826FB29 - trainerbattle_single TRAINER_GRUNT_11, Route119_WeatherInstitute_1F_Text_26FB57, Route119_WeatherInstitute_1F_Text_26FBBB - msgbox Route119_WeatherInstitute_1F_Text_26FBD7, MSGBOX_AUTOCLOSE +Route119_WeatherInstitute_1F_EventScript_Grunt11:: @ 826FB29 + trainerbattle_single TRAINER_GRUNT_11, Route119_WeatherInstitute_1F_Text_Grunt11Intro, Route119_WeatherInstitute_1F_Text_Grunt11Defeat + msgbox Route119_WeatherInstitute_1F_Text_Grunt11PostBattle, MSGBOX_AUTOCLOSE end -Route119_WeatherInstitute_1F_EventScript_26FB40:: @ 826FB40 - trainerbattle_single TRAINER_GRUNT_20, Route119_WeatherInstitute_1F_Text_26FC34, Route119_WeatherInstitute_1F_Text_26FC52 - msgbox Route119_WeatherInstitute_1F_Text_26FC60, MSGBOX_AUTOCLOSE +Route119_WeatherInstitute_1F_EventScript_Grunt20:: @ 826FB40 + trainerbattle_single TRAINER_GRUNT_20, Route119_WeatherInstitute_1F_Text_Grunt20Intro, Route119_WeatherInstitute_1F_Text_Grunt20Defeat + msgbox Route119_WeatherInstitute_1F_Text_Grunt20PostBattle, MSGBOX_AUTOCLOSE end -Route119_WeatherInstitute_1F_Text_26FB57: @ 826FB57 +Route119_WeatherInstitute_1F_Text_Grunt11Intro: @ 826FB57 .string "The BOSS got interested in\n" .string "the research they have going here,\l" .string "so he sent us out.\p" .string "You quit meddling!$" -Route119_WeatherInstitute_1F_Text_26FBBB: @ 826FBBB +Route119_WeatherInstitute_1F_Text_Grunt11Defeat: @ 826FBBB .string "Blast it…\n" .string "Blasted by a kid…$" -Route119_WeatherInstitute_1F_Text_26FBD7: @ 826FBD7 +Route119_WeatherInstitute_1F_Text_Grunt11PostBattle: @ 826FBD7 .string "Our BOSS knows everything.\p" .string "But I'm just a GRUNT. What would I know\n" .string "about what he's thinking?$" -Route119_WeatherInstitute_1F_Text_26FC34: @ 826FC34 +Route119_WeatherInstitute_1F_Text_Grunt20Intro: @ 826FC34 .string "Huh?\n" .string "What's a kid doing here?$" -Route119_WeatherInstitute_1F_Text_26FC52: @ 826FC52 +Route119_WeatherInstitute_1F_Text_Grunt20Defeat: @ 826FC52 .string "Huh?\n" .string "I lost?!$" -Route119_WeatherInstitute_1F_Text_26FC60: @ 826FC60 +Route119_WeatherInstitute_1F_Text_Grunt20PostBattle: @ 826FC60 .string "Oh, no…\n" .string "I'll catch an earful for losing to a kid…\p" .string "I should just take a nap in the bed…$" -Route119_WeatherInstitute_1F_Text_26FCB7: @ 826FCB7 +Route119_WeatherInstitute_1F_Text_EveryoneWentUpstairs: @ 826FCB7 .string "While I was sleeping, everyone went\n" .string "upstairs!$" -Route119_WeatherInstitute_1F_Text_26FCE5: @ 826FCE5 +Route119_WeatherInstitute_1F_Text_WowYoureStrong: @ 826FCE5 .string "Wow, you're really strong!\p" .string "I wish I could be a POKéMON TRAINER\n" .string "like you!$" -Route119_WeatherInstitute_1F_Text_26FD2E: @ 826FD2E +Route119_WeatherInstitute_1F_Text_ProfStudyingRain: @ 826FD2E .string "The PROFESSOR loves rain.\n" .string "That's a fact.\p" .string "But if it keeps raining, people will be in\n" @@ -116,7 +116,7 @@ Route119_WeatherInstitute_1F_Text_26FD2E: @ 826FD2E .string "And thus, the PROFESSOR is studying\n" .string "if the rain can be put to good use.$" -Route119_WeatherInstitute_1F_Text_26FDE8: @ 826FDE8 +Route119_WeatherInstitute_1F_Text_NoticingUnusualWeather: @ 826FDE8 .string "On the 2nd floor of the INSTITUTE,\n" .string "we study the weather patterns over\l" .string "the HOENN region.\p" @@ -124,13 +124,13 @@ Route119_WeatherInstitute_1F_Text_26FDE8: @ 826FDE8 .string "isolated cases of droughts and\l" .string "heavy rain lately…$" -Route119_WeatherInstitute_1F_Text_26FE94: @ 826FE94 +Route119_WeatherInstitute_1F_Text_WhatWereAquasUpTo: @ 826FE94 .string "Hello!\n" .string "We've been saved by your actions!\p" .string "What I don't understand is what on\n" .string "earth the AQUAS were up to.$" -Route119_WeatherInstitute_1F_Text_26FEFC: @ 826FEFC +Route119_WeatherInstitute_1F_Text_TakeRestInBed: @ 826FEFC .string "There's a bed…\n" .string "Let's take a rest.$" diff --git a/data/maps/Route119_WeatherInstitute_2F/map.json b/data/maps/Route119_WeatherInstitute_2F/map.json index 4b4534a8e..5b0301878 100644 --- a/data/maps/Route119_WeatherInstitute_2F/map.json +++ b/data/maps/Route119_WeatherInstitute_2F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route119_WeatherInstitute_2F_EventScript_26FF7F", + "script": "Route119_WeatherInstitute_2F_EventScript_Grunt12", "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route119_WeatherInstitute_2F_EventScript_26FF96", + "script": "Route119_WeatherInstitute_2F_EventScript_Grunt13", "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "0", - "script": "Route119_WeatherInstitute_2F_EventScript_26FFAD", + "script": "Route119_WeatherInstitute_2F_EventScript_Shelly", "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route119_WeatherInstitute_2F_EventScript_27018B", + "script": "Route119_WeatherInstitute_2F_EventScript_WeatherScientist", "flag": "0" }, { @@ -115,7 +115,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route119_WeatherInstitute_2F_EventScript_26FF68", + "script": "Route119_WeatherInstitute_2F_EventScript_Grunt37", "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" } ], diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index 1e415dd41..6c70a880e 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -4,62 +4,62 @@ Route119_WeatherInstitute_2F_MapScripts:: @ 826FF1E Route119_WeatherInstitute_2F_OnTransition: @ 826FF24 compare VAR_WEATHER_INSTITUTE_STATE, 0 - call_if_eq Route119_WeatherInstitute_2F_EventScript_26FF44 + call_if_eq Route119_WeatherInstitute_2F_EventScript_SetScientistPosAquaHere compare VAR_WEATHER_INSTITUTE_STATE, 1 - call_if_eq Route119_WeatherInstitute_2F_EventScript_26FF50 - call_if_set FLAG_SYS_GAME_CLEAR, Route119_WeatherInstitute_2F_EventScript_26FF5C + call_if_eq Route119_WeatherInstitute_2F_EventScript_SetScientistPosAquaGone + call_if_set FLAG_SYS_GAME_CLEAR, Route119_WeatherInstitute_2F_EventScript_SetScientistPosGameClear end -Route119_WeatherInstitute_2F_EventScript_26FF44:: @ 826FF44 +Route119_WeatherInstitute_2F_EventScript_SetScientistPosAquaHere:: @ 826FF44 setobjectxyperm 5, 1, 6 setobjectmovementtype 5, MOVEMENT_TYPE_FACE_RIGHT return -Route119_WeatherInstitute_2F_EventScript_26FF50:: @ 826FF50 +Route119_WeatherInstitute_2F_EventScript_SetScientistPosAquaGone:: @ 826FF50 setobjectxyperm 5, 4, 6 setobjectmovementtype 5, MOVEMENT_TYPE_FACE_RIGHT return -Route119_WeatherInstitute_2F_EventScript_26FF5C:: @ 826FF5C +Route119_WeatherInstitute_2F_EventScript_SetScientistPosGameClear:: @ 826FF5C setobjectxyperm 5, 2, 2 setobjectmovementtype 5, MOVEMENT_TYPE_FACE_UP return -Route119_WeatherInstitute_2F_EventScript_26FF68:: @ 826FF68 - trainerbattle_single TRAINER_GRUNT_37, Route119_WeatherInstitute_2F_Text_270335, Route119_WeatherInstitute_2F_Text_27039F - msgbox Route119_WeatherInstitute_2F_Text_2703C0, MSGBOX_AUTOCLOSE +Route119_WeatherInstitute_2F_EventScript_Grunt37:: @ 826FF68 + trainerbattle_single TRAINER_GRUNT_37, Route119_WeatherInstitute_2F_Text_Grunt37Intro, Route119_WeatherInstitute_2F_Text_Grunt37Defeat + msgbox Route119_WeatherInstitute_2F_Text_Grunt37PostBattle, MSGBOX_AUTOCLOSE end -Route119_WeatherInstitute_2F_EventScript_26FF7F:: @ 826FF7F - trainerbattle_single TRAINER_GRUNT_12, Route119_WeatherInstitute_2F_Text_27019C, Route119_WeatherInstitute_2F_Text_270208 - msgbox Route119_WeatherInstitute_2F_Text_27022B, MSGBOX_AUTOCLOSE +Route119_WeatherInstitute_2F_EventScript_Grunt12:: @ 826FF7F + trainerbattle_single TRAINER_GRUNT_12, Route119_WeatherInstitute_2F_Text_Grunt12Intro, Route119_WeatherInstitute_2F_Text_Grunt12Defeat + msgbox Route119_WeatherInstitute_2F_Text_Grunt12PostBattle, MSGBOX_AUTOCLOSE end -Route119_WeatherInstitute_2F_EventScript_26FF96:: @ 826FF96 - trainerbattle_single TRAINER_GRUNT_13, Route119_WeatherInstitute_2F_Text_270292, Route119_WeatherInstitute_2F_Text_2702CE - msgbox Route119_WeatherInstitute_2F_Text_2702DA, MSGBOX_AUTOCLOSE +Route119_WeatherInstitute_2F_EventScript_Grunt13:: @ 826FF96 + trainerbattle_single TRAINER_GRUNT_13, Route119_WeatherInstitute_2F_Text_Grunt13Intro, Route119_WeatherInstitute_2F_Text_Grunt13Defeat + msgbox Route119_WeatherInstitute_2F_Text_Grunt13PostBattle, MSGBOX_AUTOCLOSE end -Route119_WeatherInstitute_2F_EventScript_26FFAD:: @ 826FFAD - trainerbattle_single TRAINER_SHELLY_1, Route119_WeatherInstitute_2F_Text_270409, Route119_WeatherInstitute_2F_Text_2704BD, Route119_WeatherInstitute_2F_EventScript_26FFC8 - msgbox Route119_WeatherInstitute_2F_Text_2704E4, MSGBOX_AUTOCLOSE +Route119_WeatherInstitute_2F_EventScript_Shelly:: @ 826FFAD + trainerbattle_single TRAINER_SHELLY_1, Route119_WeatherInstitute_2F_Text_ShellyIntro, Route119_WeatherInstitute_2F_Text_ShellyDefeat, Route119_WeatherInstitute_2F_EventScript_ShellyDefeated + msgbox Route119_WeatherInstitute_2F_Text_ShellyPostBattle, MSGBOX_AUTOCLOSE end -Route119_WeatherInstitute_2F_EventScript_26FFC8:: @ 826FFC8 - msgbox Route119_WeatherInstitute_2F_Text_2704E4, MSGBOX_DEFAULT +Route119_WeatherInstitute_2F_EventScript_ShellyDefeated:: @ 826FFC8 + msgbox Route119_WeatherInstitute_2F_Text_ShellyPostBattle, MSGBOX_DEFAULT closemessage - addobject 7 - applymovement 7, Route119_WeatherInstitute_2F_Movement_270170 - applymovement EVENT_OBJ_ID_PLAYER, Route119_WeatherInstitute_2F_Movement_27017C + addobject 7 @ Aqua grunt + applymovement 7, Route119_WeatherInstitute_2F_Movement_GruntApproachShelly + applymovement EVENT_OBJ_ID_PLAYER, Route119_WeatherInstitute_2F_Movement_ShovePlayerOutOfWay waitmovement 0 - msgbox Route119_WeatherInstitute_2F_Text_270568, MSGBOX_DEFAULT + msgbox Route119_WeatherInstitute_2F_Text_TeamMagmaJustPassedBy, MSGBOX_DEFAULT closemessage playse SE_PIN applymovement 3, Common_Movement_ExclamationMark waitmovement 0 applymovement 3, Common_Movement_Delay48 waitmovement 0 - msgbox Route119_WeatherInstitute_2F_Text_2705DD, MSGBOX_DEFAULT + msgbox Route119_WeatherInstitute_2F_Text_WeHaveToHurryToMtPyre, MSGBOX_DEFAULT closemessage setvar VAR_WEATHER_INSTITUTE_STATE, 1 clearflag FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS @@ -72,106 +72,104 @@ Route119_WeatherInstitute_2F_EventScript_26FFC8:: @ 826FFC8 removeobject 3 removeobject 8 removeobject 7 - applymovement EVENT_OBJ_ID_PLAYER, Route119_WeatherInstitute_2F_Movement_270184 + applymovement EVENT_OBJ_ID_PLAYER, Route119_WeatherInstitute_2F_Movement_PlayerReturnToPosition waitmovement 0 fadescreen 0 - applymovement 5, Route119_WeatherInstitute_2F_Movement_270187 + applymovement 5, Route119_WeatherInstitute_2F_Movement_ScientistApproachPlayer waitmovement 0 copyobjectxytoperm 5 - goto Route119_WeatherInstitute_2F_EventScript_27004D + goto Route119_WeatherInstitute_2F_EventScript_ReceiveCastform end -Route119_WeatherInstitute_2F_EventScript_27004D:: @ 827004D - msgbox Route119_WeatherInstitute_2F_Text_270650, MSGBOX_DEFAULT +Route119_WeatherInstitute_2F_EventScript_ReceiveCastform:: @ 827004D + msgbox Route119_WeatherInstitute_2F_Text_ThanksPleaseTakePokemon, MSGBOX_DEFAULT setvar VAR_TEMP_1, SPECIES_CASTFORM givemon SPECIES_CASTFORM, 25, ITEM_MYSTIC_WATER compare VAR_RESULT, 0 - goto_if_eq Route119_WeatherInstitute_2F_EventScript_270085 + goto_if_eq Route119_WeatherInstitute_2F_EventScript_ReceiveCastformParty compare VAR_RESULT, 1 - goto_if_eq Route119_WeatherInstitute_2F_EventScript_2700AD + goto_if_eq Route119_WeatherInstitute_2F_EventScript_ReceiveCastformPC goto Common_EventScript_NoMoreRoomForPokemon end -Route119_WeatherInstitute_2F_EventScript_270085:: @ 8270085 - call Route119_WeatherInstitute_2F_EventScript_2700DB +Route119_WeatherInstitute_2F_EventScript_ReceiveCastformParty:: @ 8270085 + call Route119_WeatherInstitute_2F_EventScript_ReceivedCastformFanfare msgbox gText_NicknameThisPokemon, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq Route119_WeatherInstitute_2F_EventScript_2700EA + goto_if_eq Route119_WeatherInstitute_2F_EventScript_ExplainCastform call Common_EventScript_GetGiftMonPartySlot call Common_EventScript_NameReceivedPartyMon - goto Route119_WeatherInstitute_2F_EventScript_2700EA + goto Route119_WeatherInstitute_2F_EventScript_ExplainCastform end -Route119_WeatherInstitute_2F_EventScript_2700AD:: @ 82700AD - call Route119_WeatherInstitute_2F_EventScript_2700DB +Route119_WeatherInstitute_2F_EventScript_ReceiveCastformPC:: @ 82700AD + call Route119_WeatherInstitute_2F_EventScript_ReceivedCastformFanfare msgbox gText_NicknameThisPokemon, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq Route119_WeatherInstitute_2F_EventScript_2700D0 + goto_if_eq Route119_WeatherInstitute_2F_EventScript_SendCastformToPC call Common_EventScript_NameReceivedBoxMon - goto Route119_WeatherInstitute_2F_EventScript_2700D0 + goto Route119_WeatherInstitute_2F_EventScript_SendCastformToPC end -Route119_WeatherInstitute_2F_EventScript_2700D0:: @ 82700D0 +Route119_WeatherInstitute_2F_EventScript_SendCastformToPC:: @ 82700D0 call Common_EventScript_TransferredToPC - goto Route119_WeatherInstitute_2F_EventScript_2700EA + goto Route119_WeatherInstitute_2F_EventScript_ExplainCastform end -Route119_WeatherInstitute_2F_EventScript_2700DB:: @ 82700DB +Route119_WeatherInstitute_2F_EventScript_ReceivedCastformFanfare:: @ 82700DB playfanfare MUS_FANFA4 - message Route119_WeatherInstitute_2F_Text_2706E8 + message Route119_WeatherInstitute_2F_Text_PlayerReceivedCastform waitmessage waitfanfare bufferspeciesname 0, SPECIES_CASTFORM return -Route119_WeatherInstitute_2F_EventScript_2700EA:: @ 82700EA - msgbox Route119_WeatherInstitute_2F_Text_2706FE, MSGBOX_DEFAULT +Route119_WeatherInstitute_2F_EventScript_ExplainCastform:: @ 82700EA + msgbox Route119_WeatherInstitute_2F_Text_PokemonChangesWithWeather, MSGBOX_DEFAULT setflag FLAG_RECEIVED_CASTFORM release end -Route119_WeatherInstitute_2F_EventScript_2700F7:: @ 82700F7 +Route119_WeatherInstitute_2F_EventScript_ScientistMentionWeather:: @ 82700F7 goto_if_set FLAG_SYS_GAME_CLEAR, Route119_WeatherInstitute_2F_EventScript_TryStartUnusualWeather - msgbox Route119_WeatherInstitute_2F_Text_27077E, MSGBOX_DEFAULT + msgbox Route119_WeatherInstitute_2F_Text_ChangingWeatherRidiculous, MSGBOX_DEFAULT release end Route119_WeatherInstitute_2F_EventScript_TryStartUnusualWeather:: @ 827010A - @ This code uses VAR_0x8004 to count the number of legendaries the player has defeated - @ already. setvar VAR_0x8004, 0 - call_if_set FLAG_DEFEATED_KYOGRE, WeatherInstitute_UnusualWeather_EventScript_IncrementLegendCount - call_if_set FLAG_DEFEATED_GROUDON, WeatherInstitute_UnusualWeather_EventScript_IncrementLegendCount - compare VAR_0x8004, 2 - goto_if_eq WeatherInstitute_UnusualWeather_EventScript_ShowLegendariesAlreadyDefeated - call_if_unset FLAG_TEMP_2, WeatherInstitute_UnusualWeather_EventScript_DoCreateUnusualWeather + call_if_set FLAG_DEFEATED_KYOGRE, Route119_WeatherInstitute_2F_EventScript_LegendaryDefeated + call_if_set FLAG_DEFEATED_GROUDON, Route119_WeatherInstitute_2F_EventScript_LegendaryDefeated + compare VAR_0x8004, 2 @ Both defeated + goto_if_eq Route119_WeatherInstitute_2F_EventScript_NoAbnormalWeather + call_if_unset FLAG_TEMP_2, Route119_WeatherInstitute_2F_EventScript_CreateUnusualWeather specialvar VAR_RESULT, GetUnusualWeatherMapNameAndType compare VAR_RESULT, 1 - goto_if_eq WeatherInstitute_UnusualWeather_EventScript_ShowKyogreWeatherMessage - msgbox WeatherInstitute_UnusualWeather_GroudonWeatherText, MSGBOX_DEFAULT + goto_if_eq Route119_WeatherInstitute_2F_EventScript_KyogreWeather + msgbox Route119_WeatherInstitute_2F_Text_GroudonWeather, MSGBOX_DEFAULT release end -WeatherInstitute_UnusualWeather_EventScript_ShowKyogreWeatherMessage:: @ 827014F - msgbox WeatherInstitute_UnusualWeather_KyogreWeatherText, MSGBOX_DEFAULT +Route119_WeatherInstitute_2F_EventScript_KyogreWeather:: @ 827014F + msgbox Route119_WeatherInstitute_2F_Text_KyogreWeather, MSGBOX_DEFAULT release end -WeatherInstitute_UnusualWeather_EventScript_DoCreateUnusualWeather:: @ 8270159 +Route119_WeatherInstitute_2F_EventScript_CreateUnusualWeather:: @ 8270159 special CreateUnusualWeatherEvent setflag FLAG_TEMP_2 return -WeatherInstitute_UnusualWeather_EventScript_IncrementLegendCount:: @ 8270160 +Route119_WeatherInstitute_2F_EventScript_LegendaryDefeated:: @ 8270160 addvar VAR_0x8004, 1 return -WeatherInstitute_UnusualWeather_EventScript_ShowLegendariesAlreadyDefeated:: @ 8270166 - msgbox WeatherInstitute_UnusualWeather_EventScript_ShowLegendariesAlreadyDefeatedText, MSGBOX_DEFAULT +Route119_WeatherInstitute_2F_EventScript_NoAbnormalWeather:: @ 8270166 + msgbox Route119_WeatherInstitute_2F_Text_NoAbnormalWeather, MSGBOX_DEFAULT release end -Route119_WeatherInstitute_2F_Movement_270170: @ 8270170 +Route119_WeatherInstitute_2F_Movement_GruntApproachShelly: @ 8270170 walk_fast_left walk_fast_left walk_fast_left @@ -185,7 +183,7 @@ Route119_WeatherInstitute_2F_Movement_270170: @ 8270170 walk_fast_left step_end -Route119_WeatherInstitute_2F_Movement_27017C: @ 827017C +Route119_WeatherInstitute_2F_Movement_ShovePlayerOutOfWay: @ 827017C delay_16 delay_16 delay_16 @@ -195,66 +193,66 @@ Route119_WeatherInstitute_2F_Movement_27017C: @ 827017C walk_in_place_fastest_down step_end -Route119_WeatherInstitute_2F_Movement_270184: @ 8270184 +Route119_WeatherInstitute_2F_Movement_PlayerReturnToPosition: @ 8270184 slide_down walk_in_place_fastest_left step_end -Route119_WeatherInstitute_2F_Movement_270187: @ 8270187 +Route119_WeatherInstitute_2F_Movement_ScientistApproachPlayer: @ 8270187 walk_right walk_right walk_right step_end -Route119_WeatherInstitute_2F_EventScript_27018B:: @ 827018B +Route119_WeatherInstitute_2F_EventScript_WeatherScientist:: @ 827018B lock faceplayer - goto_if_set FLAG_RECEIVED_CASTFORM, Route119_WeatherInstitute_2F_EventScript_2700F7 - goto Route119_WeatherInstitute_2F_EventScript_27004D + goto_if_set FLAG_RECEIVED_CASTFORM, Route119_WeatherInstitute_2F_EventScript_ScientistMentionWeather + goto Route119_WeatherInstitute_2F_EventScript_ReceiveCastform end -Route119_WeatherInstitute_2F_Text_27019C: @ 827019C +Route119_WeatherInstitute_2F_Text_Grunt12Intro: @ 827019C .string "The INSTITUTE created a type of\n" .string "POKéMON that has something to do with\l" .string "the weather. We're here to take them!$" -Route119_WeatherInstitute_2F_Text_270208: @ 8270208 +Route119_WeatherInstitute_2F_Text_Grunt12Defeat: @ 8270208 .string "Our plan's being spoiled by a kid?$" -Route119_WeatherInstitute_2F_Text_27022B: @ 827022B +Route119_WeatherInstitute_2F_Text_Grunt12PostBattle: @ 827022B .string "If the POKéMON they made here can\n" .string "control the weather freely, then we of\l" .string "TEAM AQUA definitely need it!$" -Route119_WeatherInstitute_2F_Text_270292: @ 8270292 +Route119_WeatherInstitute_2F_Text_Grunt13Intro: @ 8270292 .string "We're TEAM AQUA!\n" .string "We appear wherever anything rare is\l" .string "found!$" -Route119_WeatherInstitute_2F_Text_2702CE: @ 82702CE +Route119_WeatherInstitute_2F_Text_Grunt13Defeat: @ 82702CE .string "You got me!$" -Route119_WeatherInstitute_2F_Text_2702DA: @ 82702DA +Route119_WeatherInstitute_2F_Text_Grunt13PostBattle: @ 82702DA .string "You don't have any idea what we of\n" .string "TEAM AQUA are working towards!\l" .string "You stay out of our way!$" -Route119_WeatherInstitute_2F_Text_270335: @ 8270335 +Route119_WeatherInstitute_2F_Text_Grunt37Intro: @ 8270335 .string "Don't tell me you're looking for that\n" .string "weather POKéMON, too?\p" .string "That's a no-no!\n" .string "We were here to get it first!$" -Route119_WeatherInstitute_2F_Text_27039F: @ 827039F +Route119_WeatherInstitute_2F_Text_Grunt37Defeat: @ 827039F .string "Oh, will you look at my POKéMON?$" -Route119_WeatherInstitute_2F_Text_2703C0: @ 82703C0 +Route119_WeatherInstitute_2F_Text_Grunt37PostBattle: @ 82703C0 .string "Humph, so what?\n" .string "What we want…\p" .string "What we really want isn't here…\n" .string "Ihihihihi…$" -Route119_WeatherInstitute_2F_Text_270409: @ 8270409 +Route119_WeatherInstitute_2F_Text_ShellyIntro: @ 8270409 .string "Ahahahaha!\p" .string "You're going to meddle in TEAM AQUA's\n" .string "affairs?\p" @@ -263,55 +261,56 @@ Route119_WeatherInstitute_2F_Text_270409: @ 8270409 .string "You're so cute, you're disgusting!\n" .string "I'll put you down, kiddy!$" -Route119_WeatherInstitute_2F_Text_2704BD: @ 82704BD +Route119_WeatherInstitute_2F_Text_ShellyDefeat: @ 82704BD .string "Ahahahaha!\n" .string "You're disgustingly strong!$" -Route119_WeatherInstitute_2F_Text_2704E4: @ 82704E4 +Route119_WeatherInstitute_2F_Text_ShellyPostBattle: @ 82704E4 .string "It's bad enough to have TEAM MAGMA\n" .string "blunder about, but now there's you!\p" .string "What makes you want to sniff around\n" .string "in our business, anyway?$" -Route119_WeatherInstitute_2F_Text_270568: @ 8270568 +Route119_WeatherInstitute_2F_Text_TeamMagmaJustPassedBy: @ 8270568 .string "We have a situation here!\p" .string "A TEAM MAGMA mob just passed\n" .string "the WEATHER INSTITUTE.\p" .string "They appear to be headed for\n" .string "MT. PYRE!$" -Route119_WeatherInstitute_2F_Text_2705DD: @ 82705DD +Route119_WeatherInstitute_2F_Text_WeHaveToHurryToMtPyre: @ 82705DD .string "What?!\p" .string "We can't waste any more time here!\n" .string "We have to hurry to MT. PYRE, too!\p" .string "Ahahahaha!\n" .string "TEAM MAGMA, just you wait!$" -Route119_WeatherInstitute_2F_Text_270650: @ 8270650 +Route119_WeatherInstitute_2F_Text_ThanksPleaseTakePokemon: @ 8270650 .string "Thanks!\n" .string "Thanks to you, we're safe!\p" .string "It might be an odd way of thanking you,\n" .string "but take this POKéMON.$" -Route119_WeatherInstitute_2F_Text_2706B2: @ 82706B2 +@ Unused +Route119_WeatherInstitute_2F_Text_NoRoomForPokemon: @ 82706B2 .string "Hm? You don't seem to have any room\n" .string "for this POKéMON.$" -Route119_WeatherInstitute_2F_Text_2706E8: @ 82706E8 +Route119_WeatherInstitute_2F_Text_PlayerReceivedCastform: @ 82706E8 .string "{PLAYER} received CASTFORM!$" -Route119_WeatherInstitute_2F_Text_2706FE: @ 82706FE +Route119_WeatherInstitute_2F_Text_PokemonChangesWithWeather: @ 82706FE .string "That POKéMON changes shape according\n" .string "to the weather conditions.\p" .string "There're plenty of them in the\n" .string "INSTITUTE--go ahead and take it.$" -Route119_WeatherInstitute_2F_Text_27077E: @ 827077E +Route119_WeatherInstitute_2F_Text_ChangingWeatherRidiculous: @ 827077E .string "I've been researching rain for many\n" .string "years, but it's ridiculous to think that\l" .string "humans can freely change the weather.$" -WeatherInstitute_UnusualWeather_GroudonWeatherText: @ 82707F1 +Route119_WeatherInstitute_2F_Text_GroudonWeather: @ 82707F1 .string "I track weather patterns over\n" .string "the HOENN region.\p" .string "Presently, a drought has been recorded\n" @@ -319,7 +318,7 @@ WeatherInstitute_UnusualWeather_GroudonWeatherText: @ 82707F1 .string "Could that mean, somewhere near\n" .string "{STR_VAR_1}…$" -WeatherInstitute_UnusualWeather_KyogreWeatherText: @ 8270873 +Route119_WeatherInstitute_2F_Text_KyogreWeather: @ 8270873 .string "I track weather patterns over\n" .string "the HOENN region.\p" .string "Presently, heavy rainfall has been\n" @@ -327,7 +326,7 @@ WeatherInstitute_UnusualWeather_KyogreWeatherText: @ 8270873 .string "Could that mean, somewhere near\n" .string "{STR_VAR_1}…$" -WeatherInstitute_UnusualWeather_EventScript_ShowLegendariesAlreadyDefeatedText: @ 82708FC +Route119_WeatherInstitute_2F_Text_NoAbnormalWeather: @ 82708FC .string "Abnormal weather conditions are\n" .string "no longer being reported.\p" .string "The occasional rainfall is a blessing,\n" diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/map.json b/data/maps/SlateportCity_OceanicMuseum_1F/map.json index eefb843f4..87fc0f6ee 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/map.json +++ b/data/maps/SlateportCity_OceanicMuseum_1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AD96", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_EntranceAttendant", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE5F", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt3", "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE68", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt4", "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE56", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt2", "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS" }, { @@ -76,7 +76,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE4D", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt1", "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS" }, { @@ -89,7 +89,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE71", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt5", "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS" }, { @@ -102,7 +102,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AD96", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_EntranceAttendant", "flag": "0" }, { @@ -115,7 +115,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE7A", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt6", "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS" }, { @@ -128,7 +128,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AED4", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_MuseumPatron1", "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" }, { @@ -141,7 +141,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEDD", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_MuseumPatron2", "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" }, { @@ -154,7 +154,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEE6", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_MuseumPatron3", "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" }, { @@ -167,7 +167,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEEF", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_MuseumPatron4", "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" }, { @@ -180,7 +180,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEF8", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGrunt", "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_FAMILIAR_AQUA_GRUNT" }, { @@ -193,7 +193,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_28C883", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_Reporter", "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" } ], @@ -228,7 +228,7 @@ "elevation": 3, "var": "VAR_SLATEPORT_MUSEUM_1F_STATE", "var_value": "0", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AD9F" + "script": "SlateportCity_OceanicMuseum_1F_EventScript_PayEntranceFeeLeft" }, { "type": "trigger", @@ -237,7 +237,7 @@ "elevation": 3, "var": "VAR_SLATEPORT_MUSEUM_1F_STATE", "var_value": "0", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_20ADB0" + "script": "SlateportCity_OceanicMuseum_1F_EventScript_PayEntranceFeeRight" } ], "bg_events": [ @@ -247,7 +247,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE83" + "script": "SlateportCity_OceanicMuseum_1F_EventScript_WhirlpoolExperiment" }, { "type": "sign", @@ -255,7 +255,7 @@ "y": 4, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE8C" + "script": "SlateportCity_OceanicMuseum_1F_EventScript_WaterfallExperiment" }, { "type": "sign", @@ -263,7 +263,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE95" + "script": "SlateportCity_OceanicMuseum_1F_EventScript_OceanSoilDisplay" }, { "type": "sign", @@ -271,7 +271,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE9E" + "script": "SlateportCity_OceanicMuseum_1F_EventScript_BeachSandDisplay" }, { "type": "sign", @@ -279,7 +279,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE95" + "script": "SlateportCity_OceanicMuseum_1F_EventScript_OceanSoilDisplay" }, { "type": "sign", @@ -287,7 +287,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE9E" + "script": "SlateportCity_OceanicMuseum_1F_EventScript_BeachSandDisplay" }, { "type": "sign", @@ -295,7 +295,7 @@ "y": 4, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEA7" + "script": "SlateportCity_OceanicMuseum_1F_EventScript_OceanicMinifact1" }, { "type": "sign", @@ -303,7 +303,7 @@ "y": 4, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEB0" + "script": "SlateportCity_OceanicMuseum_1F_EventScript_OceanicMinifact2" }, { "type": "sign", @@ -311,7 +311,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEB9" + "script": "SlateportCity_OceanicMuseum_1F_EventScript_OceanicMinifact3" }, { "type": "sign", @@ -319,7 +319,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEC2" + "script": "SlateportCity_OceanicMuseum_1F_EventScript_FossilDisplay" }, { "type": "sign", @@ -327,7 +327,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEC2" + "script": "SlateportCity_OceanicMuseum_1F_EventScript_FossilDisplay" }, { "type": "sign", @@ -335,7 +335,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AECB" + "script": "SlateportCity_OceanicMuseum_1F_EventScript_DepthMeasuringMachine" }, { "type": "sign", @@ -343,7 +343,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AECB" + "script": "SlateportCity_OceanicMuseum_1F_EventScript_DepthMeasuringMachine" } ] }
\ No newline at end of file diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc index f0a4305c1..1028deb3d 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc @@ -1,46 +1,46 @@ SlateportCity_OceanicMuseum_1F_MapScripts:: @ 820AD95 .byte 0 -SlateportCity_OceanicMuseum_1F_EventScript_20AD96:: @ 820AD96 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B026, MSGBOX_NPC +SlateportCity_OceanicMuseum_1F_EventScript_EntranceAttendant:: @ 820AD96 + msgbox SlateportCity_OceanicMuseum_1F_Text_PleaseEnjoyYourself, MSGBOX_NPC end -SlateportCity_OceanicMuseum_1F_EventScript_20AD9F:: @ 820AD9F +SlateportCity_OceanicMuseum_1F_EventScript_PayEntranceFeeLeft:: @ 820AD9F lockall applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - goto SlateportCity_OceanicMuseum_1F_EventScript_20ADC1 + goto SlateportCity_OceanicMuseum_1F_EventScript_PayEntranceFee end -SlateportCity_OceanicMuseum_1F_EventScript_20ADB0:: @ 820ADB0 +SlateportCity_OceanicMuseum_1F_EventScript_PayEntranceFeeRight:: @ 820ADB0 lockall applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - goto SlateportCity_OceanicMuseum_1F_EventScript_20ADC1 + goto SlateportCity_OceanicMuseum_1F_EventScript_PayEntranceFee end -SlateportCity_OceanicMuseum_1F_EventScript_20ADC1:: @ 820ADC1 +SlateportCity_OceanicMuseum_1F_EventScript_PayEntranceFee:: @ 820ADC1 showmoneybox 0, 0, 0 - msgbox SlateportCity_OceanicMuseum_1F_Text_20AFD5, MSGBOX_YESNO + msgbox SlateportCity_OceanicMuseum_1F_Text_WouldYouLikeToEnter, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_20ADE8 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_CheckMoneyForFee closemessage hidemoneybox nop nop - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_20AE4B + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_PushPlayerBackFromCounter waitmovement 0 releaseall end -SlateportCity_OceanicMuseum_1F_EventScript_20ADE8:: @ 820ADE8 +SlateportCity_OceanicMuseum_1F_EventScript_CheckMoneyForFee:: @ 820ADE8 checkmoney 50, 0 compare VAR_RESULT, 0 - goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_20AE18 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_NotEnoughMoney playse SE_REGI takemoney 50, 0 updatemoneybox 0, 0 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B026, MSGBOX_DEFAULT + msgbox SlateportCity_OceanicMuseum_1F_Text_PleaseEnjoyYourself, MSGBOX_DEFAULT setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 1 hidemoneybox nop @@ -48,20 +48,20 @@ SlateportCity_OceanicMuseum_1F_EventScript_20ADE8:: @ 820ADE8 releaseall end -SlateportCity_OceanicMuseum_1F_EventScript_20AE18:: @ 820AE18 - goto_if_unset FLAG_DELIVERED_DEVON_GOODS, SlateportCity_OceanicMuseum_1F_EventScript_20AE39 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B03D, MSGBOX_DEFAULT +SlateportCity_OceanicMuseum_1F_EventScript_NotEnoughMoney:: @ 820AE18 + goto_if_unset FLAG_DELIVERED_DEVON_GOODS, SlateportCity_OceanicMuseum_1F_EventScript_AllowEntranceAnyway + msgbox SlateportCity_OceanicMuseum_1F_Text_NotEnoughMoney, MSGBOX_DEFAULT closemessage hidemoneybox nop nop - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_20AE4B + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_PushPlayerBackFromCounter waitmovement 0 releaseall end -SlateportCity_OceanicMuseum_1F_EventScript_20AE39:: @ 820AE39 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B075, MSGBOX_DEFAULT +SlateportCity_OceanicMuseum_1F_EventScript_AllowEntranceAnyway:: @ 820AE39 + msgbox SlateportCity_OceanicMuseum_1F_Text_CatchUpWithYourGroup, MSGBOX_DEFAULT setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 1 hidemoneybox nop @@ -69,87 +69,87 @@ SlateportCity_OceanicMuseum_1F_EventScript_20AE39:: @ 820AE39 releaseall end -SlateportCity_OceanicMuseum_1F_Movement_20AE4B: @ 820AE4B +SlateportCity_OceanicMuseum_1F_Movement_PushPlayerBackFromCounter: @ 820AE4B walk_down step_end -SlateportCity_OceanicMuseum_1F_EventScript_20AE4D:: @ 820AE4D - msgbox SlateportCity_OceanicMuseum_1F_Text_20B0E8, MSGBOX_NPC +SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt1:: @ 820AE4D + msgbox SlateportCity_OceanicMuseum_1F_Text_AquaExistForGoodOfAll, MSGBOX_NPC end -SlateportCity_OceanicMuseum_1F_EventScript_20AE56:: @ 820AE56 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B112, MSGBOX_NPC +SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt2:: @ 820AE56 + msgbox SlateportCity_OceanicMuseum_1F_Text_OurBossIsntHere, MSGBOX_NPC end -SlateportCity_OceanicMuseum_1F_EventScript_20AE5F:: @ 820AE5F - msgbox SlateportCity_OceanicMuseum_1F_Text_20B165, MSGBOX_NPC +SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt3:: @ 820AE5F + msgbox SlateportCity_OceanicMuseum_1F_Text_WouldStuffHereMakeMeRich, MSGBOX_NPC end -SlateportCity_OceanicMuseum_1F_EventScript_20AE68:: @ 820AE68 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B19C, MSGBOX_SIGN +SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt4:: @ 820AE68 + msgbox SlateportCity_OceanicMuseum_1F_Text_CanLearnForNefariousDeeds, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_1F_EventScript_20AE71:: @ 820AE71 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B1D4, MSGBOX_NPC +SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt5:: @ 820AE71 + msgbox SlateportCity_OceanicMuseum_1F_Text_RustboroBungled, MSGBOX_NPC end -SlateportCity_OceanicMuseum_1F_EventScript_20AE7A:: @ 820AE7A - msgbox SlateportCity_OceanicMuseum_1F_Text_20B218, MSGBOX_NPC +SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt6:: @ 820AE7A + msgbox SlateportCity_OceanicMuseum_1F_Text_DidntHaveMoney, MSGBOX_NPC end -SlateportCity_OceanicMuseum_1F_EventScript_20AE83:: @ 820AE83 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B4CF, MSGBOX_SIGN +SlateportCity_OceanicMuseum_1F_EventScript_WhirlpoolExperiment:: @ 820AE83 + msgbox SlateportCity_OceanicMuseum_1F_Text_WhirlpoolExperiment, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_1F_EventScript_20AE8C:: @ 820AE8C - msgbox SlateportCity_OceanicMuseum_1F_Text_20B547, MSGBOX_SIGN +SlateportCity_OceanicMuseum_1F_EventScript_WaterfallExperiment:: @ 820AE8C + msgbox SlateportCity_OceanicMuseum_1F_Text_WaterfallExperiment, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_1F_EventScript_20AE95:: @ 820AE95 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B5CA, MSGBOX_SIGN +SlateportCity_OceanicMuseum_1F_EventScript_OceanSoilDisplay:: @ 820AE95 + msgbox SlateportCity_OceanicMuseum_1F_Text_OceanSoilDisplay, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_1F_EventScript_20AE9E:: @ 820AE9E - msgbox SlateportCity_OceanicMuseum_1F_Text_20B699, MSGBOX_SIGN +SlateportCity_OceanicMuseum_1F_EventScript_BeachSandDisplay:: @ 820AE9E + msgbox SlateportCity_OceanicMuseum_1F_Text_BeachSandDisplay, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_1F_EventScript_20AEA7:: @ 820AEA7 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B74B, MSGBOX_SIGN +SlateportCity_OceanicMuseum_1F_EventScript_OceanicMinifact1:: @ 820AEA7 + msgbox SlateportCity_OceanicMuseum_1F_Text_OceanicMinifact1, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_1F_EventScript_20AEB0:: @ 820AEB0 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B81F, MSGBOX_SIGN +SlateportCity_OceanicMuseum_1F_EventScript_OceanicMinifact2:: @ 820AEB0 + msgbox SlateportCity_OceanicMuseum_1F_Text_OceanicMinifact2, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_1F_EventScript_20AEB9:: @ 820AEB9 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B912, MSGBOX_SIGN +SlateportCity_OceanicMuseum_1F_EventScript_OceanicMinifact3:: @ 820AEB9 + msgbox SlateportCity_OceanicMuseum_1F_Text_OceanicMinifact3, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_1F_EventScript_20AEC2:: @ 820AEC2 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B9C0, MSGBOX_SIGN +SlateportCity_OceanicMuseum_1F_EventScript_FossilDisplay:: @ 820AEC2 + msgbox SlateportCity_OceanicMuseum_1F_Text_FossilDisplay, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_1F_EventScript_20AECB:: @ 820AECB - msgbox SlateportCity_OceanicMuseum_1F_Text_20BA9C, MSGBOX_SIGN +SlateportCity_OceanicMuseum_1F_EventScript_DepthMeasuringMachine:: @ 820AECB + msgbox SlateportCity_OceanicMuseum_1F_Text_DepthMeasuringMachine, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_1F_EventScript_20AED4:: @ 820AED4 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B25F, MSGBOX_NPC +SlateportCity_OceanicMuseum_1F_EventScript_MuseumPatron1:: @ 820AED4 + msgbox SlateportCity_OceanicMuseum_1F_Text_LearnAboutSeaForBattling, MSGBOX_NPC end -SlateportCity_OceanicMuseum_1F_EventScript_20AEDD:: @ 820AEDD - msgbox SlateportCity_OceanicMuseum_1F_Text_20B2A2, MSGBOX_NPC +SlateportCity_OceanicMuseum_1F_EventScript_MuseumPatron2:: @ 820AEDD + msgbox SlateportCity_OceanicMuseum_1F_Text_SternIsRoleModel, MSGBOX_NPC end -SlateportCity_OceanicMuseum_1F_EventScript_20AEE6:: @ 820AEE6 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B302, MSGBOX_NPC +SlateportCity_OceanicMuseum_1F_EventScript_MuseumPatron3:: @ 820AEE6 + msgbox SlateportCity_OceanicMuseum_1F_Text_MustBePokemonWeDontKnow, MSGBOX_NPC end -SlateportCity_OceanicMuseum_1F_EventScript_20AEEF:: @ 820AEEF - msgbox SlateportCity_OceanicMuseum_1F_Text_20B369, MSGBOX_NPC +SlateportCity_OceanicMuseum_1F_EventScript_MuseumPatron4:: @ 820AEEF + msgbox SlateportCity_OceanicMuseum_1F_Text_WantSeaPokemon, MSGBOX_NPC end -SlateportCity_OceanicMuseum_1F_EventScript_20AEF8:: @ 820AEF8 +SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGrunt:: @ 820AEF8 lock faceplayer delay 8 @@ -158,68 +158,68 @@ SlateportCity_OceanicMuseum_1F_EventScript_20AEF8:: @ 820AEF8 waitmovement 0 applymovement 13, Common_Movement_Delay48 waitmovement 0 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B3AB, MSGBOX_DEFAULT + msgbox SlateportCity_OceanicMuseum_1F_Text_RememberMeTakeThis, MSGBOX_DEFAULT giveitem_std ITEM_TM46 compare VAR_RESULT, 0 - goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_20AFB5 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_NoRoomForThief setflag FLAG_RECEIVED_TM46 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B449, MSGBOX_DEFAULT + msgbox SlateportCity_OceanicMuseum_1F_Text_HopeINeverSeeYouAgain, MSGBOX_DEFAULT closemessage compare VAR_FACING, DIR_NORTH - goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF6C + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExitNorth compare VAR_FACING, DIR_SOUTH - goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF83 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExitSouth compare VAR_FACING, DIR_WEST - goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF93 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExitWestEast compare VAR_FACING, DIR_EAST - goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF93 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExitWestEast end -SlateportCity_OceanicMuseum_1F_EventScript_20AF6C:: @ 820AF6C - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_20AFBF - applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_20AFCE +SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExitNorth:: @ 820AF6C + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_PlayerWatchGruntExitNorth + applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_FamiliarGruntExitNorth waitmovement 0 - goto SlateportCity_OceanicMuseum_1F_EventScript_20AFAA + goto SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExited end -SlateportCity_OceanicMuseum_1F_EventScript_20AF83:: @ 820AF83 - applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_20AFC7 +SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExitSouth:: @ 820AF83 + applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_FamiliarGruntExit waitmovement 0 - goto SlateportCity_OceanicMuseum_1F_EventScript_20AFAA + goto SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExited end -SlateportCity_OceanicMuseum_1F_EventScript_20AF93:: @ 820AF93 - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_20AFC4 - applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_20AFC7 +SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExitWestEast:: @ 820AF93 + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_PlayerWatchGruntExitWestEast + applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_FamiliarGruntExit waitmovement 0 - goto SlateportCity_OceanicMuseum_1F_EventScript_20AFAA + goto SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExited end -SlateportCity_OceanicMuseum_1F_EventScript_20AFAA:: @ 820AFAA +SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExited:: @ 820AFAA setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_FAMILIAR_AQUA_GRUNT playse SE_KAIDAN removeobject 13 release end -SlateportCity_OceanicMuseum_1F_EventScript_20AFB5:: @ 820AFB5 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B49B, MSGBOX_DEFAULT +SlateportCity_OceanicMuseum_1F_EventScript_NoRoomForThief:: @ 820AFB5 + msgbox SlateportCity_OceanicMuseum_1F_Text_YouHaveToTakeThis, MSGBOX_DEFAULT release end -SlateportCity_OceanicMuseum_1F_Movement_20AFBF: @ 820AFBF +SlateportCity_OceanicMuseum_1F_Movement_PlayerWatchGruntExitNorth: @ 820AFBF delay_16 delay_8 delay_4 walk_in_place_fastest_down step_end -SlateportCity_OceanicMuseum_1F_Movement_20AFC4: @ 820AFC4 +SlateportCity_OceanicMuseum_1F_Movement_PlayerWatchGruntExitWestEast: @ 820AFC4 delay_16 walk_in_place_fastest_down step_end -SlateportCity_OceanicMuseum_1F_Movement_20AFC7: @ 820AFC7 +SlateportCity_OceanicMuseum_1F_Movement_FamiliarGruntExit: @ 820AFC7 face_down walk_fast_down walk_fast_down @@ -228,7 +228,7 @@ SlateportCity_OceanicMuseum_1F_Movement_20AFC7: @ 820AFC7 delay_8 step_end -SlateportCity_OceanicMuseum_1F_Movement_20AFCE: @ 820AFCE +SlateportCity_OceanicMuseum_1F_Movement_FamiliarGruntExitNorth: @ 820AFCE walk_fast_right walk_fast_down walk_fast_down @@ -237,71 +237,71 @@ SlateportCity_OceanicMuseum_1F_Movement_20AFCE: @ 820AFCE delay_8 step_end -SlateportCity_OceanicMuseum_1F_Text_20AFD5: @ 820AFD5 +SlateportCity_OceanicMuseum_1F_Text_WouldYouLikeToEnter: @ 820AFD5 .string "Welcome to the OCEANIC MUSEUM.\p" .string "The entrance fee is ¥50.\n" .string "Would you like to enter?$" -SlateportCity_OceanicMuseum_1F_Text_20B026: @ 820B026 +SlateportCity_OceanicMuseum_1F_Text_PleaseEnjoyYourself: @ 820B026 .string "Please enjoy yourself.$" -SlateportCity_OceanicMuseum_1F_Text_20B03D: @ 820B03D +SlateportCity_OceanicMuseum_1F_Text_NotEnoughMoney: @ 820B03D .string "Oh? I'm sorry, but you don't seem to\n" .string "have enough money.$" -SlateportCity_OceanicMuseum_1F_Text_20B075: @ 820B075 +SlateportCity_OceanicMuseum_1F_Text_CatchUpWithYourGroup: @ 820B075 .string "Oh? You're with that group that\n" .string "went in earlier?\p" .string "You're the only one who's late.\n" .string "You'd better go catch up to them!$" -SlateportCity_OceanicMuseum_1F_Text_20B0E8: @ 820B0E8 +SlateportCity_OceanicMuseum_1F_Text_AquaExistForGoodOfAll: @ 820B0E8 .string "We, TEAM AQUA, exist for the good\n" .string "of all!$" -SlateportCity_OceanicMuseum_1F_Text_20B112: @ 820B112 +SlateportCity_OceanicMuseum_1F_Text_OurBossIsntHere: @ 820B112 .string "We were told to assemble here,\n" .string "so we did, but…\p" .string "Our BOSS, the linchpin, isn't here.$" -SlateportCity_OceanicMuseum_1F_Text_20B165: @ 820B165 +SlateportCity_OceanicMuseum_1F_Text_WouldStuffHereMakeMeRich: @ 820B165 .string "If I ripped off the stuff here,\n" .string "would it make me rich?$" -SlateportCity_OceanicMuseum_1F_Text_20B19C: @ 820B19C +SlateportCity_OceanicMuseum_1F_Text_CanLearnForNefariousDeeds: @ 820B19C .string "What I learn here, I can put to use on\n" .string "nefarious deeds…$" -SlateportCity_OceanicMuseum_1F_Text_20B1D4: @ 820B1D4 +SlateportCity_OceanicMuseum_1F_Text_RustboroBungled: @ 820B1D4 .string "If our goons didn't bungle things\n" .string "in RUSTBORO, we wouldn't be here!$" -SlateportCity_OceanicMuseum_1F_Text_20B218: @ 820B218 +SlateportCity_OceanicMuseum_1F_Text_DidntHaveMoney: @ 820B218 .string "I didn't have ¥50, so it took a long\n" .string "time getting by the receptionist.$" -SlateportCity_OceanicMuseum_1F_Text_20B25F: @ 820B25F +SlateportCity_OceanicMuseum_1F_Text_LearnAboutSeaForBattling: @ 820B25F .string "I want to learn about the sea and\n" .string "use that knowledge for battling.$" -SlateportCity_OceanicMuseum_1F_Text_20B2A2: @ 820B2A2 +SlateportCity_OceanicMuseum_1F_Text_SternIsRoleModel: @ 820B2A2 .string "I get all giddy and gooey when\n" .string "I see the sea!\p" .string "For me, CAPT. STERN is the number\n" .string "one role model!$" -SlateportCity_OceanicMuseum_1F_Text_20B302: @ 820B302 +SlateportCity_OceanicMuseum_1F_Text_MustBePokemonWeDontKnow: @ 820B302 .string "The sea is vast without end, and\n" .string "infinitely deep…\p" .string "There must be many POKéMON that\n" .string "we don't know about.$" -SlateportCity_OceanicMuseum_1F_Text_20B369: @ 820B369 +SlateportCity_OceanicMuseum_1F_Text_WantSeaPokemon: @ 820B369 .string "I want a sea POKéMON.\p" .string "I think it would feel cool and nice\n" .string "to hug.$" -SlateportCity_OceanicMuseum_1F_Text_20B3AB: @ 820B3AB +SlateportCity_OceanicMuseum_1F_Text_RememberMeTakeThis: @ 820B3AB .string "Aiyeeeh!\n" .string "What are you doing here?\p" .string "Me? I'm the TEAM AQUA member\n" @@ -310,29 +310,29 @@ SlateportCity_OceanicMuseum_1F_Text_20B3AB: @ 820B3AB .string "Here, take this!\n" .string "You have to forgive me!$" -SlateportCity_OceanicMuseum_1F_Text_20B449: @ 820B449 +SlateportCity_OceanicMuseum_1F_Text_HopeINeverSeeYouAgain: @ 820B449 .string "That TM, it suits you more than it\n" .string "does me.\p" .string "Hope I never see you again!\n" .string "Wahahaha!$" -SlateportCity_OceanicMuseum_1F_Text_20B49B: @ 820B49B +SlateportCity_OceanicMuseum_1F_Text_YouHaveToTakeThis: @ 820B49B .string "Awww, come on!\n" .string "You have to take this and let me go!$" -SlateportCity_OceanicMuseum_1F_Text_20B4CF: @ 820B4CF +SlateportCity_OceanicMuseum_1F_Text_WhirlpoolExperiment: @ 820B4CF .string "A blue fluid is spiraling inside\n" .string "a glass vessel.\p" .string "“This is an experiment to create a\n" .string "WHIRLPOOL artificially using wind.”$" -SlateportCity_OceanicMuseum_1F_Text_20B547: @ 820B547 +SlateportCity_OceanicMuseum_1F_Text_WaterfallExperiment: @ 820B547 .string "A red ball is bobbing up and down\n" .string "inside a glass vessel.\p" .string "“This is an experiment simulating a\n" .string "WATERFALL using the ball's buoyancy.”$" -SlateportCity_OceanicMuseum_1F_Text_20B5CA: @ 820B5CA +SlateportCity_OceanicMuseum_1F_Text_OceanSoilDisplay: @ 820B5CA .string "It's a sample of soil from the ocean\n" .string "floor.\p" .string "“Over many years, the remains of\n" @@ -341,7 +341,7 @@ SlateportCity_OceanicMuseum_1F_Text_20B5CA: @ 820B5CA .string "“By analyzing these layers, the\n" .string "ancient past is revealed.”$" -SlateportCity_OceanicMuseum_1F_Text_20B699: @ 820B699 +SlateportCity_OceanicMuseum_1F_Text_BeachSandDisplay: @ 820B699 .string "It's a sample of beach sand.\p" .string "“Stones from mountains are washed\n" .string "down by rivers where they are\l" @@ -349,7 +349,7 @@ SlateportCity_OceanicMuseum_1F_Text_20B699: @ 820B699 .string "“They are reduced to grains and end\n" .string "up as sand on beaches.”$" -SlateportCity_OceanicMuseum_1F_Text_20B74B: @ 820B74B +SlateportCity_OceanicMuseum_1F_Text_OceanicMinifact1: @ 820B74B .string "“OCEANIC MINIFACT 1\n" .string "Why is seawater blue?\p" .string "“Light is composed of many colors.\p" @@ -358,7 +358,7 @@ SlateportCity_OceanicMuseum_1F_Text_20B74B: @ 820B74B .string "“However, blue light retains its\n" .string "color, making the sea appear blue.”$" -SlateportCity_OceanicMuseum_1F_Text_20B81F: @ 820B81F +SlateportCity_OceanicMuseum_1F_Text_OceanicMinifact2: @ 820B81F .string "“OCEANIC MINIFACT 2\n" .string "Why is the sea salty?\p" .string "“Seawater contains dissolved salt in\n" @@ -368,7 +368,7 @@ SlateportCity_OceanicMuseum_1F_Text_20B81F: @ 820B81F .string "“The concentration of dissolved salt\n" .string "makes the sea salty.”$" -SlateportCity_OceanicMuseum_1F_Text_20B912: @ 820B912 +SlateportCity_OceanicMuseum_1F_Text_OceanicMinifact3: @ 820B912 .string "“OCEANIC MINIFACT 3\n" .string "Which is bigger? The sea or land?\p" .string "“The sea covers about 70% of\n" @@ -376,7 +376,7 @@ SlateportCity_OceanicMuseum_1F_Text_20B912: @ 820B912 .string "“The sea is therefore more than twice\n" .string "the size of land.”$" -SlateportCity_OceanicMuseum_1F_Text_20B9C0: @ 820B9C0 +SlateportCity_OceanicMuseum_1F_Text_FossilDisplay: @ 820B9C0 .string "It's a fossil with wavy ridges on it.\p" .string "“Soil on the ocean floor gets scoured\n" .string "by the tide.\p" @@ -385,7 +385,7 @@ SlateportCity_OceanicMuseum_1F_Text_20B9C0: @ 820B9C0 .string "“If this soil becomes fossilized, it is\n" .string "called a ripple mark.”$" -SlateportCity_OceanicMuseum_1F_Text_20BA9C: @ 820BA9C +SlateportCity_OceanicMuseum_1F_Text_DepthMeasuringMachine: @ 820BA9C .string "A strange machine is rotating under\n" .string "a glass dome.\p" .string "Maybe it's for measuring the depth\n" diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/map.json b/data/maps/SlateportCity_OceanicMuseum_2F/map.json index 6eaecba97..0c45541e4 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/map.json +++ b/data/maps/SlateportCity_OceanicMuseum_2F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BB00", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_CaptStern", "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_CAPTAIN_STERN" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD64", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_MuseumPatron1", "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" }, { @@ -89,7 +89,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD6D", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_MuseumPatron2", "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" }, { @@ -102,7 +102,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD76", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_MuseumPatron3", "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" } ], @@ -123,7 +123,7 @@ "y": 4, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD0A" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_WaterQualitySample1" }, { "type": "sign", @@ -131,7 +131,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD13" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_WaterQualitySample2" }, { "type": "sign", @@ -139,7 +139,7 @@ "y": 3, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD52" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_SubmersibleReplica" }, { "type": "sign", @@ -147,7 +147,7 @@ "y": 4, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD52" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_SubmersibleReplica" }, { "type": "sign", @@ -155,7 +155,7 @@ "y": 3, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD49" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_SubmarineReplica" }, { "type": "sign", @@ -163,7 +163,7 @@ "y": 3, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD49" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_SubmarineReplica" }, { "type": "sign", @@ -171,7 +171,7 @@ "y": 4, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD49" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_SubmarineReplica" }, { "type": "sign", @@ -179,7 +179,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD40" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_SSTidalReplica" }, { "type": "sign", @@ -187,7 +187,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD40" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_SSTidalReplica" }, { "type": "sign", @@ -195,7 +195,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD5B" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_SSAnneReplica" }, { "type": "sign", @@ -203,7 +203,7 @@ "y": 7, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD5B" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_SSAnneReplica" }, { "type": "sign", @@ -211,7 +211,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD37" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_SurfaceSeawaterDisplay" }, { "type": "sign", @@ -219,7 +219,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD37" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_SurfaceSeawaterDisplay" }, { "type": "sign", @@ -227,7 +227,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD2E" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_DeepSeawaterDisplay" }, { "type": "sign", @@ -235,7 +235,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD2E" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_DeepSeawaterDisplay" }, { "type": "sign", @@ -243,7 +243,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD25" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_HoennModel" }, { "type": "sign", @@ -251,7 +251,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD25" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_HoennModel" }, { "type": "sign", @@ -259,7 +259,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD1C" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_PressureExperiment" }, { "type": "sign", @@ -267,7 +267,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD1C" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_PressureExperiment" }, { "type": "sign", @@ -275,7 +275,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD40" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_SSTidalReplica" }, { "type": "sign", @@ -283,7 +283,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD40" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_SSTidalReplica" } ] }
\ No newline at end of file diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc index ab47c1dea..e3d91cd28 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc @@ -1,63 +1,63 @@ SlateportCity_OceanicMuseum_2F_MapScripts:: @ 820BAFF .byte 0 -SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00 +SlateportCity_OceanicMuseum_2F_EventScript_CaptStern:: @ 820BB00 lock faceplayer - msgbox SlateportCity_OceanicMuseum_2F_Text_20BD8D, MSGBOX_DEFAULT + msgbox SlateportCity_OceanicMuseum_2F_Text_ThankYouForTheParts, MSGBOX_DEFAULT closemessage playbgm MUS_AQA_0, 1 addobject 3 - applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_20BCE4 + applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_FirstGruntEnter waitmovement 0 addobject 4 - applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCF3 + applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_SecondGruntEnter waitmovement 0 - applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_20BCE8 - applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCF5 + applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_FirstGruntApproach + applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_SecondGruntApproach waitmovement 0 compare VAR_FACING, DIR_SOUTH - call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_20BC92 + call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_PlayerFaceGrunts compare VAR_FACING, DIR_EAST - call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_20BC92 - msgbox SlateportCity_OceanicMuseum_2F_Text_20BE40, MSGBOX_DEFAULT + call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_PlayerFaceGrunts + msgbox SlateportCity_OceanicMuseum_2F_Text_WellTakeThoseParts, MSGBOX_DEFAULT compare VAR_FACING, DIR_EAST - call_if_ne SlateportCity_OceanicMuseum_2F_EventScript_20BC9D - msgbox SlateportCity_OceanicMuseum_2F_Text_20BE69, MSGBOX_DEFAULT - msgbox SlateportCity_OceanicMuseum_2F_Text_20BE93, MSGBOX_DEFAULT + call_if_ne SlateportCity_OceanicMuseum_2F_EventScript_SternFaceGrunts + msgbox SlateportCity_OceanicMuseum_2F_Text_SternWhoAreYou, MSGBOX_DEFAULT + msgbox SlateportCity_OceanicMuseum_2F_Text_WereTeamAqua, MSGBOX_DEFAULT closemessage - applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCE2 + applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_GruntApproachToBattle waitmovement 0 compare VAR_FACING, DIR_SOUTH - call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_20BCA8 + call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_PlayerApproachGruntSouth compare VAR_FACING, DIR_WEST - call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_20BCB3 - trainerbattle_no_intro TRAINER_GRUNT_14, SlateportCity_OceanicMuseum_2F_Text_20BEE2 - msgbox SlateportCity_OceanicMuseum_2F_Text_20BEFA, MSGBOX_DEFAULT + call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_PlayerApproachGruntWest + trainerbattle_no_intro TRAINER_GRUNT_14, SlateportCity_OceanicMuseum_2F_Text_Grunt14Defeat + msgbox SlateportCity_OceanicMuseum_2F_Text_BossGoingToBeFurious, MSGBOX_DEFAULT closemessage - applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCEF + applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_GruntDefeated waitmovement 0 - applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_20BCE2 + applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_GruntApproachToBattle waitmovement 0 - msgbox SlateportCity_OceanicMuseum_2F_Text_20BF35, MSGBOX_DEFAULT - trainerbattle_no_intro TRAINER_GRUNT_15, SlateportCity_OceanicMuseum_2F_Text_20BF66 - applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_20BCEF + msgbox SlateportCity_OceanicMuseum_2F_Text_LetMeTakeCareOfThis, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_GRUNT_15, SlateportCity_OceanicMuseum_2F_Text_Grunt15Defeat + applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_GruntDefeated waitmovement 0 applymovement 3, Common_Movement_WalkInPlaceFastestDown applymovement 4, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - msgbox SlateportCity_OceanicMuseum_2F_Text_20BF7A, MSGBOX_DEFAULT + msgbox SlateportCity_OceanicMuseum_2F_Text_MeddlingKid, MSGBOX_DEFAULT closemessage delay 35 addobject 2 - applymovement 2, SlateportCity_OceanicMuseum_2F_Movement_20BCD8 - applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCFE + applymovement 2, SlateportCity_OceanicMuseum_2F_Movement_ArchieEnter + applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_GruntMoveForArchie waitmovement 0 - msgbox SlateportCity_OceanicMuseum_2F_Text_20BFF2, MSGBOX_DEFAULT + msgbox SlateportCity_OceanicMuseum_2F_Text_CameToSeeWhatsTakingSoLong, MSGBOX_DEFAULT closemessage - applymovement 2, SlateportCity_OceanicMuseum_2F_Movement_20BCD6 + applymovement 2, SlateportCity_OceanicMuseum_2F_Movement_ArchieApproachPlayer waitmovement 0 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C059, MSGBOX_DEFAULT + msgbox SlateportCity_OceanicMuseum_2F_Text_ArchieWarning, MSGBOX_DEFAULT closemessage savebgm MUS_DUMMY fadedefaultbgm @@ -70,10 +70,10 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00 setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C2BE, MSGBOX_DEFAULT + msgbox SlateportCity_OceanicMuseum_2F_Text_SternThankYouForSavingUs, MSGBOX_DEFAULT setvar VAR_0x8004, ITEM_DEVON_GOODS call Common_EventScript_PlayerHandedOverTheItem - msgbox SlateportCity_OceanicMuseum_2F_Text_20C36C, MSGBOX_DEFAULT + msgbox SlateportCity_OceanicMuseum_2F_Text_SternIveGotToGo, MSGBOX_DEFAULT closemessage fadescreen 1 playfanfare MUS_ME_ASA @@ -82,7 +82,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00 removeobject 1 setflag FLAG_HIDE_ROUTE_110_TEAM_AQUA compare VAR_REGISTER_BIRCH_STATE, 0 - call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_20BC8C + call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_ReadyRegisterBirch setflag FLAG_DELIVERED_DEVON_GOODS clearflag FLAG_HIDE_ROUTE_116_DEVON_EMPLOYEE setflag FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE @@ -91,37 +91,37 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00 release end -SlateportCity_OceanicMuseum_2F_EventScript_20BC8C:: @ 820BC8C +SlateportCity_OceanicMuseum_2F_EventScript_ReadyRegisterBirch:: @ 820BC8C setvar VAR_REGISTER_BIRCH_STATE, 1 return -SlateportCity_OceanicMuseum_2F_EventScript_20BC92:: @ 820BC92 +SlateportCity_OceanicMuseum_2F_EventScript_PlayerFaceGrunts:: @ 820BC92 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return -SlateportCity_OceanicMuseum_2F_EventScript_20BC9D:: @ 820BC9D +SlateportCity_OceanicMuseum_2F_EventScript_SternFaceGrunts:: @ 820BC9D applymovement 1, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return -SlateportCity_OceanicMuseum_2F_EventScript_20BCA8:: @ 820BCA8 - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_2F_Movement_20BCBE +SlateportCity_OceanicMuseum_2F_EventScript_PlayerApproachGruntSouth:: @ 820BCA8 + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_2F_Movement_PlayerApproachGruntSouth waitmovement 0 return -SlateportCity_OceanicMuseum_2F_EventScript_20BCB3:: @ 820BCB3 - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_2F_Movement_20BCC2 +SlateportCity_OceanicMuseum_2F_EventScript_PlayerApproachGruntWest:: @ 820BCB3 + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_2F_Movement_PlayerApproachGruntWest waitmovement 0 return -SlateportCity_OceanicMuseum_2F_Movement_20BCBE: @ 820BCBE +SlateportCity_OceanicMuseum_2F_Movement_PlayerApproachGruntSouth: @ 820BCBE walk_left walk_down walk_in_place_fastest_left step_end -SlateportCity_OceanicMuseum_2F_Movement_20BCC2: @ 820BCC2 +SlateportCity_OceanicMuseum_2F_Movement_PlayerApproachGruntWest: @ 820BCC2 walk_up walk_left walk_left @@ -129,6 +129,7 @@ SlateportCity_OceanicMuseum_2F_Movement_20BCC2: @ 820BCC2 walk_in_place_fastest_left step_end +@ Unused SlateportCity_OceanicMuseum_2F_Movement_20BCC8: @ 820BCC8 walk_up walk_left @@ -145,11 +146,11 @@ SlateportCity_OceanicMuseum_2F_Movement_20BCC8: @ 820BCC8 delay_8 step_end -SlateportCity_OceanicMuseum_2F_Movement_20BCD6: @ 820BCD6 +SlateportCity_OceanicMuseum_2F_Movement_ArchieApproachPlayer: @ 820BCD6 walk_right step_end -SlateportCity_OceanicMuseum_2F_Movement_20BCD8: @ 820BCD8 +SlateportCity_OceanicMuseum_2F_Movement_ArchieEnter: @ 820BCD8 walk_down walk_down walk_down @@ -161,17 +162,17 @@ SlateportCity_OceanicMuseum_2F_Movement_20BCD8: @ 820BCD8 walk_right step_end -SlateportCity_OceanicMuseum_2F_Movement_20BCE2: @ 820BCE2 +SlateportCity_OceanicMuseum_2F_Movement_GruntApproachToBattle: @ 820BCE2 walk_right step_end -SlateportCity_OceanicMuseum_2F_Movement_20BCE4: @ 820BCE4 +SlateportCity_OceanicMuseum_2F_Movement_FirstGruntEnter: @ 820BCE4 walk_down walk_right walk_in_place_fastest_down step_end -SlateportCity_OceanicMuseum_2F_Movement_20BCE8: @ 820BCE8 +SlateportCity_OceanicMuseum_2F_Movement_FirstGruntApproach: @ 820BCE8 walk_down walk_down walk_down @@ -180,17 +181,17 @@ SlateportCity_OceanicMuseum_2F_Movement_20BCE8: @ 820BCE8 walk_right step_end -SlateportCity_OceanicMuseum_2F_Movement_20BCEF: @ 820BCEF +SlateportCity_OceanicMuseum_2F_Movement_GruntDefeated: @ 820BCEF lock_facing_direction walk_left unlock_facing_direction step_end -SlateportCity_OceanicMuseum_2F_Movement_20BCF3: @ 820BCF3 +SlateportCity_OceanicMuseum_2F_Movement_SecondGruntEnter: @ 820BCF3 walk_down step_end -SlateportCity_OceanicMuseum_2F_Movement_20BCF5: @ 820BCF5 +SlateportCity_OceanicMuseum_2F_Movement_SecondGruntApproach: @ 820BCF5 walk_down walk_down walk_down @@ -201,7 +202,7 @@ SlateportCity_OceanicMuseum_2F_Movement_20BCF5: @ 820BCF5 walk_right step_end -SlateportCity_OceanicMuseum_2F_Movement_20BCFE: @ 820BCFE +SlateportCity_OceanicMuseum_2F_Movement_GruntMoveForArchie: @ 820BCFE delay_16 delay_16 delay_16 @@ -215,65 +216,65 @@ SlateportCity_OceanicMuseum_2F_Movement_20BCFE: @ 820BCFE walk_in_place_fastest_up step_end -SlateportCity_OceanicMuseum_2F_EventScript_20BD0A:: @ 820BD0A - msgbox SlateportCity_OceanicMuseum_2F_Text_20C4F9, MSGBOX_SIGN +SlateportCity_OceanicMuseum_2F_EventScript_WaterQualitySample1:: @ 820BD0A + msgbox SlateportCity_OceanicMuseum_2F_Text_WaterQualitySample1, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_2F_EventScript_20BD13:: @ 820BD13 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C566, MSGBOX_SIGN +SlateportCity_OceanicMuseum_2F_EventScript_WaterQualitySample2:: @ 820BD13 + msgbox SlateportCity_OceanicMuseum_2F_Text_WaterQualitySample2, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_2F_EventScript_20BD1C:: @ 820BD1C - msgbox SlateportCity_OceanicMuseum_2F_Text_20C5C6, MSGBOX_SIGN +SlateportCity_OceanicMuseum_2F_EventScript_PressureExperiment:: @ 820BD1C + msgbox SlateportCity_OceanicMuseum_2F_Text_PressureExperiment, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_2F_EventScript_20BD25:: @ 820BD25 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C6C7, MSGBOX_SIGN +SlateportCity_OceanicMuseum_2F_EventScript_HoennModel:: @ 820BD25 + msgbox SlateportCity_OceanicMuseum_2F_Text_HoennModel, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_2F_EventScript_20BD2E:: @ 820BD2E - msgbox SlateportCity_OceanicMuseum_2F_Text_20C72F, MSGBOX_SIGN +SlateportCity_OceanicMuseum_2F_EventScript_DeepSeawaterDisplay:: @ 820BD2E + msgbox SlateportCity_OceanicMuseum_2F_Text_DeepSeawaterDisplay, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_2F_EventScript_20BD37:: @ 820BD37 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C7C1, MSGBOX_SIGN +SlateportCity_OceanicMuseum_2F_EventScript_SurfaceSeawaterDisplay:: @ 820BD37 + msgbox SlateportCity_OceanicMuseum_2F_Text_SurfaceSeawaterDisplay, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_2F_EventScript_20BD40:: @ 820BD40 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C82F, MSGBOX_SIGN +SlateportCity_OceanicMuseum_2F_EventScript_SSTidalReplica:: @ 820BD40 + msgbox SlateportCity_OceanicMuseum_2F_Text_SSTidalReplica, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_2F_EventScript_20BD49:: @ 820BD49 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C88B, MSGBOX_SIGN +SlateportCity_OceanicMuseum_2F_EventScript_SubmarineReplica:: @ 820BD49 + msgbox SlateportCity_OceanicMuseum_2F_Text_SubmarineReplica, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_2F_EventScript_20BD52:: @ 820BD52 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C8E8, MSGBOX_SIGN +SlateportCity_OceanicMuseum_2F_EventScript_SubmersibleReplica:: @ 820BD52 + msgbox SlateportCity_OceanicMuseum_2F_Text_SumbersibleReplica, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_2F_EventScript_20BD5B:: @ 820BD5B - msgbox SlateportCity_OceanicMuseum_2F_Text_20C93A, MSGBOX_SIGN +SlateportCity_OceanicMuseum_2F_EventScript_SSAnneReplica:: @ 820BD5B + msgbox SlateportCity_OceanicMuseum_2F_Text_SSAnneReplica, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_2F_EventScript_20BD64:: @ 820BD64 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C43F, MSGBOX_NPC +SlateportCity_OceanicMuseum_2F_EventScript_MuseumPatron1:: @ 820BD64 + msgbox SlateportCity_OceanicMuseum_2F_Text_RemindsMeOfAbandonedShip, MSGBOX_NPC end -SlateportCity_OceanicMuseum_2F_EventScript_20BD6D:: @ 820BD6D - msgbox SlateportCity_OceanicMuseum_2F_Text_20C495, MSGBOX_NPC +SlateportCity_OceanicMuseum_2F_EventScript_MuseumPatron2:: @ 820BD6D + msgbox SlateportCity_OceanicMuseum_2F_Text_DontRunInMuseum, MSGBOX_NPC end -SlateportCity_OceanicMuseum_2F_EventScript_20BD76:: @ 820BD76 +SlateportCity_OceanicMuseum_2F_EventScript_MuseumPatron3:: @ 820BD76 lock faceplayer - msgbox SlateportCity_OceanicMuseum_2F_Text_20C4C2, MSGBOX_DEFAULT + msgbox SlateportCity_OceanicMuseum_2F_Text_WantToRideSubmarine, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end -SlateportCity_OceanicMuseum_2F_Text_20BD8D: @ 820BD8D +SlateportCity_OceanicMuseum_2F_Text_ThankYouForTheParts: @ 820BD8D .string "Yes? If you're looking for STERN,\n" .string "that would be me.\p" .string "Ah! Those must be the parts I ordered\n" @@ -281,47 +282,47 @@ SlateportCity_OceanicMuseum_2F_Text_20BD8D: @ 820BD8D .string "Thank you! That's great!\n" .string "We can prepare for our expedition now.$" -SlateportCity_OceanicMuseum_2F_Text_20BE40: @ 820BE40 +SlateportCity_OceanicMuseum_2F_Text_WellTakeThoseParts: @ 820BE40 .string "Hehehe, hold it!\n" .string "We'll take those parts!$" -SlateportCity_OceanicMuseum_2F_Text_20BE69: @ 820BE69 +SlateportCity_OceanicMuseum_2F_Text_SternWhoAreYou: @ 820BE69 .string "CAPT. STERN: Wh-what?\n" .string "Who are you people?$" -SlateportCity_OceanicMuseum_2F_Text_20BE93: @ 820BE93 +SlateportCity_OceanicMuseum_2F_Text_WereTeamAqua: @ 820BE93 .string "We're TEAM AQUA!\p" .string "Our BOSS wants those parts!\n" .string "Shut your yap and fork them over!$" -SlateportCity_OceanicMuseum_2F_Text_20BEE2: @ 820BEE2 +SlateportCity_OceanicMuseum_2F_Text_Grunt14Defeat: @ 820BEE2 .string "Awaaaah!\n" .string "A kid beat me!$" -SlateportCity_OceanicMuseum_2F_Text_20BEFA: @ 820BEFA +SlateportCity_OceanicMuseum_2F_Text_BossGoingToBeFurious: @ 820BEFA .string "Oh, man, what a disaster…\n" .string "The BOSS is going to be furious…$" -SlateportCity_OceanicMuseum_2F_Text_20BF35: @ 820BF35 +SlateportCity_OceanicMuseum_2F_Text_LetMeTakeCareOfThis: @ 820BF35 .string "Humph, sniveling wimp!\n" .string "Let me take care of this!$" -SlateportCity_OceanicMuseum_2F_Text_20BF66: @ 820BF66 +SlateportCity_OceanicMuseum_2F_Text_Grunt15Defeat: @ 820BF66 .string "What?!\n" .string "I lost, too!$" -SlateportCity_OceanicMuseum_2F_Text_20BF7A: @ 820BF7A +SlateportCity_OceanicMuseum_2F_Text_MeddlingKid: @ 820BF7A .string "Now what? If we don't get the parts,\n" .string "we're in for it!\p" .string "Arrgh, I didn't count on being meddled\n" .string "with by some meddling kid!$" -SlateportCity_OceanicMuseum_2F_Text_20BFF2: @ 820BFF2 +SlateportCity_OceanicMuseum_2F_Text_CameToSeeWhatsTakingSoLong: @ 820BFF2 .string "I came to see what was taking so\n" .string "long to snatch some parts, and you\l" .string "simps are held up by a mere child?$" -SlateportCity_OceanicMuseum_2F_Text_20C059: @ 820C059 +SlateportCity_OceanicMuseum_2F_Text_ArchieWarning: @ 820C059 .string "We are TEAM AQUA,\n" .string "and we love the sea!\p" .string "And I am TEAM AQUA's leader,\n" @@ -348,7 +349,7 @@ SlateportCity_OceanicMuseum_2F_Text_20C059: @ 820C059 .string "dearly!\p" .string "And don't you forget it!$" -SlateportCity_OceanicMuseum_2F_Text_20C2BE: @ 820C2BE +SlateportCity_OceanicMuseum_2F_Text_SternThankYouForSavingUs: @ 820C2BE .string "CAPT. STERN: You're…\n" .string "Ah, okay, you're {PLAYER}{KUN}…\p" .string "Anyway, that was a tense situation!\n" @@ -356,7 +357,7 @@ SlateportCity_OceanicMuseum_2F_Text_20C2BE: @ 820C2BE .string "Oh, yes, I almost forgot that you\n" .string "even brought the parts from DEVON!$" -SlateportCity_OceanicMuseum_2F_Text_20C36C: @ 820C36C +SlateportCity_OceanicMuseum_2F_Text_SternIveGotToGo: @ 820C36C .string "CAPT. STERN: Whoops!\n" .string "There's no time to lose!\p" .string "We have to set out on our ocean-floor\n" @@ -366,32 +367,32 @@ SlateportCity_OceanicMuseum_2F_Text_20C36C: @ 820C36C .string "Feel free to wander around and check\n" .string "out our facilities, though.$" -SlateportCity_OceanicMuseum_2F_Text_20C43F: @ 820C43F +SlateportCity_OceanicMuseum_2F_Text_RemindsMeOfAbandonedShip: @ 820C43F .string "I saw a model of a ship here.\p" .string "It reminded me of the ABANDONED SHIP\n" .string "near DEWFORD TOWN…$" -SlateportCity_OceanicMuseum_2F_Text_20C495: @ 820C495 +SlateportCity_OceanicMuseum_2F_Text_DontRunInMuseum: @ 820C495 .string "Don't you dare run around inside\n" .string "the MUSEUM!$" -SlateportCity_OceanicMuseum_2F_Text_20C4C2: @ 820C4C2 +SlateportCity_OceanicMuseum_2F_Text_WantToRideSubmarine: @ 820C4C2 .string "Wow, the submarine's awesome!\n" .string "I want to go for a ride!$" -SlateportCity_OceanicMuseum_2F_Text_20C4F9: @ 820C4F9 +SlateportCity_OceanicMuseum_2F_Text_WaterQualitySample1: @ 820C4F9 .string "“WATER QUALITY SAMPLE 1,” the\n" .string "label says.\p" .string "The sea is all connected, but the\n" .string "water seems to differ by region.$" -SlateportCity_OceanicMuseum_2F_Text_20C566: @ 820C566 +SlateportCity_OceanicMuseum_2F_Text_WaterQualitySample2: @ 820C566 .string "“WATER QUALITY SAMPLE 2,” the\n" .string "label says.\p" .string "Does the saltiness of seawater differ\n" .string "by region, too?$" -SlateportCity_OceanicMuseum_2F_Text_20C5C6: @ 820C5C6 +SlateportCity_OceanicMuseum_2F_Text_PressureExperiment: @ 820C5C6 .string "A rubber ball is expanding and\n" .string "shrinking.\p" .string "“In the sea, the weight of water itself\n" @@ -402,39 +403,39 @@ SlateportCity_OceanicMuseum_2F_Text_20C5C6: @ 820C5C6 .string "the pressure can reach even tens of\l" .string "thousands of tons on a small area.”$" -SlateportCity_OceanicMuseum_2F_Text_20C6C7: @ 820C6C7 +SlateportCity_OceanicMuseum_2F_Text_HoennModel: @ 820C6C7 .string "“MODEL OF HOENN REGION”\p" .string "It's a miniature diorama of the\n" .string "HOENN region.\p" .string "Where is LITTLEROOT TOWN on this?$" -SlateportCity_OceanicMuseum_2F_Text_20C72F: @ 820C72F +SlateportCity_OceanicMuseum_2F_Text_DeepSeawaterDisplay: @ 820C72F .string "It's a display on the flow of seawater.\p" .string "“Near the bottom of the sea, water\n" .string "flows due to differences in such\l" .string "factors as temperature and salinity.”$" -SlateportCity_OceanicMuseum_2F_Text_20C7C1: @ 820C7C1 +SlateportCity_OceanicMuseum_2F_Text_SurfaceSeawaterDisplay: @ 820C7C1 .string "It's a display on the flow of seawater.\p" .string "“Toward the surface, seawater flows\n" .string "as currents driven by the winds.”$" -SlateportCity_OceanicMuseum_2F_Text_20C82F: @ 820C82F +SlateportCity_OceanicMuseum_2F_Text_SSTidalReplica: @ 820C82F .string "“THE FERRY S.S. TIDAL\p" .string "“A scale replica of the ship under\n" .string "construction at STERN'S SHIPYARD.”$" -SlateportCity_OceanicMuseum_2F_Text_20C88B: @ 820C88B +SlateportCity_OceanicMuseum_2F_Text_SubmarineReplica: @ 820C88B .string "“SUBMARINE EXPLORER 1\p" .string "“A replica of the high-performance\n" .string "ocean floor exploration submarine.”$" -SlateportCity_OceanicMuseum_2F_Text_20C8E8: @ 820C8E8 +SlateportCity_OceanicMuseum_2F_Text_SumbersibleReplica: @ 820C8E8 .string "“SUBMERSIBLE POD\p" .string "“A replica of a compact, unmanned\n" .string "pod for seafloor exploration.”$" -SlateportCity_OceanicMuseum_2F_Text_20C93A: @ 820C93A +SlateportCity_OceanicMuseum_2F_Text_SSAnneReplica: @ 820C93A .string "“S.S. ANNE\p" .string "“A replica of the luxury liner that\n" .string "circles the globe.”$" diff --git a/data/scripts/interview.inc b/data/scripts/interview.inc index 2ad8b305e..8512ca105 100644 --- a/data/scripts/interview.inc +++ b/data/scripts/interview.inc @@ -50,7 +50,7 @@ SlateportCity_PokemonFanClub_EventScript_28C879:: @ 828C879 release end -SlateportCity_OceanicMuseum_1F_EventScript_28C883:: @ 828C883 +SlateportCity_OceanicMuseum_1F_EventScript_Reporter:: @ 828C883 lock faceplayer setvar VAR_0x8005, 2 diff --git a/data/text/match_call.inc b/data/text/match_call.inc index 376f36750..a695b1b80 100644 --- a/data/text/match_call.inc +++ b/data/text/match_call.inc @@ -2306,7 +2306,7 @@ gText_Wallace_Pokenav_2B3790:: @ 82B3790 .string "But what is a rare stone exactly?\n" .string "All I can think of is a METEORITE…$" -MossdeepCity_SpaceCenter_2F_Text_2B38C1: @ 82B38C1 +MossdeepCity_SpaceCenter_2F_Text_MayRayquazaCall: @ 82B38C1 .string "… … … … … …\n" .string "… … … … … Beep!\p" .string "MAY: Hi, {PLAYER}{KUN}!\p" @@ -2321,7 +2321,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B38C1: @ 82B38C1 .string "… … … … … …\n" .string "… … … … … Click!$" -MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6 +MossdeepCity_SpaceCenter_2F_Text_BrendanRayquazaCall: @ 82B39C6 .string "… … … … … …\n" .string "… … … … … Beep!\p" .string "BRENDAN: Hey, {PLAYER}!\n" diff --git a/include/constants/flags.h b/include/constants/flags.h index 7f2b2964d..0e85e2570 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -777,7 +777,7 @@ #define FLAG_HIDE_PLAYERS_HOUSE_DAD 0x2DE #define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_SIBLING 0x2DF #define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_SIBLING 0x2E0 -#define FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_INVISIBLE_NINJA_BOY 0x2E1 +#define FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_MAGMA_NOTE 0x2E1 #define FLAG_HIDE_ROUTE_104_MR_BRINEY 0x2E2 #define FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY 0x2E3 #define FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN 0x2E4 diff --git a/include/constants/vars.h b/include/constants/vars.h index cfafccd9b..64ff6622b 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -172,8 +172,8 @@ #define VAR_UNUSED_0x409B 0x409B // Unused Var #define VAR_ELITE_4_STATE 0x409C #define VAR_UNUSED_0x409D 0x409D // Unused Var -#define VAR_MOSSDEEP_SPACE_CENTER_STATE_1 0x409E -#define VAR_MOSSDEEP_SPACE_CENTER_STATE_2 0x409F +#define VAR_MOSSDEEP_SPACE_CENTER_STAIR_GUARD_STATE 0x409E +#define VAR_MOSSDEEP_SPACE_CENTER_STATE 0x409F #define VAR_SLATEPORT_HARBOR_STATE 0x40A0 #define VAR_UNUSED_0x40A1 0x40A1 // Unused var #define VAR_SEAFLOOR_CAVERN_STATE 0x40A2 diff --git a/include/event_scripts.h b/include/event_scripts.h index b0630ecd4..b86c46df0 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -556,7 +556,7 @@ extern const u8 MauvilleCity_EventScript_1DF7BA[]; extern const u8 Route119_EventScript_1F49EC[]; extern const u8 LittlerootTown_ProfessorBirchsLab_EventScript_1FA4D6[]; extern const u8 RustboroCity_Gym_EventScript_RegisterRoxanne[]; -extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_224175[]; +extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_RivalRayquazaCall[]; extern const u8 SSTidalCorridor_EventScript_23C050[]; extern const u8 EventScript_FallDownHoleMtPyre[]; diff --git a/src/battle_tower.c b/src/battle_tower.c index 8efee42f7..7b9842c48 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -31,8 +31,8 @@ #include "constants/species.h" #include "constants/easy_chat.h" -extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_224157[]; -extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_224166[]; +extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_MaxieTrainer[]; +extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_TabithaTrainer[]; // EWRAM vars. EWRAM_DATA const struct BattleFrontierTrainer *gFacilityTrainers = NULL; @@ -2349,9 +2349,9 @@ void DoSpecialTrainerBattle(void) gBattleTypeFlags = BATTLE_TYPE_TRAINER | BATTLE_TYPE_DOUBLE | BATTLE_TYPE_TWO_OPPONENTS | BATTLE_TYPE_MULTI | BATTLE_TYPE_INGAME_PARTNER; FillPartnerParty(TRAINER_STEVEN_PARTNER); gApproachingTrainerId = 0; - BattleSetup_ConfigureTrainerBattle(MossdeepCity_SpaceCenter_2F_EventScript_224157 + 1); + BattleSetup_ConfigureTrainerBattle(MossdeepCity_SpaceCenter_2F_EventScript_MaxieTrainer + 1); gApproachingTrainerId = 1; - BattleSetup_ConfigureTrainerBattle(MossdeepCity_SpaceCenter_2F_EventScript_224166 + 1); + BattleSetup_ConfigureTrainerBattle(MossdeepCity_SpaceCenter_2F_EventScript_TabithaTrainer + 1); gPartnerTrainerId = TRAINER_STEVEN_PARTNER; CreateTask(Task_StartBattleAfterTransition, 1); PlayMapChosenOrBattleBGM(0); diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index e868a7b99..bbd2ebda9 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -588,7 +588,7 @@ static bool8 TryStartStepCountScript(u16 metatileBehavior) } if (ShouldDoRivalRayquazaCall() == TRUE) { - ScriptContext1_SetupScript(MossdeepCity_SpaceCenter_2F_EventScript_224175); + ScriptContext1_SetupScript(MossdeepCity_SpaceCenter_2F_EventScript_RivalRayquazaCall); return TRUE; } } |