From 1d421f2f71275a6ded7622d863c20fa591851fc3 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 4 Nov 2019 18:18:09 -0500 Subject: [PATCH 01/40] Document Devon Corp scripts --- data/maps/RustboroCity_DevonCorp_1F/map.json | 10 +- .../RustboroCity_DevonCorp_1F/scripts.inc | 84 +++--- data/maps/RustboroCity_DevonCorp_2F/map.json | 12 +- .../RustboroCity_DevonCorp_2F/scripts.inc | 248 +++++++++--------- data/maps/RustboroCity_DevonCorp_3F/map.json | 10 +- .../RustboroCity_DevonCorp_3F/scripts.inc | 123 ++++----- 6 files changed, 245 insertions(+), 242 deletions(-) diff --git a/data/maps/RustboroCity_DevonCorp_1F/map.json b/data/maps/RustboroCity_DevonCorp_1F/map.json index 7eee74211..9223872b9 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/map.json +++ b/data/maps/RustboroCity_DevonCorp_1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_DevonCorp_1F_EventScript_211261", + "script": "RustboroCity_DevonCorp_1F_EventScript_Employee", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_DevonCorp_1F_EventScript_211293", + "script": "RustboroCity_DevonCorp_1F_EventScript_StairGuard", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_DevonCorp_1F_EventScript_2112CE", + "script": "RustboroCity_DevonCorp_1F_EventScript_Greeter", "flag": "0" } ], @@ -85,7 +85,7 @@ "y": 2, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "RustboroCity_DevonCorp_1F_EventScript_211312" + "script": "RustboroCity_DevonCorp_1F_EventScript_ProductsDisplay" }, { "type": "sign", @@ -93,7 +93,7 @@ "y": 2, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "RustboroCity_DevonCorp_1F_EventScript_211309" + "script": "RustboroCity_DevonCorp_1F_EventScript_RocksMetalDisplay" } ] } \ No newline at end of file diff --git a/data/maps/RustboroCity_DevonCorp_1F/scripts.inc b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc index 788a403f2..3ee7e7dc8 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc @@ -3,121 +3,121 @@ RustboroCity_DevonCorp_1F_MapScripts:: @ 8211245 .byte 0 RustboroCity_DevonCorp_1F_OnTransition: @ 821124B - call_if_unset FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_211255 + call_if_unset FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_BlockStairs end -RustboroCity_DevonCorp_1F_EventScript_211255:: @ 8211255 +RustboroCity_DevonCorp_1F_EventScript_BlockStairs:: @ 8211255 setobjectxyperm 2, 14, 2 setobjectmovementtype 2, MOVEMENT_TYPE_FACE_DOWN return -RustboroCity_DevonCorp_1F_EventScript_211261:: @ 8211261 +RustboroCity_DevonCorp_1F_EventScript_Employee:: @ 8211261 lock faceplayer - goto_if_set FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_211289 - goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_DevonCorp_1F_EventScript_21127F - msgbox RustboroCity_DevonCorp_1F_Text_2113D1, MSGBOX_DEFAULT + goto_if_set FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_GoodsRecovered + goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_DevonCorp_1F_EventScript_RobberWasntBright + msgbox RustboroCity_DevonCorp_1F_Text_ThoseShoesAreOurProduct, MSGBOX_DEFAULT release end -RustboroCity_DevonCorp_1F_EventScript_21127F:: @ 821127F - msgbox RustboroCity_DevonCorp_1F_Text_211446, MSGBOX_DEFAULT +RustboroCity_DevonCorp_1F_EventScript_RobberWasntBright:: @ 821127F + msgbox RustboroCity_DevonCorp_1F_Text_RobberWasntVeryBright, MSGBOX_DEFAULT release end -RustboroCity_DevonCorp_1F_EventScript_211289:: @ 8211289 - msgbox RustboroCity_DevonCorp_1F_Text_2114DE, MSGBOX_DEFAULT +RustboroCity_DevonCorp_1F_EventScript_GoodsRecovered:: @ 8211289 + msgbox RustboroCity_DevonCorp_1F_Text_SoundsLikeStolenGoodsRecovered, MSGBOX_DEFAULT release end -RustboroCity_DevonCorp_1F_EventScript_211293:: @ 8211293 +RustboroCity_DevonCorp_1F_EventScript_StairGuard:: @ 8211293 lock faceplayer - goto_if_set FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_2112BA - goto_if_set FLAG_RECOVERED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_2112C4 - goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_DevonCorp_1F_EventScript_2112C4 - msgbox RustboroCity_DevonCorp_1F_Text_21151B, MSGBOX_DEFAULT + goto_if_set FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_AlwaysWelcome + goto_if_set FLAG_RECOVERED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_GotRobbed + goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_DevonCorp_1F_EventScript_GotRobbed + msgbox RustboroCity_DevonCorp_1F_Text_OnlyAuthorizedPeopleEnter, MSGBOX_DEFAULT release end -RustboroCity_DevonCorp_1F_EventScript_2112BA:: @ 82112BA - msgbox RustboroCity_DevonCorp_1F_Text_211585, MSGBOX_DEFAULT +RustboroCity_DevonCorp_1F_EventScript_AlwaysWelcome:: @ 82112BA + msgbox RustboroCity_DevonCorp_1F_Text_YoureAlwaysWelcomeHere, MSGBOX_DEFAULT release end -RustboroCity_DevonCorp_1F_EventScript_2112C4:: @ 82112C4 - msgbox RustboroCity_DevonCorp_1F_Text_211558, MSGBOX_DEFAULT +RustboroCity_DevonCorp_1F_EventScript_GotRobbed:: @ 82112C4 + msgbox RustboroCity_DevonCorp_1F_Text_HowCouldWeGetRobbed, MSGBOX_DEFAULT release end -RustboroCity_DevonCorp_1F_EventScript_2112CE:: @ 82112CE +RustboroCity_DevonCorp_1F_EventScript_Greeter:: @ 82112CE lock faceplayer - goto_if_set FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_2112F5 - goto_if_set FLAG_RECOVERED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_2112FF - goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_DevonCorp_1F_EventScript_2112FF - msgbox RustboroCity_DevonCorp_1F_Text_21131B, MSGBOX_DEFAULT + goto_if_set FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_WelcomeToDevonCorp + goto_if_set FLAG_RECOVERED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_StaffGotRobbed + goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_DevonCorp_1F_EventScript_StaffGotRobbed + msgbox RustboroCity_DevonCorp_1F_Text_WelcomeToDevonCorp, MSGBOX_DEFAULT release end -RustboroCity_DevonCorp_1F_EventScript_2112F5:: @ 82112F5 - msgbox RustboroCity_DevonCorp_1F_Text_21131B, MSGBOX_DEFAULT +RustboroCity_DevonCorp_1F_EventScript_WelcomeToDevonCorp:: @ 82112F5 + msgbox RustboroCity_DevonCorp_1F_Text_WelcomeToDevonCorp, MSGBOX_DEFAULT release end -RustboroCity_DevonCorp_1F_EventScript_2112FF:: @ 82112FF - msgbox RustboroCity_DevonCorp_1F_Text_21138B, MSGBOX_DEFAULT +RustboroCity_DevonCorp_1F_EventScript_StaffGotRobbed:: @ 82112FF + msgbox RustboroCity_DevonCorp_1F_Text_StaffGotRobbed, MSGBOX_DEFAULT release end -RustboroCity_DevonCorp_1F_EventScript_211309:: @ 8211309 - msgbox RustboroCity_DevonCorp_1F_Text_2115AC, MSGBOX_SIGN +RustboroCity_DevonCorp_1F_EventScript_RocksMetalDisplay:: @ 8211309 + msgbox RustboroCity_DevonCorp_1F_Text_RocksMetalDisplay, MSGBOX_SIGN end -RustboroCity_DevonCorp_1F_EventScript_211312:: @ 8211312 - msgbox RustboroCity_DevonCorp_1F_Text_211722, MSGBOX_SIGN +RustboroCity_DevonCorp_1F_EventScript_ProductsDisplay:: @ 8211312 + msgbox RustboroCity_DevonCorp_1F_Text_ProductDisplay, MSGBOX_SIGN end -RustboroCity_DevonCorp_1F_Text_21131B: @ 821131B +RustboroCity_DevonCorp_1F_Text_WelcomeToDevonCorp: @ 821131B .string "Hello and welcome to the DEVON\n" .string "CORPORATION.\p" .string "We're proud producers of items and\n" .string "medicine that enhance your life.$" -RustboroCity_DevonCorp_1F_Text_21138B: @ 821138B +RustboroCity_DevonCorp_1F_Text_StaffGotRobbed: @ 821138B .string "One of our research staff stupidly\n" .string "got robbed of an important parcel.$" -RustboroCity_DevonCorp_1F_Text_2113D1: @ 82113D1 +RustboroCity_DevonCorp_1F_Text_ThoseShoesAreOurProduct: @ 82113D1 .string "Hey, those RUNNING SHOES!\n" .string "They're one of our products!\p" .string "It makes me happy when I see someone\n" .string "using something we made.$" -RustboroCity_DevonCorp_1F_Text_211446: @ 8211446 +RustboroCity_DevonCorp_1F_Text_RobberWasntVeryBright: @ 8211446 .string "That stolen parcel…\p" .string "Well, sure it's important, but it's not\n" .string "anything that anyone can use.\p" .string "In my estimation, that robber must not\n" .string "have been very bright.$" -RustboroCity_DevonCorp_1F_Text_2114DE: @ 82114DE +RustboroCity_DevonCorp_1F_Text_SoundsLikeStolenGoodsRecovered: @ 82114DE .string "It sounds like they've recovered\n" .string "the ripped-off DEVON GOODS.$" -RustboroCity_DevonCorp_1F_Text_21151B: @ 821151B +RustboroCity_DevonCorp_1F_Text_OnlyAuthorizedPeopleEnter: @ 821151B .string "I'm sorry, only authorized people\n" .string "are allowed to enter here.$" -RustboroCity_DevonCorp_1F_Text_211558: @ 8211558 +RustboroCity_DevonCorp_1F_Text_HowCouldWeGetRobbed: @ 8211558 .string "It's beyond stupid.\n" .string "How could we get robbed?$" -RustboroCity_DevonCorp_1F_Text_211585: @ 8211585 +RustboroCity_DevonCorp_1F_Text_YoureAlwaysWelcomeHere: @ 8211585 .string "Hi, there!\n" .string "You're always welcome here!$" -RustboroCity_DevonCorp_1F_Text_2115AC: @ 82115AC +RustboroCity_DevonCorp_1F_Text_RocksMetalDisplay: @ 82115AC .string "Samples of rocks and metal are\n" .string "displayed in the glass case.\p" .string "There's a panel with some writing\n" @@ -131,7 +131,7 @@ RustboroCity_DevonCorp_1F_Text_2115AC: @ 82115AC .string "“DEVON is now a manufacturer of a wide\n" .string "range of industrial products.”$" -RustboroCity_DevonCorp_1F_Text_211722: @ 8211722 +RustboroCity_DevonCorp_1F_Text_ProductDisplay: @ 8211722 .string "Prototypes and test products fill\n" .string "the glass display case.\p" .string "There's a panel with a description…\p" diff --git a/data/maps/RustboroCity_DevonCorp_2F/map.json b/data/maps/RustboroCity_DevonCorp_2F/map.json index 9ab864774..c841406b8 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/map.json +++ b/data/maps/RustboroCity_DevonCorp_2F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_DevonCorp_2F_EventScript_21186F", + "script": "RustboroCity_DevonCorp_2F_EventScript_TalkToPokemonScientist", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_DevonCorp_2F_EventScript_211886", + "script": "RustboroCity_DevonCorp_2F_EventScript_BallScientist", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_DevonCorp_2F_EventScript_2118B0", + "script": "RustboroCity_DevonCorp_2F_EventScript_PokenavScientist", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 10, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_DevonCorp_2F_EventScript_2118DA", + "script": "RustboroCity_DevonCorp_2F_EventScript_PokemonDreamsScientist", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_DevonCorp_2F_EventScript_2118F1", + "script": "RustboroCity_DevonCorp_2F_EventScript_FossilScientist", "flag": "0" }, { @@ -89,7 +89,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_DevonCorp_2F_EventScript_211BCF", + "script": "RustboroCity_DevonCorp_2F_EventScript_PokenavFeatureScientist", "flag": "0" } ], diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc index 751285a7a..2db001f0d 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc @@ -4,305 +4,306 @@ RustboroCity_DevonCorp_2F_MapScripts:: @ 8211857 RustboroCity_DevonCorp_2F_OnTransition: @ 821185D compare VAR_FOSSIL_RESURRECTION_STATE, 1 - call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869 + call_if_eq RustboroCity_DevonCorp_2F_EventScript_SetFossilReady end -RustboroCity_DevonCorp_2F_EventScript_211869:: @ 8211869 +RustboroCity_DevonCorp_2F_EventScript_SetFossilReady:: @ 8211869 setvar VAR_FOSSIL_RESURRECTION_STATE, 2 return -RustboroCity_DevonCorp_2F_EventScript_21186F:: @ 821186F +RustboroCity_DevonCorp_2F_EventScript_TalkToPokemonScientist:: @ 821186F lock faceplayer compare VAR_FOSSIL_RESURRECTION_STATE, 1 - call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869 - msgbox RustboroCity_DevonCorp_2F_Text_211BFB, MSGBOX_DEFAULT + call_if_eq RustboroCity_DevonCorp_2F_EventScript_SetFossilReady + msgbox RustboroCity_DevonCorp_2F_Text_DeviceForTalkingToPokemon, MSGBOX_DEFAULT release end -RustboroCity_DevonCorp_2F_EventScript_211886:: @ 8211886 +RustboroCity_DevonCorp_2F_EventScript_BallScientist:: @ 8211886 lock faceplayer compare VAR_FOSSIL_RESURRECTION_STATE, 1 - call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869 - goto_if_set FLAG_MET_DEVON_EMPLOYEE, RustboroCity_DevonCorp_2F_EventScript_2118A6 - msgbox RustboroCity_DevonCorp_2F_Text_211C50, MSGBOX_DEFAULT + call_if_eq RustboroCity_DevonCorp_2F_EventScript_SetFossilReady + goto_if_set FLAG_MET_DEVON_EMPLOYEE, RustboroCity_DevonCorp_2F_EventScript_DevelopedBalls + msgbox RustboroCity_DevonCorp_2F_Text_DevelopingNewBalls, MSGBOX_DEFAULT release end -RustboroCity_DevonCorp_2F_EventScript_2118A6:: @ 82118A6 - msgbox RustboroCity_DevonCorp_2F_Text_211C99, MSGBOX_DEFAULT +RustboroCity_DevonCorp_2F_EventScript_DevelopedBalls:: @ 82118A6 + msgbox RustboroCity_DevonCorp_2F_Text_WeFinallyMadeNewBalls, MSGBOX_DEFAULT release end -RustboroCity_DevonCorp_2F_EventScript_2118B0:: @ 82118B0 +RustboroCity_DevonCorp_2F_EventScript_PokenavScientist:: @ 82118B0 lock faceplayer compare VAR_FOSSIL_RESURRECTION_STATE, 1 - call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869 - goto_if_set FLAG_RECEIVED_POKENAV, RustboroCity_DevonCorp_2F_EventScript_2118D0 - msgbox RustboroCity_DevonCorp_2F_Text_211D9F, MSGBOX_DEFAULT + call_if_eq RustboroCity_DevonCorp_2F_EventScript_SetFossilReady + goto_if_set FLAG_RECEIVED_POKENAV, RustboroCity_DevonCorp_2F_EventScript_HasPokenav + msgbox RustboroCity_DevonCorp_2F_Text_IMadePokenav, MSGBOX_DEFAULT release end -RustboroCity_DevonCorp_2F_EventScript_2118D0:: @ 82118D0 - msgbox RustboroCity_DevonCorp_2F_Text_211DF3, MSGBOX_DEFAULT +RustboroCity_DevonCorp_2F_EventScript_HasPokenav:: @ 82118D0 + msgbox RustboroCity_DevonCorp_2F_Text_WowThatsAPokenav, MSGBOX_DEFAULT release end -RustboroCity_DevonCorp_2F_EventScript_2118DA:: @ 82118DA +RustboroCity_DevonCorp_2F_EventScript_PokemonDreamsScientist:: @ 82118DA lock faceplayer compare VAR_FOSSIL_RESURRECTION_STATE, 1 - call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869 - msgbox RustboroCity_DevonCorp_2F_Text_211EE0, MSGBOX_DEFAULT + call_if_eq RustboroCity_DevonCorp_2F_EventScript_SetFossilReady + msgbox RustboroCity_DevonCorp_2F_Text_DeviceToVisualizePokemonDreams, MSGBOX_DEFAULT release end -RustboroCity_DevonCorp_2F_EventScript_2118F1:: @ 82118F1 +RustboroCity_DevonCorp_2F_EventScript_FossilScientist:: @ 82118F1 lock faceplayer compare VAR_FOSSIL_RESURRECTION_STATE, 2 - goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211A03 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_FossilMonReady compare VAR_FOSSIL_RESURRECTION_STATE, 1 - goto_if_eq RustboroCity_DevonCorp_2F_EventScript_2119F9 - msgbox RustboroCity_DevonCorp_2F_Text_211F48, MSGBOX_DEFAULT + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_StillRegenerating + msgbox RustboroCity_DevonCorp_2F_Text_DevelopDeviceToResurrectFossils, MSGBOX_DEFAULT checkitem ITEM_ROOT_FOSSIL, 1 - compare VAR_RESULT, 1 - goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211933 + compare VAR_RESULT, TRUE + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_NoticeRootFossil checkitem ITEM_CLAW_FOSSIL, 1 - compare VAR_RESULT, 1 - goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211991 + compare VAR_RESULT, TRUE + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_NoticeClawFossil release end -RustboroCity_DevonCorp_2F_EventScript_211933:: @ 8211933 +RustboroCity_DevonCorp_2F_EventScript_NoticeRootFossil:: @ 8211933 closemessage playse SE_PIN applymovement 5, Common_Movement_ExclamationMark waitmovement 0 applymovement 5, Common_Movement_Delay48 waitmovement 0 - msgbox RustboroCity_DevonCorp_2F_Text_211FA6, MSGBOX_YESNO + msgbox RustboroCity_DevonCorp_2F_Text_WantToBringFossilBackToLife, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq RustboroCity_DevonCorp_2F_EventScript_2119EF + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_DeclineGiveFossil checkitem ITEM_CLAW_FOSSIL, 1 - compare VAR_RESULT, 1 - goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211B84 - goto RustboroCity_DevonCorp_2F_EventScript_211974 + compare VAR_RESULT, TRUE + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_ChooseFossil + goto RustboroCity_DevonCorp_2F_EventScript_GiveRootFossil end -RustboroCity_DevonCorp_2F_EventScript_211974:: @ 8211974 +RustboroCity_DevonCorp_2F_EventScript_GiveRootFossil:: @ 8211974 bufferitemname 0, ITEM_ROOT_FOSSIL - msgbox RustboroCity_DevonCorp_2F_Text_212153, MSGBOX_DEFAULT + msgbox RustboroCity_DevonCorp_2F_Text_HandedFossilToResearcher, MSGBOX_DEFAULT takeitem ITEM_ROOT_FOSSIL, 1 setvar VAR_FOSSIL_RESURRECTION_STATE, 1 setvar VAR_WHICH_FOSSIL_REVIVED, 1 release end -RustboroCity_DevonCorp_2F_EventScript_211991:: @ 8211991 +RustboroCity_DevonCorp_2F_EventScript_NoticeClawFossil:: @ 8211991 closemessage playse SE_PIN applymovement 5, Common_Movement_ExclamationMark waitmovement 0 applymovement 5, Common_Movement_Delay48 waitmovement 0 - msgbox RustboroCity_DevonCorp_2F_Text_211FA6, MSGBOX_YESNO + msgbox RustboroCity_DevonCorp_2F_Text_WantToBringFossilBackToLife, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq RustboroCity_DevonCorp_2F_EventScript_2119EF + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_DeclineGiveFossil checkitem ITEM_ROOT_FOSSIL, 1 - compare VAR_RESULT, 1 - goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211B84 - goto RustboroCity_DevonCorp_2F_EventScript_2119D2 + compare VAR_RESULT, TRUE + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_ChooseFossil + goto RustboroCity_DevonCorp_2F_EventScript_GiveClawFossil end -RustboroCity_DevonCorp_2F_EventScript_2119D2:: @ 82119D2 +RustboroCity_DevonCorp_2F_EventScript_GiveClawFossil:: @ 82119D2 bufferitemname 0, ITEM_CLAW_FOSSIL - msgbox RustboroCity_DevonCorp_2F_Text_212153, MSGBOX_DEFAULT + msgbox RustboroCity_DevonCorp_2F_Text_HandedFossilToResearcher, MSGBOX_DEFAULT takeitem ITEM_CLAW_FOSSIL, 1 setvar VAR_FOSSIL_RESURRECTION_STATE, 1 setvar VAR_WHICH_FOSSIL_REVIVED, 2 release end -RustboroCity_DevonCorp_2F_EventScript_2119EF:: @ 82119EF - msgbox RustboroCity_DevonCorp_2F_Text_212046, MSGBOX_DEFAULT +RustboroCity_DevonCorp_2F_EventScript_DeclineGiveFossil:: @ 82119EF + msgbox RustboroCity_DevonCorp_2F_Text_OhIsThatSo, MSGBOX_DEFAULT release end -RustboroCity_DevonCorp_2F_EventScript_2119F9:: @ 82119F9 - msgbox RustboroCity_DevonCorp_2F_Text_2121A2, MSGBOX_DEFAULT +RustboroCity_DevonCorp_2F_EventScript_StillRegenerating:: @ 82119F9 + msgbox RustboroCity_DevonCorp_2F_Text_FossilRegeneratorTakesTime, MSGBOX_DEFAULT release end -RustboroCity_DevonCorp_2F_EventScript_211A03:: @ 8211A03 +RustboroCity_DevonCorp_2F_EventScript_FossilMonReady:: @ 8211A03 compare VAR_WHICH_FOSSIL_REVIVED, 1 - goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211A1A + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_LileepReady compare VAR_WHICH_FOSSIL_REVIVED, 2 - goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211A2C + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_AnorithReady end -RustboroCity_DevonCorp_2F_EventScript_211A1A:: @ 8211A1A +@ This whole section has needless duplication and could be condensed considerably +RustboroCity_DevonCorp_2F_EventScript_LileepReady:: @ 8211A1A bufferspeciesname 1, SPECIES_LILEEP - msgbox RustboroCity_DevonCorp_2F_Text_212251, MSGBOX_DEFAULT - goto RustboroCity_DevonCorp_2F_EventScript_211A3E + msgbox RustboroCity_DevonCorp_2F_Text_FossilizedMonBroughtBackToLife, MSGBOX_DEFAULT + goto RustboroCity_DevonCorp_2F_EventScript_ReceiveLileep end -RustboroCity_DevonCorp_2F_EventScript_211A2C:: @ 8211A2C +RustboroCity_DevonCorp_2F_EventScript_AnorithReady:: @ 8211A2C bufferspeciesname 1, SPECIES_ANORITH - msgbox RustboroCity_DevonCorp_2F_Text_212251, MSGBOX_DEFAULT - goto RustboroCity_DevonCorp_2F_EventScript_211AE1 + msgbox RustboroCity_DevonCorp_2F_Text_FossilizedMonBroughtBackToLife, MSGBOX_DEFAULT + goto RustboroCity_DevonCorp_2F_EventScript_ReceiveAnorith end -RustboroCity_DevonCorp_2F_EventScript_211A3E:: @ 8211A3E +RustboroCity_DevonCorp_2F_EventScript_ReceiveLileep:: @ 8211A3E setvar VAR_TEMP_1, SPECIES_LILEEP givemon SPECIES_LILEEP, 20, ITEM_NONE compare VAR_RESULT, 0 - goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211A6E + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_ReceiveLileepParty compare VAR_RESULT, 1 - goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211A96 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_ReceiveLileepPC goto Common_EventScript_NoMoreRoomForPokemon end -RustboroCity_DevonCorp_2F_EventScript_211A6E:: @ 8211A6E - call RustboroCity_DevonCorp_2F_EventScript_211AC4 +RustboroCity_DevonCorp_2F_EventScript_ReceiveLileepParty:: @ 8211A6E + call RustboroCity_DevonCorp_2F_EventScript_ReceivedLileepFanfare msgbox gText_NicknameThisPokemon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211AD7 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_FinishReceivingLileep call Common_EventScript_GetGiftMonPartySlot call Common_EventScript_NameReceivedPartyMon - goto RustboroCity_DevonCorp_2F_EventScript_211AD7 + goto RustboroCity_DevonCorp_2F_EventScript_FinishReceivingLileep end -RustboroCity_DevonCorp_2F_EventScript_211A96:: @ 8211A96 - call RustboroCity_DevonCorp_2F_EventScript_211AC4 +RustboroCity_DevonCorp_2F_EventScript_ReceiveLileepPC:: @ 8211A96 + call RustboroCity_DevonCorp_2F_EventScript_ReceivedLileepFanfare msgbox gText_NicknameThisPokemon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211AB9 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_TransferLileepToPC call Common_EventScript_NameReceivedBoxMon - goto RustboroCity_DevonCorp_2F_EventScript_211AB9 + goto RustboroCity_DevonCorp_2F_EventScript_TransferLileepToPC end -RustboroCity_DevonCorp_2F_EventScript_211AB9:: @ 8211AB9 +RustboroCity_DevonCorp_2F_EventScript_TransferLileepToPC:: @ 8211AB9 call Common_EventScript_TransferredToPC - goto RustboroCity_DevonCorp_2F_EventScript_211AD7 + goto RustboroCity_DevonCorp_2F_EventScript_FinishReceivingLileep end -RustboroCity_DevonCorp_2F_EventScript_211AC4:: @ 8211AC4 +RustboroCity_DevonCorp_2F_EventScript_ReceivedLileepFanfare:: @ 8211AC4 bufferspeciesname 1, SPECIES_LILEEP playfanfare MUS_FANFA4 - message RustboroCity_DevonCorp_2F_Text_2122CB + message RustboroCity_DevonCorp_2F_Text_ReceivedMonFromResearcher waitmessage waitfanfare bufferspeciesname 0, SPECIES_LILEEP return -RustboroCity_DevonCorp_2F_EventScript_211AD7:: @ 8211AD7 +RustboroCity_DevonCorp_2F_EventScript_FinishReceivingLileep:: @ 8211AD7 setvar VAR_FOSSIL_RESURRECTION_STATE, 0 setflag FLAG_RECEIVED_REVIVED_FOSSIL_MON release end -RustboroCity_DevonCorp_2F_EventScript_211AE1:: @ 8211AE1 +RustboroCity_DevonCorp_2F_EventScript_ReceiveAnorith:: @ 8211AE1 setvar VAR_TEMP_1, SPECIES_ANORITH givemon SPECIES_ANORITH, 20, ITEM_NONE compare VAR_RESULT, 0 - goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211B11 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_ReceiveAnorithParty compare VAR_RESULT, 1 - goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211B39 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_ReceiveAnorithPC goto Common_EventScript_NoMoreRoomForPokemon end -RustboroCity_DevonCorp_2F_EventScript_211B11:: @ 8211B11 - call RustboroCity_DevonCorp_2F_EventScript_211B67 +RustboroCity_DevonCorp_2F_EventScript_ReceiveAnorithParty:: @ 8211B11 + call RustboroCity_DevonCorp_2F_EventScript_ReceivedAnorithFanfare msgbox gText_NicknameThisPokemon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211B7A + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_FinishReceivingAnorith call Common_EventScript_GetGiftMonPartySlot call Common_EventScript_NameReceivedPartyMon - goto RustboroCity_DevonCorp_2F_EventScript_211B7A + goto RustboroCity_DevonCorp_2F_EventScript_FinishReceivingAnorith end -RustboroCity_DevonCorp_2F_EventScript_211B39:: @ 8211B39 - call RustboroCity_DevonCorp_2F_EventScript_211B67 +RustboroCity_DevonCorp_2F_EventScript_ReceiveAnorithPC:: @ 8211B39 + call RustboroCity_DevonCorp_2F_EventScript_ReceivedAnorithFanfare msgbox gText_NicknameThisPokemon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211B5C + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_TransferAnorithToPC call Common_EventScript_NameReceivedBoxMon - goto RustboroCity_DevonCorp_2F_EventScript_211B5C + goto RustboroCity_DevonCorp_2F_EventScript_TransferAnorithToPC end -RustboroCity_DevonCorp_2F_EventScript_211B5C:: @ 8211B5C +RustboroCity_DevonCorp_2F_EventScript_TransferAnorithToPC:: @ 8211B5C call Common_EventScript_TransferredToPC - goto RustboroCity_DevonCorp_2F_EventScript_211B7A + goto RustboroCity_DevonCorp_2F_EventScript_FinishReceivingAnorith end -RustboroCity_DevonCorp_2F_EventScript_211B67:: @ 8211B67 +RustboroCity_DevonCorp_2F_EventScript_ReceivedAnorithFanfare:: @ 8211B67 bufferspeciesname 1, SPECIES_ANORITH playfanfare MUS_FANFA4 - message RustboroCity_DevonCorp_2F_Text_2122CB + message RustboroCity_DevonCorp_2F_Text_ReceivedMonFromResearcher waitmessage waitfanfare bufferspeciesname 0, SPECIES_ANORITH return -RustboroCity_DevonCorp_2F_EventScript_211B7A:: @ 8211B7A +RustboroCity_DevonCorp_2F_EventScript_FinishReceivingAnorith:: @ 8211B7A setvar VAR_FOSSIL_RESURRECTION_STATE, 0 setflag FLAG_RECEIVED_REVIVED_FOSSIL_MON release end -RustboroCity_DevonCorp_2F_EventScript_211B84:: @ 8211B84 - message RustboroCity_DevonCorp_2F_Text_212092 +RustboroCity_DevonCorp_2F_EventScript_ChooseFossil:: @ 8211B84 + message RustboroCity_DevonCorp_2F_Text_TwoFossilsPickOne waitmessage multichoice 17, 6, MULTI_FOSSIL, 0 switch VAR_RESULT - case 0, RustboroCity_DevonCorp_2F_EventScript_211BC1 - case 1, RustboroCity_DevonCorp_2F_EventScript_211BC7 - case 2, RustboroCity_DevonCorp_2F_EventScript_211BCD - case MULTI_B_PRESSED, RustboroCity_DevonCorp_2F_EventScript_211BCD + case 0, RustboroCity_DevonCorp_2F_EventScript_ChooseClawFossil + case 1, RustboroCity_DevonCorp_2F_EventScript_ChooseRootFossil + case 2, RustboroCity_DevonCorp_2F_EventScript_CancelFossilSelect + case MULTI_B_PRESSED, RustboroCity_DevonCorp_2F_EventScript_CancelFossilSelect end -RustboroCity_DevonCorp_2F_EventScript_211BC1:: @ 8211BC1 - goto RustboroCity_DevonCorp_2F_EventScript_2119D2 +RustboroCity_DevonCorp_2F_EventScript_ChooseClawFossil:: @ 8211BC1 + goto RustboroCity_DevonCorp_2F_EventScript_GiveClawFossil end -RustboroCity_DevonCorp_2F_EventScript_211BC7:: @ 8211BC7 - goto RustboroCity_DevonCorp_2F_EventScript_211974 +RustboroCity_DevonCorp_2F_EventScript_ChooseRootFossil:: @ 8211BC7 + goto RustboroCity_DevonCorp_2F_EventScript_GiveRootFossil end -RustboroCity_DevonCorp_2F_EventScript_211BCD:: @ 8211BCD +RustboroCity_DevonCorp_2F_EventScript_CancelFossilSelect:: @ 8211BCD release end -RustboroCity_DevonCorp_2F_EventScript_211BCF:: @ 8211BCF +RustboroCity_DevonCorp_2F_EventScript_PokenavFeatureScientist:: @ 8211BCF lock faceplayer compare VAR_FOSSIL_RESURRECTION_STATE, 1 - call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869 + call_if_eq RustboroCity_DevonCorp_2F_EventScript_SetFossilReady compare VAR_RUSTBORO_CITY_STATE, 6 - goto_if_ge RustboroCity_DevonCorp_2F_EventScript_211BF1 - msgbox RustboroCity_DevonCorp_2F_Text_212338, MSGBOX_DEFAULT + goto_if_ge RustboroCity_DevonCorp_2F_EventScript_WorkOnNext + msgbox RustboroCity_DevonCorp_2F_Text_DevelopNewPokenavFeature, MSGBOX_DEFAULT release end -RustboroCity_DevonCorp_2F_EventScript_211BF1:: @ 8211BF1 - msgbox RustboroCity_DevonCorp_2F_Text_212386, MSGBOX_DEFAULT +RustboroCity_DevonCorp_2F_EventScript_WorkOnNext:: @ 8211BF1 + msgbox RustboroCity_DevonCorp_2F_Text_WhatToWorkOnNext, MSGBOX_DEFAULT release end -RustboroCity_DevonCorp_2F_Text_211BFB: @ 8211BFB +RustboroCity_DevonCorp_2F_Text_DeviceForTalkingToPokemon: @ 8211BFB .string "We're developing a device for talking\n" .string "with POKéMON.\p" .string "But we haven't had much success…$" -RustboroCity_DevonCorp_2F_Text_211C50: @ 8211C50 +RustboroCity_DevonCorp_2F_Text_DevelopingNewBalls: @ 8211C50 .string "I'm developing new kinds of\n" .string "POKé BALLS…\p" .string "But I haven't made much headway…$" -RustboroCity_DevonCorp_2F_Text_211C99: @ 8211C99 +RustboroCity_DevonCorp_2F_Text_WeFinallyMadeNewBalls: @ 8211C99 .string "We finally made new kinds of\n" .string "POKé BALLS!\p" .string "The REPEAT BALL makes it easier to\n" @@ -313,12 +314,12 @@ RustboroCity_DevonCorp_2F_Text_211C99: @ 8211C99 .string "the DEVON CORPORATION.\p" .string "Please give them a try!$" -RustboroCity_DevonCorp_2F_Text_211D9F: @ 8211D9F +RustboroCity_DevonCorp_2F_Text_IMadePokenav: @ 8211D9F .string "I made the POKéNAV!\p" .string "As an engineer, I feel blessed to have\n" .string "made something so great!$" -RustboroCity_DevonCorp_2F_Text_211DF3: @ 8211DF3 +RustboroCity_DevonCorp_2F_Text_WowThatsAPokenav: @ 8211DF3 .string "Oh, wow!\n" .string "That's a POKéNAV!\p" .string "It came about as a result of our\n" @@ -329,18 +330,18 @@ RustboroCity_DevonCorp_2F_Text_211DF3: @ 8211DF3 .string "No, no. I think you'll find out just by\n" .string "trying the POKéNAV out.$" -RustboroCity_DevonCorp_2F_Text_211EE0: @ 8211EE0 +RustboroCity_DevonCorp_2F_Text_DeviceToVisualizePokemonDreams: @ 8211EE0 .string "I'm trying to develop a device that\n" .string "visually reproduces the dreams of\l" .string "POKéMON…\p" .string "But it's not going well.$" -RustboroCity_DevonCorp_2F_Text_211F48: @ 8211F48 +RustboroCity_DevonCorp_2F_Text_DevelopDeviceToResurrectFossils: @ 8211F48 .string "I've been trying to develop a device\n" .string "that resurrects POKéMON from fossils…\p" .string "And, it's working!$" -RustboroCity_DevonCorp_2F_Text_211FA6: @ 8211FA6 +RustboroCity_DevonCorp_2F_Text_WantToBringFossilBackToLife: @ 8211FA6 .string "Wait! That thing you have there…\n" .string "Is that a POKéMON fossil?\p" .string "Would you like to bring that POKéMON\n" @@ -348,12 +349,12 @@ RustboroCity_DevonCorp_2F_Text_211FA6: @ 8211FA6 .string "I can with my newly developed\n" .string "FOSSIL REGENERATOR.$" -RustboroCity_DevonCorp_2F_Text_212046: @ 8212046 +RustboroCity_DevonCorp_2F_Text_OhIsThatSo: @ 8212046 .string "Oh, is that so?\p" .string "DEVON's technological expertise\n" .string "is outstanding, I tell you.$" -RustboroCity_DevonCorp_2F_Text_212092: @ 8212092 +RustboroCity_DevonCorp_2F_Text_TwoFossilsPickOne: @ 8212092 .string "Oh, now that's a surprise!\n" .string "You have not one, but two, fossils?\p" .string "Unfortunately, my machine can only\n" @@ -361,13 +362,13 @@ RustboroCity_DevonCorp_2F_Text_212092: @ 8212092 .string "Would you like to pick one of your\n" .string "fossils for regeneration?$" -RustboroCity_DevonCorp_2F_Text_212153: @ 8212153 +RustboroCity_DevonCorp_2F_Text_HandedFossilToResearcher: @ 8212153 .string "Excellent!\n" .string "Let's do this right away.\p" .string "{PLAYER} handed the {STR_VAR_1} to\n" .string "the DEVON RESEARCHER.$" -RustboroCity_DevonCorp_2F_Text_2121A2: @ 82121A2 +RustboroCity_DevonCorp_2F_Text_FossilRegeneratorTakesTime: @ 82121A2 .string "The FOSSIL REGENERATOR, which I made,\n" .string "is incredible.\p" .string "But it has one drawback--it takes\n" @@ -375,27 +376,28 @@ RustboroCity_DevonCorp_2F_Text_2121A2: @ 82121A2 .string "So, uh… How about you go for a stroll\n" .string "and look around for a while?$" -RustboroCity_DevonCorp_2F_Text_212251: @ 8212251 +RustboroCity_DevonCorp_2F_Text_FossilizedMonBroughtBackToLife: @ 8212251 .string "Thanks for waiting!\p" .string "Your fossilized POKéMON has been\n" .string "brought back to life!\p" .string "The fossil was an ancient POKéMON.\n" .string "{STR_VAR_2}, it was!$" -RustboroCity_DevonCorp_2F_Text_2122CB: @ 82122CB +RustboroCity_DevonCorp_2F_Text_ReceivedMonFromResearcher: @ 82122CB .string "{PLAYER} received {STR_VAR_2} from\n" .string "the DEVON RESEARCHER.$" -RustboroCity_DevonCorp_2F_Text_2122F5: @ 82122F5 +@ Unused +RustboroCity_DevonCorp_2F_Text_TooManyPokemon: @ 82122F5 .string "Uh-oh, you've got too many POKéMON.\n" .string "You have no room for this one.$" -RustboroCity_DevonCorp_2F_Text_212338: @ 8212338 +RustboroCity_DevonCorp_2F_Text_DevelopNewPokenavFeature: @ 8212338 .string "I'm trying to develop a new feature\n" .string "for the POKéNAV…\p" .string "But it's not going well.$" -RustboroCity_DevonCorp_2F_Text_212386: @ 8212386 +RustboroCity_DevonCorp_2F_Text_WhatToWorkOnNext: @ 8212386 .string "Well, now what shall I work on\n" .string "developing next?\p" .string "Our company allows us to make our\n" diff --git a/data/maps/RustboroCity_DevonCorp_3F/map.json b/data/maps/RustboroCity_DevonCorp_3F/map.json index 0ed5d0b7e..8e0f6d2ae 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/map.json +++ b/data/maps/RustboroCity_DevonCorp_3F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_DevonCorp_3F_EventScript_21256C", + "script": "RustboroCity_DevonCorp_3F_EventScript_MrStone", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_DevonCorp_3F_EventScript_2125E1", + "script": "RustboroCity_DevonCorp_3F_EventScript_Employee", "flag": "FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_DevonCorp_3F_EventScript_21256C", + "script": "RustboroCity_DevonCorp_3F_EventScript_MrStone", "flag": "0" } ], @@ -71,7 +71,7 @@ "y": 5, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "RustboroCity_DevonCorp_3F_EventScript_212600" + "script": "RustboroCity_DevonCorp_3F_EventScript_RareRocksDisplay" }, { "type": "sign", @@ -79,7 +79,7 @@ "y": 7, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "RustboroCity_DevonCorp_3F_EventScript_212600" + "script": "RustboroCity_DevonCorp_3F_EventScript_RareRocksDisplay" } ] } \ No newline at end of file diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc index 3ce08c9f1..b4eee4866 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc @@ -1,65 +1,65 @@ RustboroCity_DevonCorp_3F_MapScripts:: @ 821242D map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_DevonCorp_3F_OnTransition - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, RustboroCity_DevonCorp_3F_MapScript2_212455 - map_script MAP_SCRIPT_ON_FRAME_TABLE, RustboroCity_DevonCorp_3F_MapScript2_212464 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, RustboroCity_DevonCorp_3F_OnWarp + map_script MAP_SCRIPT_ON_FRAME_TABLE, RustboroCity_DevonCorp_3F_OnFrame .byte 0 RustboroCity_DevonCorp_3F_OnTransition: @ 821243D compare VAR_DEVON_CORP_3F_STATE, 0 - call_if_eq RustboroCity_DevonCorp_3F_EventScript_212449 + call_if_eq RustboroCity_DevonCorp_3F_EventScript_SetEmployeePos end -RustboroCity_DevonCorp_3F_EventScript_212449:: @ 8212449 +RustboroCity_DevonCorp_3F_EventScript_SetEmployeePos:: @ 8212449 setobjectxyperm 2, 3, 2 setobjectmovementtype 2, MOVEMENT_TYPE_FACE_LEFT return -RustboroCity_DevonCorp_3F_MapScript2_212455: @ 8212455 - map_script_2 VAR_DEVON_CORP_3F_STATE, 0, RustboroCity_DevonCorp_3F_EventScript_21245F +RustboroCity_DevonCorp_3F_OnWarp: @ 8212455 + map_script_2 VAR_DEVON_CORP_3F_STATE, 0, RustboroCity_DevonCorp_3F_EventScript_PlayerFaceEast .2byte 0 -RustboroCity_DevonCorp_3F_EventScript_21245F:: @ 821245F +RustboroCity_DevonCorp_3F_EventScript_PlayerFaceEast:: @ 821245F turnobject EVENT_OBJ_ID_PLAYER, DIR_EAST end -RustboroCity_DevonCorp_3F_MapScript2_212464: @ 8212464 - map_script_2 VAR_DEVON_CORP_3F_STATE, 0, RustboroCity_DevonCorp_3F_EventScript_21246E +RustboroCity_DevonCorp_3F_OnFrame: @ 8212464 + map_script_2 VAR_DEVON_CORP_3F_STATE, 0, RustboroCity_DevonCorp_3F_EventScript_MeetPresident .2byte 0 -RustboroCity_DevonCorp_3F_EventScript_21246E:: @ 821246E +RustboroCity_DevonCorp_3F_EventScript_MeetPresident:: @ 821246E lockall - msgbox RustboroCity_DevonCorp_3F_Text_212C37, MSGBOX_DEFAULT + msgbox RustboroCity_DevonCorp_3F_Text_ThisIs3rdFloorWaitHere, MSGBOX_DEFAULT closemessage - applymovement 2, RustboroCity_DevonCorp_3F_Movement_212546 + applymovement 2, RustboroCity_DevonCorp_3F_Movement_EmployeeWalkOffscreen waitmovement 0 delay 80 - applymovement 2, RustboroCity_DevonCorp_3F_Movement_21254F + applymovement 2, RustboroCity_DevonCorp_3F_Movement_EmployeeReturnToPlayer waitmovement 0 - msgbox RustboroCity_DevonCorp_3F_Text_212DE8, MSGBOX_DEFAULT + msgbox RustboroCity_DevonCorp_3F_Text_WordWithPresidentComeWithMe, MSGBOX_DEFAULT closemessage playbgm MUS_TSURETEK, 0 - applymovement 2, RustboroCity_DevonCorp_3F_Movement_212534 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_DevonCorp_3F_Movement_212558 + applymovement 2, RustboroCity_DevonCorp_3F_Movement_LeadPlayerToPresident + applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_DevonCorp_3F_Movement_PlayerFollowToPresident waitmovement 0 - msgbox RustboroCity_DevonCorp_3F_Text_212E2F, MSGBOX_DEFAULT + msgbox RustboroCity_DevonCorp_3F_Text_PleaseGoAhead, MSGBOX_DEFAULT closemessage fadedefaultbgm - applymovement 2, RustboroCity_DevonCorp_3F_Movement_212543 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_DevonCorp_3F_Movement_212566 + applymovement 2, RustboroCity_DevonCorp_3F_Movement_EmployeeFaceDesk + applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_DevonCorp_3F_Movement_PlayerApproachDesk waitmovement 0 - msgbox RustboroCity_DevonCorp_3F_Text_212609, MSGBOX_DEFAULT + msgbox RustboroCity_DevonCorp_3F_Text_MrStoneIHaveFavor, MSGBOX_DEFAULT giveitem_std ITEM_LETTER - msgbox RustboroCity_DevonCorp_3F_Text_21277C, MSGBOX_DEFAULT + msgbox RustboroCity_DevonCorp_3F_Text_MrStoneWantYouToHaveThis, MSGBOX_DEFAULT playfanfare MUS_FANFA4 - message RustboroCity_DevonCorp_3F_Text_212820 + message RustboroCity_DevonCorp_3F_Text_ReceivedPokenav waitfanfare setflag FLAG_SYS_POKENAV_GET setflag FLAG_RECEIVED_POKENAV setflag FLAG_HIDE_RUSTBORO_CITY_POKEMON_SCHOOL_SCOTT - msgbox RustboroCity_DevonCorp_3F_Text_212837, MSGBOX_DEFAULT + msgbox RustboroCity_DevonCorp_3F_Text_MrStoneExplainPokenavRestUp, MSGBOX_DEFAULT closemessage call Common_EventScript_OutOfCenterPartyHeal - msgbox RustboroCity_DevonCorp_3F_Text_2129D2, MSGBOX_DEFAULT + msgbox RustboroCity_DevonCorp_3F_Text_MrStoneGoWithCautionAndCare, MSGBOX_DEFAULT setflag FLAG_HIDE_ROUTE_116_TUNNELER clearflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN clearflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN @@ -72,6 +72,7 @@ RustboroCity_DevonCorp_3F_EventScript_21246E:: @ 821246E releaseall end +@ Unused RustboroCity_DevonCorp_3F_Movement_21252F: @ 821252F walk_up walk_up @@ -79,7 +80,7 @@ RustboroCity_DevonCorp_3F_Movement_21252F: @ 821252F walk_in_place_fastest_left step_end -RustboroCity_DevonCorp_3F_Movement_212534: @ 8212534 +RustboroCity_DevonCorp_3F_Movement_LeadPlayerToPresident: @ 8212534 walk_right walk_right walk_right @@ -96,12 +97,12 @@ RustboroCity_DevonCorp_3F_Movement_212534: @ 8212534 walk_in_place_fastest_left step_end -RustboroCity_DevonCorp_3F_Movement_212543: @ 8212543 +RustboroCity_DevonCorp_3F_Movement_EmployeeFaceDesk: @ 8212543 delay_16 walk_in_place_fastest_down step_end -RustboroCity_DevonCorp_3F_Movement_212546: @ 8212546 +RustboroCity_DevonCorp_3F_Movement_EmployeeWalkOffscreen: @ 8212546 walk_right walk_right walk_right @@ -112,7 +113,7 @@ RustboroCity_DevonCorp_3F_Movement_212546: @ 8212546 walk_right step_end -RustboroCity_DevonCorp_3F_Movement_21254F: @ 821254F +RustboroCity_DevonCorp_3F_Movement_EmployeeReturnToPlayer: @ 821254F walk_left walk_left walk_left @@ -123,7 +124,7 @@ RustboroCity_DevonCorp_3F_Movement_21254F: @ 821254F walk_left step_end -RustboroCity_DevonCorp_3F_Movement_212558: @ 8212558 +RustboroCity_DevonCorp_3F_Movement_PlayerFollowToPresident: @ 8212558 walk_right walk_right walk_right @@ -139,7 +140,7 @@ RustboroCity_DevonCorp_3F_Movement_212558: @ 8212558 walk_right step_end -RustboroCity_DevonCorp_3F_Movement_212566: @ 8212566 +RustboroCity_DevonCorp_3F_Movement_PlayerApproachDesk: @ 8212566 delay_16 delay_16 walk_down @@ -147,57 +148,57 @@ RustboroCity_DevonCorp_3F_Movement_212566: @ 8212566 walk_in_place_fastest_right step_end -RustboroCity_DevonCorp_3F_EventScript_21256C:: @ 821256C +RustboroCity_DevonCorp_3F_EventScript_MrStone:: @ 821256C lock faceplayer - goto_if_set FLAG_RECEIVED_EXP_SHARE, RustboroCity_DevonCorp_3F_EventScript_2125CC - goto_if_set FLAG_DELIVERED_STEVEN_LETTER, RustboroCity_DevonCorp_3F_EventScript_212595 - msgbox RustboroCity_DevonCorp_3F_Text_212A09, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_EXP_SHARE, RustboroCity_DevonCorp_3F_EventScript_MrStoneAfterFavor + goto_if_set FLAG_DELIVERED_STEVEN_LETTER, RustboroCity_DevonCorp_3F_EventScript_GiveExpShare + msgbox RustboroCity_DevonCorp_3F_Text_CountingOnYou, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end -RustboroCity_DevonCorp_3F_EventScript_212595:: @ 8212595 - msgbox RustboroCity_DevonCorp_3F_Text_212A29, MSGBOX_DEFAULT +RustboroCity_DevonCorp_3F_EventScript_GiveExpShare:: @ 8212595 + msgbox RustboroCity_DevonCorp_3F_Text_ThankYouForDeliveringLetter, MSGBOX_DEFAULT giveitem_std ITEM_EXP_SHARE compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_EXP_SHARE - msgbox RustboroCity_DevonCorp_3F_Text_212A9E, MSGBOX_DEFAULT + msgbox RustboroCity_DevonCorp_3F_Text_ExplainExpShare, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end -RustboroCity_DevonCorp_3F_EventScript_2125CC:: @ 82125CC - msgbox RustboroCity_DevonCorp_3F_Text_212B78, MSGBOX_DEFAULT +RustboroCity_DevonCorp_3F_EventScript_MrStoneAfterFavor:: @ 82125CC + msgbox RustboroCity_DevonCorp_3F_Text_NotFamiliarWithTrends, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end -RustboroCity_DevonCorp_3F_EventScript_2125E1:: @ 82125E1 +RustboroCity_DevonCorp_3F_EventScript_Employee:: @ 82125E1 lock faceplayer - goto_if_set FLAG_RECEIVED_REPEAT_BALL, RustboroCity_DevonCorp_3F_EventScript_2125F6 - msgbox RustboroCity_DevonCorp_3F_Text_212E41, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_REPEAT_BALL, RustboroCity_DevonCorp_3F_EventScript_EmployeeBalls + msgbox RustboroCity_DevonCorp_3F_Text_VisitCaptSternShipyard, MSGBOX_DEFAULT release end -RustboroCity_DevonCorp_3F_EventScript_2125F6:: @ 82125F6 - msgbox RustboroCity_DevonCorp_3F_Text_212E88, MSGBOX_DEFAULT +RustboroCity_DevonCorp_3F_EventScript_EmployeeBalls:: @ 82125F6 + msgbox RustboroCity_DevonCorp_3F_Text_RepeatAndTimerHugelyPopular, MSGBOX_DEFAULT release end -RustboroCity_DevonCorp_3F_EventScript_212600:: @ 8212600 - msgbox RustboroCity_DevonCorp_3F_Text_212EE9, MSGBOX_SIGN +RustboroCity_DevonCorp_3F_EventScript_RareRocksDisplay:: @ 8212600 + msgbox RustboroCity_DevonCorp_3F_Text_RareRocksDisplay, MSGBOX_SIGN end -RustboroCity_DevonCorp_3F_Text_212609: @ 8212609 +RustboroCity_DevonCorp_3F_Text_MrStoneIHaveFavor: @ 8212609 .string "I'm MR. STONE, the PRESIDENT of\n" .string "the DEVON CORPORATION.\p" .string "I'd just got word about you!\p" @@ -212,17 +213,17 @@ RustboroCity_DevonCorp_3F_Text_212609: @ 8212609 .string "I was hoping that you'd deliver a\n" .string "LETTER to STEVEN in DEWFORD.$" -RustboroCity_DevonCorp_3F_Text_21277C: @ 821277C +RustboroCity_DevonCorp_3F_Text_MrStoneWantYouToHaveThis: @ 821277C .string "MR. STONE: Now, you should know that\n" .string "I am a great PRESIDENT.\p" .string "So, I'd never be so cheap as to ask\n" .string "a favor for nothing in return.\p" .string "That's why I want you to have this!$" -RustboroCity_DevonCorp_3F_Text_212820: @ 8212820 +RustboroCity_DevonCorp_3F_Text_ReceivedPokenav: @ 8212820 .string "{PLAYER} received a POKéNAV.$" -RustboroCity_DevonCorp_3F_Text_212837: @ 8212837 +RustboroCity_DevonCorp_3F_Text_MrStoneExplainPokenavRestUp: @ 8212837 .string "MR. STONE: That device…\p" .string "It's a POKéMON NAVIGATOR, or POKéNAV\n" .string "for short.\p" @@ -237,20 +238,20 @@ RustboroCity_DevonCorp_3F_Text_212837: @ 8212837 .string "I think it would be best if you rested\n" .string "up before you go on your way.$" -RustboroCity_DevonCorp_3F_Text_2129D2: @ 82129D2 +RustboroCity_DevonCorp_3F_Text_MrStoneGoWithCautionAndCare: @ 82129D2 .string "MR. STONE: Well, then, {PLAYER}{KUN},\n" .string "go with caution and care!$" -RustboroCity_DevonCorp_3F_Text_212A09: @ 8212A09 +RustboroCity_DevonCorp_3F_Text_CountingOnYou: @ 8212A09 .string "MR. STONE: I'm counting on you!$" -RustboroCity_DevonCorp_3F_Text_212A29: @ 8212A29 +RustboroCity_DevonCorp_3F_Text_ThankYouForDeliveringLetter: @ 8212A29 .string "MR. STONE: You delivered my LETTER?\n" .string "Thank you kindly!\p" .string "This is my way of thanking you.\n" .string "It should help you, a TRAINER.$" -RustboroCity_DevonCorp_3F_Text_212A9E: @ 8212A9E +RustboroCity_DevonCorp_3F_Text_ExplainExpShare: @ 8212A9E .string "MR. STONE: A POKéMON holding that\n" .string "EXP. SHARE will be given some of the\l" .string "EXP Points from battle.\p" @@ -259,7 +260,7 @@ RustboroCity_DevonCorp_3F_Text_212A9E: @ 8212A9E .string "I would say EXP. SHARE is quite useful\n" .string "for raising weak POKéMON.$" -RustboroCity_DevonCorp_3F_Text_212B78: @ 8212B78 +RustboroCity_DevonCorp_3F_Text_NotFamiliarWithTrends: @ 8212B78 .string "MR. STONE: Since my youth, I've immersed\n" .string "myself in work.\p" .string "Consequently, I'm not familiar with\n" @@ -267,7 +268,7 @@ RustboroCity_DevonCorp_3F_Text_212B78: @ 8212B78 .string "But do young people all want to be\n" .string "TRAINERS in the POKéMON LEAGUE?$" -RustboroCity_DevonCorp_3F_Text_212C37: @ 8212C37 +RustboroCity_DevonCorp_3F_Text_ThisIs3rdFloorWaitHere: @ 8212C37 .string "This is the DEVON CORPORATION's\n" .string "third floor.\p" .string "Our PRESIDENT's OFFICE is on\n" @@ -285,24 +286,24 @@ RustboroCity_DevonCorp_3F_Text_212C37: @ 8212C37 .string "Oh, that's right.\n" .string "Could you wait here a second?$" -RustboroCity_DevonCorp_3F_Text_212DE8: @ 8212DE8 +RustboroCity_DevonCorp_3F_Text_WordWithPresidentComeWithMe: @ 8212DE8 .string "Our PRESIDENT would like to have\n" .string "a word with you.\p" .string "Please come with me.$" -RustboroCity_DevonCorp_3F_Text_212E2F: @ 8212E2F +RustboroCity_DevonCorp_3F_Text_PleaseGoAhead: @ 8212E2F .string "Please, go ahead.$" -RustboroCity_DevonCorp_3F_Text_212E41: @ 8212E41 +RustboroCity_DevonCorp_3F_Text_VisitCaptSternShipyard: @ 8212E41 .string "If you visit the SHIPYARD in SLATEPORT,\n" .string "you should go see CAPT. STERN.$" -RustboroCity_DevonCorp_3F_Text_212E88: @ 8212E88 +RustboroCity_DevonCorp_3F_Text_RepeatAndTimerHugelyPopular: @ 8212E88 .string "DEVON's new products, the REPEAT BALL\n" .string "and TIMER BALL, have become hugely\l" .string "popular among TRAINERS.$" -RustboroCity_DevonCorp_3F_Text_212EE9: @ 8212EE9 +RustboroCity_DevonCorp_3F_Text_RareRocksDisplay: @ 8212EE9 .string "It's a collection of rare rocks and\n" .string "stones assembled by the PRESIDENT.$" From d9da932dadef1ffc59a524376c8f06bcd9d12598 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 5 Nov 2019 14:05:29 -0500 Subject: [PATCH 02/40] Document Rustboro scripts --- data/maps/Route104/scripts.inc | 4 +- data/maps/Route104_MrBrineysHouse/scripts.inc | 4 +- data/maps/RustboroCity/map.json | 82 +-- data/maps/RustboroCity/scripts.inc | 679 +++++++++--------- data/maps/RustboroCity_CuttersHouse/map.json | 4 +- .../RustboroCity_CuttersHouse/scripts.inc | 22 +- data/maps/RustboroCity_DevonCorp_2F/map.json | 2 +- .../RustboroCity_DevonCorp_2F/scripts.inc | 2 +- .../RustboroCity_DevonCorp_3F/scripts.inc | 2 +- data/maps/RustboroCity_Flat1_1F/map.json | 4 +- data/maps/RustboroCity_Flat1_1F/scripts.inc | 12 +- data/maps/RustboroCity_Flat1_2F/map.json | 14 +- data/maps/RustboroCity_Flat1_2F/scripts.inc | 116 +-- data/maps/RustboroCity_Flat2_1F/map.json | 4 +- data/maps/RustboroCity_Flat2_1F/scripts.inc | 12 +- data/maps/RustboroCity_Flat2_2F/map.json | 4 +- data/maps/RustboroCity_Flat2_2F/scripts.inc | 20 +- data/maps/RustboroCity_Flat2_3F/map.json | 4 +- data/maps/RustboroCity_Flat2_3F/scripts.inc | 12 +- data/maps/RustboroCity_House1/map.json | 4 +- data/maps/RustboroCity_House1/scripts.inc | 42 +- data/maps/RustboroCity_House2/map.json | 4 +- data/maps/RustboroCity_House2/scripts.inc | 12 +- data/maps/RustboroCity_House3/map.json | 6 +- data/maps/RustboroCity_House3/scripts.inc | 19 +- data/maps/RustboroCity_PokemonSchool/map.json | 24 +- .../RustboroCity_PokemonSchool/scripts.inc | 178 ++--- data/scripts/new_game.inc | 2 +- data/specials.inc | 2 +- include/constants/flags.h | 2 +- src/pokenav.c | 16 +- 31 files changed, 665 insertions(+), 649 deletions(-) diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index 6ca921af9..51528b6ef 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -48,7 +48,7 @@ Route104_EventScript_1ECC9E:: @ 81ECC9E Route104_EventScript_1ECCB3:: @ 81ECCB3 lockall - setflag FLAG_HIDE_RUSBORO_CITY_RIVAL + setflag FLAG_HIDE_RUSTBORO_CITY_RIVAL setvar VAR_RUSTBORO_CITY_STATE, 8 setvar VAR_ROUTE104_STATE, 2 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp @@ -62,7 +62,7 @@ Route104_EventScript_1ECCB3:: @ 81ECCB3 waitmovement 0 delay 20 setvar VAR_0x8008, 0 - call Route104_EventScript_1E0DD1 + call RustboroCity_EventScript_PlayRivalMusic playse SE_PIN applymovement 34, Common_Movement_ExclamationMark waitmovement 0 diff --git a/data/maps/Route104_MrBrineysHouse/scripts.inc b/data/maps/Route104_MrBrineysHouse/scripts.inc index 1c61d3be3..10fdddee3 100644 --- a/data/maps/Route104_MrBrineysHouse/scripts.inc +++ b/data/maps/Route104_MrBrineysHouse/scripts.inc @@ -10,7 +10,7 @@ Route104_MrBrineysHouse_OnTransition: @ 8229D34 end Route104_MrBrineysHouse_EventScript_HideRustboroRival:: @ 8229D4C - setflag FLAG_HIDE_RUSBORO_CITY_RIVAL + setflag FLAG_HIDE_RUSTBORO_CITY_RIVAL return Route104_MrBrineysHouse_EventScript_SetBrineyPeekoPos:: @ 8229D50 @@ -81,7 +81,7 @@ Route104_MrBrineysHouse_EventScript_SailToDewford:: @ 8229E27 setflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO setvar VAR_RUSTBORO_CITY_STATE, 8 setvar VAR_ROUTE104_STATE, 2 - setflag FLAG_HIDE_RUSBORO_CITY_RIVAL + setflag FLAG_HIDE_RUSTBORO_CITY_RIVAL setflag FLAG_HIDE_ROUTE_104_RIVAL warp MAP_ROUTE104, 255, 13, 51 waitstate diff --git a/data/maps/RustboroCity/map.json b/data/maps/RustboroCity/map.json index d9fd0d8cc..9c0d41709 100644 --- a/data/maps/RustboroCity/map.json +++ b/data/maps/RustboroCity/map.json @@ -40,7 +40,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_EventScript_1E088A", + "script": "RustboroCity_EventScript_Woman", "flag": "0" }, { @@ -53,7 +53,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_EventScript_1E085F", + "script": "RustboroCity_EventScript_FatMan", "flag": "0" }, { @@ -66,7 +66,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_EventScript_1E08DA", + "script": "RustboroCity_EventScript_NinjaBoy", "flag": "0" }, { @@ -79,7 +79,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_EventScript_1E08D1", + "script": "RustboroCity_EventScript_Twin", "flag": "0" }, { @@ -92,7 +92,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_EventScript_1E08B2", + "script": "RustboroCity_EventScript_Boy2", "flag": "0" }, { @@ -105,7 +105,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_EventScript_1E0893", + "script": "RustboroCity_EventScript_Man1", "flag": "0" }, { @@ -118,7 +118,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_EventScript_1E0922", + "script": "RustboroCity_EventScript_LittleBoy", "flag": "0" }, { @@ -131,7 +131,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_EventScript_1E0938", + "script": "RustboroCity_EventScript_LittleGirl", "flag": "0" }, { @@ -144,7 +144,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_EventScript_1E0ADD", + "script": "RustboroCity_EventScript_DevonEmployee1", "flag": "FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1" }, { @@ -170,7 +170,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_EventScript_1E087E", + "script": "RustboroCity_EventScript_DevonEmployee2", "flag": "0" }, { @@ -196,7 +196,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_EventScript_1E094E", + "script": "RustboroCity_EventScript_Man2", "flag": "0" }, { @@ -209,8 +209,8 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_EventScript_1E0DB8", - "flag": "FLAG_HIDE_RUSBORO_CITY_RIVAL" + "script": "RustboroCity_EventScript_Rival", + "flag": "FLAG_HIDE_RUSTBORO_CITY_RIVAL" }, { "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", @@ -235,7 +235,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_EventScript_1E1236", + "script": "RustboroCity_EventScript_Boy1", "flag": "0" } ], @@ -333,7 +333,7 @@ "elevation": 3, "var": "VAR_RUSTBORO_CITY_STATE", "var_value": "1", - "script": "RustboroCity_EventScript_1E095A" + "script": "RustboroCity_EventScript_StolenGoodsTrigger0" }, { "type": "trigger", @@ -342,7 +342,7 @@ "elevation": 3, "var": "VAR_RUSTBORO_CITY_STATE", "var_value": "1", - "script": "RustboroCity_EventScript_1E0971" + "script": "RustboroCity_EventScript_StolenGoodsTrigger1" }, { "type": "trigger", @@ -351,7 +351,7 @@ "elevation": 3, "var": "VAR_RUSTBORO_CITY_STATE", "var_value": "1", - "script": "RustboroCity_EventScript_1E0988" + "script": "RustboroCity_EventScript_StolenGoodsTrigger2" }, { "type": "trigger", @@ -360,7 +360,7 @@ "elevation": 3, "var": "VAR_RUSTBORO_CITY_STATE", "var_value": "1", - "script": "RustboroCity_EventScript_1E099F" + "script": "RustboroCity_EventScript_StolenGoodsTrigger3" }, { "type": "trigger", @@ -369,7 +369,7 @@ "elevation": 3, "var": "VAR_RUSTBORO_CITY_STATE", "var_value": "1", - "script": "RustboroCity_EventScript_1E09B6" + "script": "RustboroCity_EventScript_StolenGoodsTrigger4" }, { "type": "trigger", @@ -378,7 +378,7 @@ "elevation": 3, "var": "VAR_RUSTBORO_CITY_STATE", "var_value": "2", - "script": "RustboroCity_EventScript_1E0AFE" + "script": "RustboroCity_EventScript_HelpGetGoodsTrigger0" }, { "type": "trigger", @@ -387,7 +387,7 @@ "elevation": 3, "var": "VAR_RUSTBORO_CITY_STATE", "var_value": "2", - "script": "RustboroCity_EventScript_1E0B0A" + "script": "RustboroCity_EventScript_HelpGetGoodsTrigger1" }, { "type": "trigger", @@ -396,7 +396,7 @@ "elevation": 3, "var": "VAR_RUSTBORO_CITY_STATE", "var_value": "2", - "script": "RustboroCity_EventScript_1E0B16" + "script": "RustboroCity_EventScript_HelpGetGoodsTrigger2" }, { "type": "trigger", @@ -405,7 +405,7 @@ "elevation": 3, "var": "VAR_RUSTBORO_CITY_STATE", "var_value": "2", - "script": "RustboroCity_EventScript_1E0B22" + "script": "RustboroCity_EventScript_HelpGetGoodsTrigger3" }, { "type": "trigger", @@ -414,7 +414,7 @@ "elevation": 3, "var": "VAR_RUSTBORO_CITY_STATE", "var_value": "4", - "script": "RustboroCity_EventScript_1E0C2B" + "script": "RustboroCity_EventScript_ReturnGoodsTrigger0" }, { "type": "trigger", @@ -423,7 +423,7 @@ "elevation": 3, "var": "VAR_RUSTBORO_CITY_STATE", "var_value": "4", - "script": "RustboroCity_EventScript_1E0C37" + "script": "RustboroCity_EventScript_ReturnGoodsTrigger1" }, { "type": "trigger", @@ -432,7 +432,7 @@ "elevation": 3, "var": "VAR_RUSTBORO_CITY_STATE", "var_value": "4", - "script": "RustboroCity_EventScript_1E0C43" + "script": "RustboroCity_EventScript_ReturnGoodsTrigger2" }, { "type": "trigger", @@ -441,7 +441,7 @@ "elevation": 3, "var": "VAR_RUSTBORO_CITY_STATE", "var_value": "4", - "script": "RustboroCity_EventScript_1E0C4F" + "script": "RustboroCity_EventScript_ReturnGoodsTrigger3" }, { "type": "trigger", @@ -450,7 +450,7 @@ "elevation": 3, "var": "VAR_RUSTBORO_CITY_STATE", "var_value": "7", - "script": "RustboroCity_EventScript_1E0DF3" + "script": "RustboroCity_EventScript_RivalTrigger0" }, { "type": "trigger", @@ -459,7 +459,7 @@ "elevation": 3, "var": "VAR_RUSTBORO_CITY_STATE", "var_value": "7", - "script": "RustboroCity_EventScript_1E0E33" + "script": "RustboroCity_EventScript_RivalTrigger1" }, { "type": "trigger", @@ -468,7 +468,7 @@ "elevation": 3, "var": "VAR_RUSTBORO_CITY_STATE", "var_value": "7", - "script": "RustboroCity_EventScript_1E0E73" + "script": "RustboroCity_EventScript_RivalTrigger2" }, { "type": "trigger", @@ -477,7 +477,7 @@ "elevation": 3, "var": "VAR_RUSTBORO_CITY_STATE", "var_value": "7", - "script": "RustboroCity_EventScript_1E0EB3" + "script": "RustboroCity_EventScript_RivalTrigger3" }, { "type": "trigger", @@ -486,7 +486,7 @@ "elevation": 3, "var": "VAR_RUSTBORO_CITY_STATE", "var_value": "7", - "script": "RustboroCity_EventScript_1E0EF3" + "script": "RustboroCity_EventScript_RivalTrigger4" }, { "type": "trigger", @@ -495,7 +495,7 @@ "elevation": 3, "var": "VAR_RUSTBORO_CITY_STATE", "var_value": "7", - "script": "RustboroCity_EventScript_1E0F33" + "script": "RustboroCity_EventScript_RivalTrigger5" }, { "type": "trigger", @@ -504,7 +504,7 @@ "elevation": 3, "var": "VAR_RUSTBORO_CITY_STATE", "var_value": "7", - "script": "RustboroCity_EventScript_1E0F73" + "script": "RustboroCity_EventScript_RivalTrigger6" }, { "type": "trigger", @@ -513,7 +513,7 @@ "elevation": 3, "var": "VAR_RUSTBORO_CITY_STATE", "var_value": "7", - "script": "RustboroCity_EventScript_1E0FB3" + "script": "RustboroCity_EventScript_RivalTrigger7" } ], "bg_events": [ @@ -523,7 +523,7 @@ "y": 19, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "RustboroCity_EventScript_1E08F5" + "script": "RustboroCity_EventScript_GymSign" }, { "type": "sign", @@ -531,7 +531,7 @@ "y": 35, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "RustboroCity_EventScript_1E0910" + "script": "RustboroCity_EventScript_TrainersSchoolSign" }, { "type": "sign", @@ -555,7 +555,7 @@ "y": 49, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "RustboroCity_EventScript_1E0907" + "script": "RustboroCity_EventScript_CitySign" }, { "type": "sign", @@ -579,7 +579,7 @@ "y": 20, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "RustboroCity_EventScript_1E08EC" + "script": "RustboroCity_EventScript_DevonCorpSign" }, { "type": "sign", @@ -587,7 +587,7 @@ "y": 8, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "RustboroCity_EventScript_1E08E3" + "script": "RustboroCity_EventScript_TunnelSign" }, { "type": "sign", @@ -595,7 +595,7 @@ "y": 38, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "RustboroCity_EventScript_1E0919" + "script": "RustboroCity_EventScript_CuttersHouseSign" } ] } diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc index ff9f2e03b..4cfb0ae6e 100644 --- a/data/maps/RustboroCity/scripts.inc +++ b/data/maps/RustboroCity/scripts.inc @@ -1,45 +1,45 @@ RustboroCity_MapScripts:: @ 81E06BD map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_OnTransition - map_script MAP_SCRIPT_ON_FRAME_TABLE, RustboroCity_MapScript2_1E070B + map_script MAP_SCRIPT_ON_FRAME_TABLE, RustboroCity_OnFrame .byte 0 RustboroCity_OnTransition: @ 81E06C8 setflag FLAG_VISITED_RUSTBORO_CITY call Common_EventScript_SetupRivalGfxId compare VAR_RUSTBORO_CITY_STATE, 6 - call_if_eq RustboroCity_EventScript_1E0707 + call_if_eq RustboroCity_EventScript_HideMapNamePopup getplayerxy VAR_TEMP_0, VAR_TEMP_1 compare VAR_RUSTBORO_CITY_STATE, 6 - goto_if_eq RustboroCity_EventScript_1E06EC + goto_if_eq RustboroCity_EventScript_PositionScientistForExit end -RustboroCity_EventScript_1E06EC:: @ 81E06EC +RustboroCity_EventScript_PositionScientistForExit:: @ 81E06EC compare VAR_TEMP_0, 11 - goto_if_eq RustboroCity_EventScript_1E06FF + goto_if_eq RustboroCity_EventScript_PositionScientistLeftExit setobjectxyperm 15, 12, 15 end -RustboroCity_EventScript_1E06FF:: @ 81E06FF +RustboroCity_EventScript_PositionScientistLeftExit:: @ 81E06FF setobjectxyperm 15, 11, 15 end -RustboroCity_EventScript_1E0707:: @ 81E0707 +RustboroCity_EventScript_HideMapNamePopup:: @ 81E0707 setflag FLAG_HIDE_MAP_NAME_POPUP return -RustboroCity_MapScript2_1E070B: @ 81E070B - map_script_2 VAR_RUSTBORO_CITY_STATE, 6, RustboroCity_EventScript_1E0715 +RustboroCity_OnFrame: @ 81E070B + map_script_2 VAR_RUSTBORO_CITY_STATE, 6, RustboroCity_EventScript_ScientistAddMatchCall .2byte 0 -RustboroCity_EventScript_1E0715:: @ 81E0715 +RustboroCity_EventScript_ScientistAddMatchCall:: @ 81E0715 lockall setvar VAR_ROUTE104_STATE, 1 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_1E0850 + applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_PlayerWalkDown waitmovement 0 playse SE_KAIDAN delay 10 addobject 15 - applymovement 15, RustboroCity_Movement_1E0852 + applymovement 15, RustboroCity_Movement_ScientistApproachPlayer waitmovement 0 playse SE_PIN applymovement 15, Common_Movement_ExclamationMark @@ -48,9 +48,9 @@ RustboroCity_EventScript_1E0715:: @ 81E0715 waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - applymovement 15, RustboroCity_Movement_1E084E + applymovement 15, RustboroCity_Movement_ScientistWalkInPlaceDown waitmovement 0 - msgbox RustboroCity_Text_1E22A5, MSGBOX_DEFAULT + msgbox RustboroCity_Text_DevelopedNewPokenavFeature, MSGBOX_DEFAULT closemessage setflag FLAG_HAS_MATCH_CALL applymovement 15, Common_Movement_WalkInPlaceFastestLeft @@ -65,36 +65,36 @@ RustboroCity_EventScript_1E0715:: @ 81E0715 delay 20 applymovement 15, Common_Movement_WalkInPlaceFastestDown waitmovement 0 - msgbox RustboroCity_Text_1E2331, MSGBOX_DEFAULT + msgbox RustboroCity_Text_AddedMatchCallPleaseCallMrStone, MSGBOX_DEFAULT closemessage delay 20 - goto RustboroCity_EventScript_1E07BD + goto RustboroCity_EventScript_MatchCallTutorial -RustboroCity_EventScript_1E07AC:: @ 81E07AC - msgbox RustboroCity_Text_1E2449, MSGBOX_DEFAULT +RustboroCity_EventScript_PleaseSelectPokenav:: @ 81E07AC + msgbox RustboroCity_Text_PleaseSelectPokenav, MSGBOX_DEFAULT closemessage delay 10 - goto RustboroCity_EventScript_1E07BD + goto RustboroCity_EventScript_MatchCallTutorial -RustboroCity_EventScript_1E07BD:: @ 81E07BD +RustboroCity_EventScript_MatchCallTutorial:: @ 81E07BD setflag FLAG_ADDED_MATCH_CALL_TO_POKENAV special ScriptMenu_CreateStartMenuForPokenavTutorial waitstate switch VAR_RESULT - case 0, RustboroCity_EventScript_1E07AC - case 1, RustboroCity_EventScript_1E07AC - case 2, RustboroCity_EventScript_1E07AC - case 4, RustboroCity_EventScript_1E07AC - case 5, RustboroCity_EventScript_1E07AC - case 6, RustboroCity_EventScript_1E07AC - case 7, RustboroCity_EventScript_1E07AC - case MULTI_B_PRESSED, RustboroCity_EventScript_1E07AC - special sub_81C72A4 + case 0, RustboroCity_EventScript_PleaseSelectPokenav + case 1, RustboroCity_EventScript_PleaseSelectPokenav + case 2, RustboroCity_EventScript_PleaseSelectPokenav + case 4, RustboroCity_EventScript_PleaseSelectPokenav + case 5, RustboroCity_EventScript_PleaseSelectPokenav + case 6, RustboroCity_EventScript_PleaseSelectPokenav + case 7, RustboroCity_EventScript_PleaseSelectPokenav + case MULTI_B_PRESSED, RustboroCity_EventScript_PleaseSelectPokenav + special OpenPokenavForTutorial waitstate delay 20 - msgbox RustboroCity_Text_1E2464, MSGBOX_DEFAULT + msgbox RustboroCity_Text_IdBetterGetBackToWork, MSGBOX_DEFAULT closemessage - applymovement 15, RustboroCity_Movement_1E085D + applymovement 15, RustboroCity_Movement_ScientistLeave waitmovement 0 playse SE_KAIDAN removeobject 15 @@ -104,20 +104,21 @@ RustboroCity_EventScript_1E07BD:: @ 81E07BD releaseall end -RustboroCity_Movement_1E084E: @ 81E084E +RustboroCity_Movement_ScientistWalkInPlaceDown: @ 81E084E walk_in_place_down step_end -RustboroCity_Movement_1E0850: @ 81E0850 +RustboroCity_Movement_PlayerWalkDown: @ 81E0850 walk_down step_end -RustboroCity_Movement_1E0852: @ 81E0852 +RustboroCity_Movement_ScientistApproachPlayer: @ 81E0852 walk_down delay_16 step_end -RustboroCity_Movement_1E0855: @ 81E0855 +@ Unused +RustboroCity_Movement_ScientistWalkAroundPlayer: @ 81E0855 delay_16 walk_left walk_down @@ -127,175 +128,176 @@ RustboroCity_Movement_1E0855: @ 81E0855 delay_16 step_end -RustboroCity_Movement_1E085D: @ 81E085D +RustboroCity_Movement_ScientistLeave: @ 81E085D walk_up step_end -RustboroCity_EventScript_1E085F:: @ 81E085F +RustboroCity_EventScript_FatMan:: @ 81E085F lock faceplayer - goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_EventScript_1E0874 - msgbox RustboroCity_Text_1E123F, MSGBOX_DEFAULT + goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_EventScript_FatManSawGrunt + msgbox RustboroCity_Text_WeShortenItToDevon, MSGBOX_DEFAULT release end -RustboroCity_EventScript_1E0874:: @ 81E0874 - msgbox RustboroCity_Text_1E12AC, MSGBOX_DEFAULT +RustboroCity_EventScript_FatManSawGrunt:: @ 81E0874 + msgbox RustboroCity_Text_SneakyLookingManWentAroundCorner, MSGBOX_DEFAULT release end -RustboroCity_EventScript_1E087E:: @ 81E087E +RustboroCity_EventScript_DevonEmployee2:: @ 81E087E lock faceplayer - msgbox RustboroCity_Text_1E1407, MSGBOX_DEFAULT + msgbox RustboroCity_Text_YoureNewAroundHere, MSGBOX_DEFAULT release end -RustboroCity_EventScript_1E088A:: @ 81E088A - msgbox RustboroCity_Text_1E1480, MSGBOX_NPC +RustboroCity_EventScript_Woman:: @ 81E088A + msgbox RustboroCity_Text_GymLeaderIsntEasyWithFire, MSGBOX_NPC end -RustboroCity_EventScript_1E0893:: @ 81E0893 +RustboroCity_EventScript_Man1:: @ 81E0893 lock faceplayer - goto_if_set FLAG_BADGE01_GET, RustboroCity_EventScript_1E08A8 - msgbox RustboroCity_Text_1E130D, MSGBOX_DEFAULT + goto_if_set FLAG_BADGE01_GET, RustboroCity_EventScript_Man1HaveBadge + msgbox RustboroCity_Text_HaveYouChallengedGym, MSGBOX_DEFAULT release end -RustboroCity_EventScript_1E08A8:: @ 81E08A8 - msgbox RustboroCity_Text_1E139E, MSGBOX_DEFAULT +RustboroCity_EventScript_Man1HaveBadge:: @ 81E08A8 + msgbox RustboroCity_Text_HeyThatsRustborosGymBadge, MSGBOX_DEFAULT release end -RustboroCity_EventScript_1E08B2:: @ 81E08B2 +RustboroCity_EventScript_Boy2:: @ 81E08B2 lock faceplayer - goto_if_set FLAG_RECEIVED_POKENAV, RustboroCity_EventScript_1E08C7 - msgbox RustboroCity_Text_1E1520, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_POKENAV, RustboroCity_EventScript_BrineyLeftTunnel + msgbox RustboroCity_Text_MrBrineyWalksInTheTunnel, MSGBOX_DEFAULT release end -RustboroCity_EventScript_1E08C7:: @ 81E08C7 - msgbox RustboroCity_Text_1E1589, MSGBOX_DEFAULT +RustboroCity_EventScript_BrineyLeftTunnel:: @ 81E08C7 + msgbox RustboroCity_Text_MrBrineyLovesPeeko, MSGBOX_DEFAULT release end -RustboroCity_EventScript_1E08D1:: @ 81E08D1 - msgbox RustboroCity_Text_1E1633, MSGBOX_NPC +RustboroCity_EventScript_Twin:: @ 81E08D1 + msgbox RustboroCity_Text_WowYouHavePokemon, MSGBOX_NPC end -RustboroCity_EventScript_1E08DA:: @ 81E08DA - msgbox RustboroCity_Text_1E1695, MSGBOX_SIGN +RustboroCity_EventScript_NinjaBoy:: @ 81E08DA + msgbox RustboroCity_Text_CatchRarePokemonIfIGoToSchool, MSGBOX_SIGN end -RustboroCity_EventScript_1E08E3:: @ 81E08E3 - msgbox RustboroCity_Text_1E20A6, MSGBOX_SIGN +RustboroCity_EventScript_TunnelSign:: @ 81E08E3 + msgbox RustboroCity_Text_TunnelNearingCompletion, MSGBOX_SIGN end -RustboroCity_EventScript_1E08EC:: @ 81E08EC - msgbox RustboroCity_Text_1E2128, MSGBOX_SIGN +RustboroCity_EventScript_DevonCorpSign:: @ 81E08EC + msgbox RustboroCity_Text_DevonCorpSign, MSGBOX_SIGN end -RustboroCity_EventScript_1E08F5:: @ 81E08F5 - msgbox RustboroCity_Text_1E2167, MSGBOX_SIGN +RustboroCity_EventScript_GymSign:: @ 81E08F5 + msgbox RustboroCity_Text_GymSign, MSGBOX_SIGN end -RustboroCity_EventScript_1E08FE:: @ 81E08FE - msgbox RustboroCity_Text_1E21B3, MSGBOX_SIGN +@ Unused +RustboroCity_EventScript_DevonCorpBranchOfficeSign:: @ 81E08FE + msgbox RustboroCity_Text_DevonCorpBranchOfficeSign, MSGBOX_SIGN end -RustboroCity_EventScript_1E0907:: @ 81E0907 - msgbox RustboroCity_Text_1E220B, MSGBOX_SIGN +RustboroCity_EventScript_CitySign:: @ 81E0907 + msgbox RustboroCity_Text_CitySign, MSGBOX_SIGN end -RustboroCity_EventScript_1E0910:: @ 81E0910 - msgbox RustboroCity_Text_1E2253, MSGBOX_SIGN +RustboroCity_EventScript_TrainersSchoolSign:: @ 81E0910 + msgbox RustboroCity_Text_TrainersSchoolSign, MSGBOX_SIGN end -RustboroCity_EventScript_1E0919:: @ 81E0919 - msgbox RustboroCity_Text_1E2296, MSGBOX_SIGN +RustboroCity_EventScript_CuttersHouseSign:: @ 81E0919 + msgbox RustboroCity_Text_CuttersHouse, MSGBOX_SIGN end -RustboroCity_EventScript_1E0922:: @ 81E0922 +RustboroCity_EventScript_LittleBoy:: @ 81E0922 lock faceplayer - msgbox RustboroCity_Text_1E16F4, MSGBOX_DEFAULT + msgbox RustboroCity_Text_PokemonCanChangeLookFromExp, MSGBOX_DEFAULT applymovement 7, Common_Movement_FaceOriginalDirection waitmovement 0 release end -RustboroCity_EventScript_1E0938:: @ 81E0938 +RustboroCity_EventScript_LittleGirl:: @ 81E0938 lock faceplayer - msgbox RustboroCity_Text_1E174B, MSGBOX_DEFAULT + msgbox RustboroCity_Text_PokemonChangeShape, MSGBOX_DEFAULT applymovement 8, Common_Movement_FaceOriginalDirection waitmovement 0 release end -RustboroCity_EventScript_1E094E:: @ 81E094E +RustboroCity_EventScript_Man2:: @ 81E094E lock faceplayer - msgbox RustboroCity_Text_1E1789, MSGBOX_DEFAULT + msgbox RustboroCity_Text_TradePokemonGrowFast, MSGBOX_DEFAULT release end -RustboroCity_EventScript_1E095A:: @ 81E095A +RustboroCity_EventScript_StolenGoodsTrigger0:: @ 81E095A lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, MOVEMENT_TYPE_FACE_RIGHT setvar VAR_0x8004, 0 - goto RustboroCity_EventScript_1E09CD + goto RustboroCity_EventScript_StolenGoodsScene end -RustboroCity_EventScript_1E0971:: @ 81E0971 +RustboroCity_EventScript_StolenGoodsTrigger1:: @ 81E0971 lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, MOVEMENT_TYPE_FACE_RIGHT setvar VAR_0x8004, 1 - goto RustboroCity_EventScript_1E09CD + goto RustboroCity_EventScript_StolenGoodsScene end -RustboroCity_EventScript_1E0988:: @ 81E0988 +RustboroCity_EventScript_StolenGoodsTrigger2:: @ 81E0988 lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, MOVEMENT_TYPE_FACE_RIGHT setvar VAR_0x8004, 2 - goto RustboroCity_EventScript_1E09CD + goto RustboroCity_EventScript_StolenGoodsScene end -RustboroCity_EventScript_1E099F:: @ 81E099F +RustboroCity_EventScript_StolenGoodsTrigger3:: @ 81E099F lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, MOVEMENT_TYPE_FACE_RIGHT setvar VAR_0x8004, 3 - goto RustboroCity_EventScript_1E09CD + goto RustboroCity_EventScript_StolenGoodsScene end -RustboroCity_EventScript_1E09B6:: @ 81E09B6 +RustboroCity_EventScript_StolenGoodsTrigger4:: @ 81E09B6 lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, MOVEMENT_TYPE_FACE_RIGHT setvar VAR_0x8004, 4 - goto RustboroCity_EventScript_1E09CD + goto RustboroCity_EventScript_StolenGoodsScene end -RustboroCity_EventScript_1E09CD:: @ 81E09CD - msgbox RustboroCity_Text_1E17FE, MSGBOX_DEFAULT +RustboroCity_EventScript_StolenGoodsScene:: @ 81E09CD + msgbox RustboroCity_Text_OutOfTheWay, MSGBOX_DEFAULT closemessage playbgm MUS_AQA_0, 0 addobject 10 addobject 9 - applymovement 10, RustboroCity_Movement_1E0AA0 + applymovement 10, RustboroCity_Movement_GruntEscape waitmovement 0 removeobject 10 - applymovement 9, RustboroCity_Movement_1E0AB1 + applymovement 9, RustboroCity_Movement_EmployeeChaseGrunt1 waitmovement 0 - msgbox RustboroCity_Text_1E1817, MSGBOX_DEFAULT + msgbox RustboroCity_Text_WaitDontTakeMyGoods, MSGBOX_DEFAULT closemessage - applymovement 9, RustboroCity_Movement_1E0AB9 + applymovement 9, RustboroCity_Movement_EmployeeChaseGrunt2 waitmovement 0 fadedefaultbgm removeobject 9 @@ -313,42 +315,50 @@ RustboroCity_EventScript_1E09CD:: @ 81E09CD releaseall end -RustboroCity_EventScript_1E0A3B:: @ 81E0A3B - msgbox RustboroCity_Text_1E1904, MSGBOX_DEFAULT +@ Unused +RustboroCity_EventScript_ShadyCharacterTookOff:: @ 81E0A3B + msgbox RustboroCity_Text_ShadyCharacterTookOffTowardsTunnel, MSGBOX_DEFAULT return -RustboroCity_EventScript_1E0A44:: @ 81E0A44 - msgbox RustboroCity_Text_1E194D, MSGBOX_DEFAULT +@ Unused +RustboroCity_EventScript_YouGotItThankYou:: @ 81E0A44 + msgbox RustboroCity_Text_YouGotItThankYou, MSGBOX_DEFAULT return -RustboroCity_EventScript_1E0A4D:: @ 81E0A4D - applymovement 9, RustboroCity_Movement_1E0AC1 +@ Unknown, unused employee movements. Based on the differences in movement theyre for approaching an object (probably the player) in different positions +RustboroCity_EventScript_EmployeeApproachUp:: @ 81E0A4D + applymovement 9, RustboroCity_Movement_EmployeeApproachUp waitmovement 0 return -RustboroCity_EventScript_1E0A58:: @ 81E0A58 - applymovement 9, RustboroCity_Movement_1E0AC5 +@ Unused, see above +RustboroCity_EventScript_EmployeeApproachLeft:: @ 81E0A58 + applymovement 9, RustboroCity_Movement_EmployeeApproachLeft waitmovement 0 return -RustboroCity_EventScript_1E0A63:: @ 81E0A63 - applymovement 9, RustboroCity_Movement_1E0ACA +@ Unused, see above +RustboroCity_EventScript_EmployeeApproachRight:: @ 81E0A63 + applymovement 9, RustboroCity_Movement_EmployeeApproachRight waitmovement 0 return -RustboroCity_EventScript_1E0A6E:: @ 81E0A6E - applymovement 9, RustboroCity_Movement_1E0ACF +@ Unused, see above +RustboroCity_EventScript_EmployeeApproachDown:: @ 81E0A6E + applymovement 9, RustboroCity_Movement_EmployeeApproachDown waitmovement 0 return -RustboroCity_EventScript_1E0A79:: @ 81E0A79 - applymovement 9, RustboroCity_Movement_1E0AD5 +@ Unused, similar movement to the above scripts +RustboroCity_EventScript_EmployeeApproachPlayerFar:: @ 81E0A79 + applymovement 9, RustboroCity_Movement_EmployeeApproachPlayerFar waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return -RustboroCity_Movement_1E0A8E: @ 81E0A8E +@ Unused +RustboroCity_Movement_GruntEscapeExtended: @ 81E0A8E walk_fastest_right walk_fastest_right walk_fast_right @@ -368,7 +378,7 @@ RustboroCity_Movement_1E0A8E: @ 81E0A8E walk_fast_up step_end -RustboroCity_Movement_1E0AA0: @ 81E0AA0 +RustboroCity_Movement_GruntEscape: @ 81E0AA0 walk_fastest_right walk_fastest_right walk_fast_right @@ -387,7 +397,7 @@ RustboroCity_Movement_1E0AA0: @ 81E0AA0 walk_fast_up step_end -RustboroCity_Movement_1E0AB1: @ 81E0AB1 +RustboroCity_Movement_EmployeeChaseGrunt1: @ 81E0AB1 walk_right walk_right walk_right @@ -397,7 +407,7 @@ RustboroCity_Movement_1E0AB1: @ 81E0AB1 walk_in_place_fastest_up step_end -RustboroCity_Movement_1E0AB9: @ 81E0AB9 +RustboroCity_Movement_EmployeeChaseGrunt2: @ 81E0AB9 walk_up walk_up walk_up @@ -407,27 +417,31 @@ RustboroCity_Movement_1E0AB9: @ 81E0AB9 walk_up step_end -RustboroCity_Movement_1E0AC1: @ 81E0AC1 +@ Functionally unused +RustboroCity_Movement_EmployeeApproachUp: @ 81E0AC1 walk_down walk_right walk_right step_end -RustboroCity_Movement_1E0AC5: @ 81E0AC5 +@ Functionally unused +RustboroCity_Movement_EmployeeApproachLeft: @ 81E0AC5 walk_down walk_down walk_right walk_right step_end -RustboroCity_Movement_1E0ACA: @ 81E0ACA +@ Functionally unused +RustboroCity_Movement_EmployeeApproachRight: @ 81E0ACA walk_down walk_down walk_right walk_right step_end -RustboroCity_Movement_1E0ACF: @ 81E0ACF +@ Functionally unused +RustboroCity_Movement_EmployeeApproachDown: @ 81E0ACF walk_down walk_down walk_down @@ -435,7 +449,8 @@ RustboroCity_Movement_1E0ACF: @ 81E0ACF walk_right step_end -RustboroCity_Movement_1E0AD5: @ 81E0AD5 +@ Functionally unused +RustboroCity_Movement_EmployeeApproachPlayerFar: @ 81E0AD5 walk_down walk_down walk_down @@ -445,61 +460,62 @@ RustboroCity_Movement_1E0AD5: @ 81E0AD5 walk_in_place_fastest_down step_end -RustboroCity_EventScript_1E0ADD:: @ 81E0ADD +RustboroCity_EventScript_DevonEmployee1:: @ 81E0ADD lock faceplayer - goto_if_set FLAG_RECOVERED_DEVON_GOODS, RustboroCity_EventScript_1E0AF2 - msgbox RustboroCity_Text_1E1904, MSGBOX_DEFAULT + goto_if_set FLAG_RECOVERED_DEVON_GOODS, RustboroCity_EventScript_ReturnGoodsSpokeToEmployee + msgbox RustboroCity_Text_ShadyCharacterTookOffTowardsTunnel, MSGBOX_DEFAULT release end -RustboroCity_EventScript_1E0AF2:: @ 81E0AF2 +RustboroCity_EventScript_ReturnGoodsSpokeToEmployee:: @ 81E0AF2 waitse setvar VAR_TEMP_1, 4 - goto RustboroCity_EventScript_1E0C5B + goto RustboroCity_EventScript_ReturnGoods end -RustboroCity_EventScript_1E0AFE:: @ 81E0AFE +RustboroCity_EventScript_HelpGetGoodsTrigger0:: @ 81E0AFE lockall setvar VAR_TEMP_1, 0 - goto RustboroCity_EventScript_1E0B2E + goto RustboroCity_EventScript_EmployeeAskToGetGoods end -RustboroCity_EventScript_1E0B0A:: @ 81E0B0A +RustboroCity_EventScript_HelpGetGoodsTrigger1:: @ 81E0B0A lockall setvar VAR_TEMP_1, 1 - goto RustboroCity_EventScript_1E0B2E + goto RustboroCity_EventScript_EmployeeAskToGetGoods end -RustboroCity_EventScript_1E0B16:: @ 81E0B16 +RustboroCity_EventScript_HelpGetGoodsTrigger2:: @ 81E0B16 lockall setvar VAR_TEMP_1, 2 - goto RustboroCity_EventScript_1E0B2E + goto RustboroCity_EventScript_EmployeeAskToGetGoods end -RustboroCity_EventScript_1E0B22:: @ 81E0B22 +RustboroCity_EventScript_HelpGetGoodsTrigger3:: @ 81E0B22 lockall setvar VAR_TEMP_1, 3 - goto RustboroCity_EventScript_1E0B2E + goto RustboroCity_EventScript_EmployeeAskToGetGoods end -RustboroCity_EventScript_1E0B2E:: @ 81E0B2E +RustboroCity_EventScript_EmployeeAskToGetGoods:: @ 81E0B2E compare VAR_TEMP_1, 0 - call_if_eq RustboroCity_EventScript_1E0B6F + call_if_eq RustboroCity_EventScript_EmployeeFacePlayerUp1 compare VAR_TEMP_1, 1 - call_if_eq RustboroCity_EventScript_1E0B9B + call_if_eq RustboroCity_EventScript_EmployeeFacePlayerLeft1 compare VAR_TEMP_1, 2 - call_if_eq RustboroCity_EventScript_1E0BC7 + call_if_eq RustboroCity_EventScript_EmployeeFacePlayerDown1 compare VAR_TEMP_1, 3 - call_if_eq RustboroCity_EventScript_1E0BF3 + call_if_eq RustboroCity_EventScript_EmployeeApproachPlayerDown1 setflag FLAG_INTERACTED_WITH_DEVON_EMPLOYEE_GOODS_STOLEN setvar VAR_RUSTBORO_CITY_STATE, 3 copyobjectxytoperm 9 - msgbox RustboroCity_Text_1E183E, MSGBOX_DEFAULT + msgbox RustboroCity_Text_HelpMeIWasRobbed, MSGBOX_DEFAULT releaseall end -RustboroCity_EventScript_1E0B6F:: @ 81E0B6F +@ The below movement scripts are either partially or fully duplicated by the movement scripts when the player returns the goods +RustboroCity_EventScript_EmployeeFacePlayerUp1:: @ 81E0B6F applymovement 9, Common_Movement_WalkInPlaceFastestUp waitmovement 0 playse SE_PIN @@ -511,7 +527,7 @@ RustboroCity_EventScript_1E0B6F:: @ 81E0B6F waitmovement 0 return -RustboroCity_EventScript_1E0B9B:: @ 81E0B9B +RustboroCity_EventScript_EmployeeFacePlayerLeft1:: @ 81E0B9B applymovement 9, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 playse SE_PIN @@ -523,7 +539,7 @@ RustboroCity_EventScript_1E0B9B:: @ 81E0B9B waitmovement 0 return -RustboroCity_EventScript_1E0BC7:: @ 81E0BC7 +RustboroCity_EventScript_EmployeeFacePlayerDown1:: @ 81E0BC7 applymovement 9, Common_Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN @@ -535,7 +551,7 @@ RustboroCity_EventScript_1E0BC7:: @ 81E0BC7 waitmovement 0 return -RustboroCity_EventScript_1E0BF3:: @ 81E0BF3 +RustboroCity_EventScript_EmployeeApproachPlayerDown1:: @ 81E0BF3 applymovement 9, Common_Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN @@ -543,56 +559,56 @@ RustboroCity_EventScript_1E0BF3:: @ 81E0BF3 waitmovement 0 applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement 9, RustboroCity_Movement_1E0C29 + applymovement 9, RustboroCity_Movement_EmployeeApproachPlayerDown waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return -RustboroCity_Movement_1E0C29: @ 81E0C29 +RustboroCity_Movement_EmployeeApproachPlayerDown: @ 81E0C29 walk_down step_end -RustboroCity_EventScript_1E0C2B:: @ 81E0C2B +RustboroCity_EventScript_ReturnGoodsTrigger0:: @ 81E0C2B lockall setvar VAR_TEMP_1, 0 - goto RustboroCity_EventScript_1E0C5B + goto RustboroCity_EventScript_ReturnGoods end -RustboroCity_EventScript_1E0C37:: @ 81E0C37 +RustboroCity_EventScript_ReturnGoodsTrigger1:: @ 81E0C37 lockall setvar VAR_TEMP_1, 1 - goto RustboroCity_EventScript_1E0C5B + goto RustboroCity_EventScript_ReturnGoods end -RustboroCity_EventScript_1E0C43:: @ 81E0C43 +RustboroCity_EventScript_ReturnGoodsTrigger2:: @ 81E0C43 lockall setvar VAR_TEMP_1, 2 - goto RustboroCity_EventScript_1E0C5B + goto RustboroCity_EventScript_ReturnGoods end -RustboroCity_EventScript_1E0C4F:: @ 81E0C4F +RustboroCity_EventScript_ReturnGoodsTrigger3:: @ 81E0C4F lockall setvar VAR_TEMP_1, 3 - goto RustboroCity_EventScript_1E0C5B + goto RustboroCity_EventScript_ReturnGoods end -RustboroCity_EventScript_1E0C5B:: @ 81E0C5B +RustboroCity_EventScript_ReturnGoods:: @ 81E0C5B compare VAR_TEMP_1, 0 - call_if_eq RustboroCity_EventScript_1E0CDC + call_if_eq RustboroCity_EventScript_EmployeeFacePlayerUp2 compare VAR_TEMP_1, 1 - call_if_eq RustboroCity_EventScript_1E0D08 + call_if_eq RustboroCity_EventScript_EmployeeFacePlayerLeft2 compare VAR_TEMP_1, 2 - call_if_eq RustboroCity_EventScript_1E0D34 + call_if_eq RustboroCity_EventScript_EmployeeFacePlayerDown2 compare VAR_TEMP_1, 3 - call_if_eq RustboroCity_EventScript_1E0D60 + call_if_eq RustboroCity_EventScript_EmployeeApproachPlayerDown2 compare VAR_TEMP_1, 4 - call_if_eq RustboroCity_EventScript_1E0D96 - msgbox RustboroCity_Text_1E194D, MSGBOX_DEFAULT + call_if_eq RustboroCity_EventScript_EmployeeFacePlayerRight + msgbox RustboroCity_Text_YouGotItThankYou, MSGBOX_DEFAULT giveitem_std ITEM_GREAT_BALL - compare VAR_RESULT, 0 - call_if_eq RustboroCity_EventScript_1E0CD3 - msgbox RustboroCity_Text_1E1A21, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + call_if_eq RustboroCity_EventScript_BagFull + msgbox RustboroCity_Text_PleaseComeWithMe, MSGBOX_DEFAULT closemessage setflag FLAG_RETURNED_DEVON_GOODS setflag FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1 @@ -603,11 +619,11 @@ RustboroCity_EventScript_1E0C5B:: @ 81E0C5B releaseall end -RustboroCity_EventScript_1E0CD3:: @ 81E0CD3 - msgbox RustboroCity_Text_1E19E5, MSGBOX_DEFAULT +RustboroCity_EventScript_BagFull:: @ 81E0CD3 + msgbox RustboroCity_Text_YoureLoadedWithItems, MSGBOX_DEFAULT return -RustboroCity_EventScript_1E0CDC:: @ 81E0CDC +RustboroCity_EventScript_EmployeeFacePlayerUp2:: @ 81E0CDC applymovement 9, Common_Movement_WalkInPlaceFastestUp waitmovement 0 playse SE_PIN @@ -619,7 +635,7 @@ RustboroCity_EventScript_1E0CDC:: @ 81E0CDC waitmovement 0 return -RustboroCity_EventScript_1E0D08:: @ 81E0D08 +RustboroCity_EventScript_EmployeeFacePlayerLeft2:: @ 81E0D08 applymovement 9, Common_Movement_WalkInPlaceFastestRight waitmovement 0 playse SE_PIN @@ -631,7 +647,7 @@ RustboroCity_EventScript_1E0D08:: @ 81E0D08 waitmovement 0 return -RustboroCity_EventScript_1E0D34:: @ 81E0D34 +RustboroCity_EventScript_EmployeeFacePlayerDown2:: @ 81E0D34 applymovement 9, Common_Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN @@ -643,7 +659,7 @@ RustboroCity_EventScript_1E0D34:: @ 81E0D34 waitmovement 0 return -RustboroCity_EventScript_1E0D60:: @ 81E0D60 +RustboroCity_EventScript_EmployeeApproachPlayerDown2:: @ 81E0D60 applymovement 9, Common_Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN @@ -651,13 +667,13 @@ RustboroCity_EventScript_1E0D60:: @ 81E0D60 waitmovement 0 applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement 9, RustboroCity_Movement_1E0C29 + applymovement 9, RustboroCity_Movement_EmployeeApproachPlayerDown waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return -RustboroCity_EventScript_1E0D96:: @ 81E0D96 +RustboroCity_EventScript_EmployeeFacePlayerRight:: @ 81E0D96 applymovement 9, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 playse SE_PIN @@ -667,33 +683,32 @@ RustboroCity_EventScript_1E0D96:: @ 81E0D96 waitmovement 0 return -RustboroCity_EventScript_1E0DB8:: @ 81E0DB8 +RustboroCity_EventScript_Rival:: @ 81E0DB8 lockall - call_if_unset FLAG_MET_RIVAL_RUSTBORO, RustboroCity_EventScript_1E0DD1 + call_if_unset FLAG_MET_RIVAL_RUSTBORO, RustboroCity_EventScript_PlayRivalMusic applymovement 14, Common_Movement_FacePlayer waitmovement 0 - goto RustboroCity_EventScript_1E0FF3 + goto RustboroCity_EventScript_RivalEncounter -Route104_EventScript_1E0DD1:: @ 81E0DD1 -RustboroCity_EventScript_1E0DD1:: @ 81E0DD1 +RustboroCity_EventScript_PlayRivalMusic:: @ 81E0DD1 checkplayergender compare VAR_RESULT, MALE - goto_if_eq RustboroCity_EventScript_1E0DE9 + goto_if_eq RustboroCity_EventScript_PlayMayMusic compare VAR_RESULT, FEMALE - goto_if_eq RustboroCity_EventScript_1E0DEE + goto_if_eq RustboroCity_EventScript_PlayBrendanMusic return -RustboroCity_EventScript_1E0DE9:: @ 81E0DE9 +RustboroCity_EventScript_PlayMayMusic:: @ 81E0DE9 playbgm MUS_GIRL_SUP, 1 return -RustboroCity_EventScript_1E0DEE:: @ 81E0DEE +RustboroCity_EventScript_PlayBrendanMusic:: @ 81E0DEE playbgm MUS_BOY_SUP, 1 return -RustboroCity_EventScript_1E0DF3:: @ 81E0DF3 +RustboroCity_EventScript_RivalTrigger0:: @ 81E0DF3 lockall - call RustboroCity_EventScript_1E0DD1 + call RustboroCity_EventScript_PlayRivalMusic applymovement 14, Common_Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN @@ -701,15 +716,15 @@ RustboroCity_EventScript_1E0DF3:: @ 81E0DF3 waitmovement 0 applymovement 14, Common_Movement_Delay48 waitmovement 0 - applymovement 14, RustboroCity_Movement_1E120E + applymovement 14, RustboroCity_Movement_RivalApproachPlayer0 waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - goto RustboroCity_EventScript_1E0FF3 + goto RustboroCity_EventScript_RivalEncounter -RustboroCity_EventScript_1E0E33:: @ 81E0E33 +RustboroCity_EventScript_RivalTrigger1:: @ 81E0E33 lockall - call RustboroCity_EventScript_1E0DD1 + call RustboroCity_EventScript_PlayRivalMusic applymovement 14, Common_Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN @@ -717,15 +732,15 @@ RustboroCity_EventScript_1E0E33:: @ 81E0E33 waitmovement 0 applymovement 14, Common_Movement_Delay48 waitmovement 0 - applymovement 14, RustboroCity_Movement_1E1215 + applymovement 14, RustboroCity_Movement_RivalApproachPlayer1 waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - goto RustboroCity_EventScript_1E0FF3 + goto RustboroCity_EventScript_RivalEncounter -RustboroCity_EventScript_1E0E73:: @ 81E0E73 +RustboroCity_EventScript_RivalTrigger2:: @ 81E0E73 lockall - call RustboroCity_EventScript_1E0DD1 + call RustboroCity_EventScript_PlayRivalMusic applymovement 14, Common_Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN @@ -733,15 +748,15 @@ RustboroCity_EventScript_1E0E73:: @ 81E0E73 waitmovement 0 applymovement 14, Common_Movement_Delay48 waitmovement 0 - applymovement 14, RustboroCity_Movement_1E121B + applymovement 14, RustboroCity_Movement_RivalApproachPlayer2 waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - goto RustboroCity_EventScript_1E0FF3 + goto RustboroCity_EventScript_RivalEncounter -RustboroCity_EventScript_1E0EB3:: @ 81E0EB3 +RustboroCity_EventScript_RivalTrigger3:: @ 81E0EB3 lockall - call RustboroCity_EventScript_1E0DD1 + call RustboroCity_EventScript_PlayRivalMusic applymovement 14, Common_Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN @@ -749,15 +764,15 @@ RustboroCity_EventScript_1E0EB3:: @ 81E0EB3 waitmovement 0 applymovement 14, Common_Movement_Delay48 waitmovement 0 - applymovement 14, RustboroCity_Movement_1E1220 + applymovement 14, RustboroCity_Movement_RivalApproachPlayer3 waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - goto RustboroCity_EventScript_1E0FF3 + goto RustboroCity_EventScript_RivalEncounter -RustboroCity_EventScript_1E0EF3:: @ 81E0EF3 +RustboroCity_EventScript_RivalTrigger4:: @ 81E0EF3 lockall - call RustboroCity_EventScript_1E0DD1 + call RustboroCity_EventScript_PlayRivalMusic applymovement 14, Common_Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN @@ -765,15 +780,15 @@ RustboroCity_EventScript_1E0EF3:: @ 81E0EF3 waitmovement 0 applymovement 14, Common_Movement_Delay48 waitmovement 0 - applymovement 14, RustboroCity_Movement_1E1224 + applymovement 14, RustboroCity_Movement_RivalApproachPlayer4 waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - goto RustboroCity_EventScript_1E0FF3 + goto RustboroCity_EventScript_RivalEncounter -RustboroCity_EventScript_1E0F33:: @ 81E0F33 +RustboroCity_EventScript_RivalTrigger5:: @ 81E0F33 lockall - call RustboroCity_EventScript_1E0DD1 + call RustboroCity_EventScript_PlayRivalMusic applymovement 14, Common_Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN @@ -781,15 +796,15 @@ RustboroCity_EventScript_1E0F33:: @ 81E0F33 waitmovement 0 applymovement 14, Common_Movement_Delay48 waitmovement 0 - applymovement 14, RustboroCity_Movement_1E1227 + applymovement 14, RustboroCity_Movement_RivalApproachPlayer5 waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - goto RustboroCity_EventScript_1E0FF3 + goto RustboroCity_EventScript_RivalEncounter -RustboroCity_EventScript_1E0F73:: @ 81E0F73 +RustboroCity_EventScript_RivalTrigger6:: @ 81E0F73 lockall - call RustboroCity_EventScript_1E0DD1 + call RustboroCity_EventScript_PlayRivalMusic applymovement 14, Common_Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN @@ -797,15 +812,15 @@ RustboroCity_EventScript_1E0F73:: @ 81E0F73 waitmovement 0 applymovement 14, Common_Movement_Delay48 waitmovement 0 - applymovement 14, RustboroCity_Movement_1E122B + applymovement 14, RustboroCity_Movement_RivalApproachPlayer6 waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - goto RustboroCity_EventScript_1E0FF3 + goto RustboroCity_EventScript_RivalEncounter -RustboroCity_EventScript_1E0FB3:: @ 81E0FB3 +RustboroCity_EventScript_RivalTrigger7:: @ 81E0FB3 lockall - call RustboroCity_EventScript_1E0DD1 + call RustboroCity_EventScript_PlayRivalMusic applymovement 14, Common_Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN @@ -813,29 +828,29 @@ RustboroCity_EventScript_1E0FB3:: @ 81E0FB3 waitmovement 0 applymovement 14, Common_Movement_Delay48 waitmovement 0 - applymovement 14, RustboroCity_Movement_1E1230 + applymovement 14, RustboroCity_Movement_RivalApproachPlayer7 waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - goto RustboroCity_EventScript_1E0FF3 + goto RustboroCity_EventScript_RivalEncounter -RustboroCity_EventScript_1E0FF3:: @ 81E0FF3 +RustboroCity_EventScript_RivalEncounter:: @ 81E0FF3 checkplayergender compare VAR_RESULT, MALE - goto_if_eq RustboroCity_EventScript_1E100B + goto_if_eq RustboroCity_EventScript_MayEncounter compare VAR_RESULT, FEMALE - goto_if_eq RustboroCity_EventScript_1E1114 + goto_if_eq RustboroCity_EventScript_BrendanEncounter end -RustboroCity_EventScript_1E100B:: @ 81E100B - goto_if_set FLAG_DEFEATED_RIVAL_RUSTBORO, RustboroCity_EventScript_1E10C1 - goto_if_set FLAG_MET_RIVAL_RUSTBORO, RustboroCity_EventScript_1E1070 +RustboroCity_EventScript_MayEncounter:: @ 81E100B + goto_if_set FLAG_DEFEATED_RIVAL_RUSTBORO, RustboroCity_EventScript_MayBrineyHint + goto_if_set FLAG_MET_RIVAL_RUSTBORO, RustboroCity_EventScript_MayAskToBattle setflag FLAG_MET_RIVAL_RUSTBORO - msgbox RustboroCity_Text_1E1A49, MSGBOX_DEFAULT + msgbox RustboroCity_Text_MayHiLetsRegister, MSGBOX_DEFAULT closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox RustboroCity_Text_1E1ADB, MSGBOX_DEFAULT + msgbox RustboroCity_Text_RegisteredMay, MSGBOX_DEFAULT waitfanfare closemessage delay 30 @@ -843,126 +858,126 @@ RustboroCity_EventScript_1E100B:: @ 81E100B setvar VAR_RUSTBORO_CITY_STATE, 8 setvar VAR_ROUTE104_STATE, 2 setvar VAR_0x8008, 0 - msgbox RustboroCity_Text_1E1AFA, MSGBOX_YESNO + msgbox RustboroCity_Text_MayPassedBrineyWantToBattle, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq RustboroCity_EventScript_1E1092 - msgbox RustboroCity_Text_1E1BD3, MSGBOX_DEFAULT - call RustboroCity_EventScript_1E10D6 + goto_if_eq RustboroCity_EventScript_BattleMay + msgbox RustboroCity_Text_MayOhHaventRaisedPokemonEnough, MSGBOX_DEFAULT + call RustboroCity_EventScript_RestoreBgm releaseall end -RustboroCity_EventScript_1E1070:: @ 81E1070 +RustboroCity_EventScript_MayAskToBattle:: @ 81E1070 setvar VAR_0x8008, 1 - msgbox RustboroCity_Text_1E1C48, MSGBOX_YESNO + msgbox RustboroCity_Text_MayWantToBattle, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq RustboroCity_EventScript_1E1092 - msgbox RustboroCity_Text_1E1BD3, MSGBOX_DEFAULT + goto_if_eq RustboroCity_EventScript_BattleMay + msgbox RustboroCity_Text_MayOhHaventRaisedPokemonEnough, MSGBOX_DEFAULT releaseall end -RustboroCity_EventScript_1E1092:: @ 81E1092 - msgbox RustboroCity_Text_1E1C84, MSGBOX_DEFAULT +RustboroCity_EventScript_BattleMay:: @ 81E1092 + msgbox RustboroCity_Text_MayImNotGoingToLose, MSGBOX_DEFAULT switch VAR_STARTER_MON - case 0, RustboroCity_EventScript_1E10DB - case 1, RustboroCity_EventScript_1E10EE - case 2, RustboroCity_EventScript_1E1101 + case 0, RustboroCity_EventScript_BattleMayTreecko + case 1, RustboroCity_EventScript_BattleMayTorchic + case 2, RustboroCity_EventScript_BattleMayMudkip end -RustboroCity_EventScript_1E10C1:: @ 81E10C1 - msgbox RustboroCity_Text_1E1CE7, MSGBOX_DEFAULT +RustboroCity_EventScript_MayBrineyHint:: @ 81E10C1 + msgbox RustboroCity_Text_MayMrBrineyHint, MSGBOX_DEFAULT compare VAR_0x8008, 0 - call_if_eq RustboroCity_EventScript_1E10D6 + call_if_eq RustboroCity_EventScript_RestoreBgm releaseall end -RustboroCity_EventScript_1E10D6:: @ 81E10D6 +RustboroCity_EventScript_RestoreBgm:: @ 81E10D6 savebgm MUS_DUMMY fadedefaultbgm return -RustboroCity_EventScript_1E10DB:: @ 81E10DB - trainerbattle_no_intro TRAINER_MAY_14, RustboroCity_Text_1E1CC1 +RustboroCity_EventScript_BattleMayTreecko:: @ 81E10DB + trainerbattle_no_intro TRAINER_MAY_14, RustboroCity_Text_MayDefeat setflag FLAG_DEFEATED_RIVAL_RUSTBORO - goto RustboroCity_EventScript_1E10C1 + goto RustboroCity_EventScript_MayBrineyHint end -RustboroCity_EventScript_1E10EE:: @ 81E10EE - trainerbattle_no_intro TRAINER_MAY_15, RustboroCity_Text_1E1CC1 +RustboroCity_EventScript_BattleMayTorchic:: @ 81E10EE + trainerbattle_no_intro TRAINER_MAY_15, RustboroCity_Text_MayDefeat setflag FLAG_DEFEATED_RIVAL_RUSTBORO - goto RustboroCity_EventScript_1E10C1 + goto RustboroCity_EventScript_MayBrineyHint end -RustboroCity_EventScript_1E1101:: @ 81E1101 - trainerbattle_no_intro TRAINER_MAY_10, RustboroCity_Text_1E1CC1 +RustboroCity_EventScript_BattleMayMudkip:: @ 81E1101 + trainerbattle_no_intro TRAINER_MAY_10, RustboroCity_Text_MayDefeat setflag FLAG_DEFEATED_RIVAL_RUSTBORO - goto RustboroCity_EventScript_1E10C1 + goto RustboroCity_EventScript_MayBrineyHint end -RustboroCity_EventScript_1E1114:: @ 81E1114 - goto_if_set FLAG_DEFEATED_RIVAL_RUSTBORO, RustboroCity_EventScript_1E11C0 - goto_if_set FLAG_MET_RIVAL_RUSTBORO, RustboroCity_EventScript_1E1174 +RustboroCity_EventScript_BrendanEncounter:: @ 81E1114 + goto_if_set FLAG_DEFEATED_RIVAL_RUSTBORO, RustboroCity_EventScript_BrendanBrineyHint + goto_if_set FLAG_MET_RIVAL_RUSTBORO, RustboroCity_EventScript_BrendanAskToBattle setflag FLAG_MET_RIVAL_RUSTBORO - msgbox RustboroCity_Text_1E1D7D, MSGBOX_DEFAULT + msgbox RustboroCity_Text_BrendanHiLetsRegister, MSGBOX_DEFAULT closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox RustboroCity_Text_1E1E11, MSGBOX_DEFAULT + msgbox RustboroCity_Text_RegisteredBrendan, MSGBOX_DEFAULT waitfanfare closemessage delay 30 setflag FLAG_ENABLE_RIVAL_MATCH_CALL setvar VAR_RUSTBORO_CITY_STATE, 8 setvar VAR_ROUTE104_STATE, 2 - msgbox RustboroCity_Text_1E1E34, MSGBOX_YESNO + msgbox RustboroCity_Text_BrendanPassedBrineyWantToBattle, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq RustboroCity_EventScript_1E1191 - msgbox RustboroCity_Text_1E1F2F, MSGBOX_DEFAULT - call RustboroCity_EventScript_1E10D6 + goto_if_eq RustboroCity_EventScript_BattleBrendan + msgbox RustboroCity_Text_BrendanNoConfidenceInPokemon, MSGBOX_DEFAULT + call RustboroCity_EventScript_RestoreBgm releaseall end -RustboroCity_EventScript_1E1174:: @ 81E1174 - msgbox RustboroCity_Text_1E1F76, MSGBOX_YESNO +RustboroCity_EventScript_BrendanAskToBattle:: @ 81E1174 + msgbox RustboroCity_Text_BrendanWantToBattle, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq RustboroCity_EventScript_1E1191 - msgbox RustboroCity_Text_1E1F2F, MSGBOX_DEFAULT + goto_if_eq RustboroCity_EventScript_BattleBrendan + msgbox RustboroCity_Text_BrendanNoConfidenceInPokemon, MSGBOX_DEFAULT releaseall end -RustboroCity_EventScript_1E1191:: @ 81E1191 - msgbox RustboroCity_Text_1E1FA9, MSGBOX_DEFAULT +RustboroCity_EventScript_BattleBrendan:: @ 81E1191 + msgbox RustboroCity_Text_BrendanIWontGoEasy, MSGBOX_DEFAULT switch VAR_STARTER_MON - case 0, RustboroCity_EventScript_1E11D5 - case 1, RustboroCity_EventScript_1E11E8 - case 2, RustboroCity_EventScript_1E11FB + case 0, RustboroCity_EventScript_BattleBrendanTreecko + case 1, RustboroCity_EventScript_BattleBrendanTorchic + case 2, RustboroCity_EventScript_BattleBrendanMudkip end -RustboroCity_EventScript_1E11C0:: @ 81E11C0 - msgbox RustboroCity_Text_1E2002, MSGBOX_DEFAULT +RustboroCity_EventScript_BrendanBrineyHint:: @ 81E11C0 + msgbox RustboroCity_Text_BrendanMrBrineyHint, MSGBOX_DEFAULT compare VAR_0x8008, 0 - call_if_eq RustboroCity_EventScript_1E10D6 + call_if_eq RustboroCity_EventScript_RestoreBgm releaseall end -RustboroCity_EventScript_1E11D5:: @ 81E11D5 - trainerbattle_no_intro TRAINER_BRENDAN_10, RustboroCity_Text_1E1FE9 +RustboroCity_EventScript_BattleBrendanTreecko:: @ 81E11D5 + trainerbattle_no_intro TRAINER_BRENDAN_10, RustboroCity_Text_BrendanDefeat setflag FLAG_DEFEATED_RIVAL_RUSTBORO - goto RustboroCity_EventScript_1E11C0 + goto RustboroCity_EventScript_BrendanBrineyHint end -RustboroCity_EventScript_1E11E8:: @ 81E11E8 - trainerbattle_no_intro TRAINER_BRENDAN_12, RustboroCity_Text_1E1FE9 +RustboroCity_EventScript_BattleBrendanTorchic:: @ 81E11E8 + trainerbattle_no_intro TRAINER_BRENDAN_12, RustboroCity_Text_BrendanDefeat setflag FLAG_DEFEATED_RIVAL_RUSTBORO - goto RustboroCity_EventScript_1E11C0 + goto RustboroCity_EventScript_BrendanBrineyHint end -RustboroCity_EventScript_1E11FB:: @ 81E11FB - trainerbattle_no_intro TRAINER_BRENDAN_11, RustboroCity_Text_1E1FE9 +RustboroCity_EventScript_BattleBrendanMudkip:: @ 81E11FB + trainerbattle_no_intro TRAINER_BRENDAN_11, RustboroCity_Text_BrendanDefeat setflag FLAG_DEFEATED_RIVAL_RUSTBORO - goto RustboroCity_EventScript_1E11C0 + goto RustboroCity_EventScript_BrendanBrineyHint end -RustboroCity_Movement_1E120E: @ 81E120E +RustboroCity_Movement_RivalApproachPlayer0: @ 81E120E walk_down walk_left walk_left @@ -971,7 +986,7 @@ RustboroCity_Movement_1E120E: @ 81E120E walk_down step_end -RustboroCity_Movement_1E1215: @ 81E1215 +RustboroCity_Movement_RivalApproachPlayer1: @ 81E1215 walk_down walk_left walk_left @@ -979,38 +994,38 @@ RustboroCity_Movement_1E1215: @ 81E1215 walk_down step_end -RustboroCity_Movement_1E121B: @ 81E121B +RustboroCity_Movement_RivalApproachPlayer2: @ 81E121B walk_down walk_left walk_left walk_down step_end -RustboroCity_Movement_1E1220: @ 81E1220 +RustboroCity_Movement_RivalApproachPlayer3: @ 81E1220 walk_down walk_left walk_down step_end -RustboroCity_Movement_1E1224: @ 81E1224 +RustboroCity_Movement_RivalApproachPlayer4: @ 81E1224 walk_down walk_down step_end -RustboroCity_Movement_1E1227: @ 81E1227 +RustboroCity_Movement_RivalApproachPlayer5: @ 81E1227 walk_down walk_right walk_down step_end -RustboroCity_Movement_1E122B: @ 81E122B +RustboroCity_Movement_RivalApproachPlayer6: @ 81E122B walk_down walk_right walk_right walk_down step_end -RustboroCity_Movement_1E1230: @ 81E1230 +RustboroCity_Movement_RivalApproachPlayer7: @ 81E1230 walk_down walk_right walk_right @@ -1018,53 +1033,53 @@ RustboroCity_Movement_1E1230: @ 81E1230 walk_down step_end -RustboroCity_EventScript_1E1236:: @ 81E1236 - msgbox RustboroCity_Text_1E249D, MSGBOX_NPC +RustboroCity_EventScript_Boy1:: @ 81E1236 + msgbox RustboroCity_Text_YouCanHave2On2Battle, MSGBOX_NPC end -RustboroCity_Text_1E123F: @ 81E123F +RustboroCity_Text_WeShortenItToDevon: @ 81E123F .string "The DEVON CORPORATION…\n" .string "We all just shorten it to DEVON.\p" .string "That company makes all sorts of\n" .string "convenient products.$" -RustboroCity_Text_1E12AC: @ 81E12AC +RustboroCity_Text_SneakyLookingManWentAroundCorner: @ 81E12AC .string "Hm? A sneaky-looking man?\p" .string "Come to think of it, yes, a shady-\n" .string "looking guy went around the corner.$" -RustboroCity_Text_1E130D: @ 81E130D +RustboroCity_Text_HaveYouChallengedGym: @ 81E130D .string "Have you taken the POKéMON GYM\n" .string "challenge?\p" .string "When you get that shiny GYM BADGE\n" .string "in hand, I guess TRAINERS begin to\l" .string "realize what is required of them.$" -RustboroCity_Text_1E139E: @ 81E139E +RustboroCity_Text_HeyThatsRustborosGymBadge: @ 81E139E .string "Hey, that's RUSTBORO's GYM BADGE!\p" .string "Out of all the POKéMON GYM BADGES,\n" .string "RUSTBORO's is the coolest, I'd say.$" -RustboroCity_Text_1E1407: @ 81E1407 +RustboroCity_Text_YoureNewAroundHere: @ 81E1407 .string "Oh? Who might you be?\n" .string "You're a new face around these parts.\p" .string "Have you just transferred into the\n" .string "POKéMON TRAINER'S SCHOOL?$" -RustboroCity_Text_1E1480: @ 81E1480 +RustboroCity_Text_GymLeaderIsntEasyWithFire: @ 81E1480 .string "I challenged the GYM LEADER, but…\p" .string "It's not going to be easy winning with\n" .string "my FIRE-type POKéMON…\p" .string "FIRE-type POKéMON don't match up\n" .string "well against ROCK-type POKéMON…$" -RustboroCity_Text_1E1520: @ 81E1520 +RustboroCity_Text_MrBrineyWalksInTheTunnel: @ 81E1520 .string "The old sailor MR. BRINEY lives in\n" .string "a cottage by the sea.\p" .string "He goes for walks in the tunnel every\n" .string "so often.$" -RustboroCity_Text_1E1589: @ 81E1589 +RustboroCity_Text_MrBrineyLovesPeeko: @ 81E1589 .string "The old sailor MR. BRINEY lives in\n" .string "a cottage by the sea.\p" .string "He said he was going shopping in\n" @@ -1072,40 +1087,40 @@ RustboroCity_Text_1E1589: @ 81E1589 .string "That old sea dog, he must really love\n" .string "that PEEKO.$" -RustboroCity_Text_1E1633: @ 81E1633 +RustboroCity_Text_WowYouHavePokemon: @ 81E1633 .string "Wow, you have POKéMON with you, too.\p" .string "When I get bigger, I'm going to go\n" .string "places with POKéMON, too.$" -RustboroCity_Text_1E1695: @ 81E1695 +RustboroCity_Text_CatchRarePokemonIfIGoToSchool: @ 81E1695 .string "POKéMON TRAINER'S SCHOOL!\p" .string "If I go to this school, will I be able\n" .string "to catch rare POKéMON easily?$" -RustboroCity_Text_1E16F4: @ 81E16F4 +RustboroCity_Text_PokemonCanChangeLookFromExp: @ 81E16F4 .string "If a POKéMON gains experience in\n" .string "battles, it can sometimes change in\l" .string "the way it looks.$" -RustboroCity_Text_1E174B: @ 81E174B +RustboroCity_Text_PokemonChangeShape: @ 81E174B .string "A POKéMON changes shape?\n" .string "If one did that, I would be shocked!$" -RustboroCity_Text_1E1789: @ 81E1789 +RustboroCity_Text_TradePokemonGrowFast: @ 81E1789 .string "A POKéMON you get in a trade from\n" .string "someone grows fast.\p" .string "But if you don't have certain GYM\n" .string "BADGES, it may not obey you…$" -RustboroCity_Text_1E17FE: @ 81E17FE +RustboroCity_Text_OutOfTheWay: @ 81E17FE .string "Get out!\n" .string "Out of the way!$" -RustboroCity_Text_1E1817: @ 81E1817 +RustboroCity_Text_WaitDontTakeMyGoods: @ 81E1817 .string "Wait! Pleeeaaase!\p" .string "Don't take my GOODS!$" -RustboroCity_Text_1E183E: @ 81E183E +RustboroCity_Text_HelpMeIWasRobbed: @ 81E183E .string "Oh, it's you!\p" .string "You're that fantastic TRAINER who\n" .string "helped me in PETALBURG WOODS!\p" @@ -1114,11 +1129,11 @@ RustboroCity_Text_1E183E: @ 81E183E .string "If I don't…\n" .string "I'm going to be in serious trouble.$" -RustboroCity_Text_1E1904: @ 81E1904 +RustboroCity_Text_ShadyCharacterTookOffTowardsTunnel: @ 81E1904 .string "That shady character, I think he took\n" .string "off towards the tunnel over there.$" -RustboroCity_Text_1E194D: @ 81E194D +RustboroCity_Text_YouGotItThankYou: @ 81E194D .string "Oh! How did it go?\n" .string "The DEVON GOODS?\p" .string "You did!\n" @@ -1127,15 +1142,15 @@ RustboroCity_Text_1E194D: @ 81E194D .string "I know! As my thanks, I'll give you\n" .string "another GREAT BALL!$" -RustboroCity_Text_1E19E5: @ 81E19E5 +RustboroCity_Text_YoureLoadedWithItems: @ 81E19E5 .string "You're loaded with items.\n" .string "I can't give you this GREAT BALL.$" -RustboroCity_Text_1E1A21: @ 81E1A21 +RustboroCity_Text_PleaseComeWithMe: @ 81E1A21 .string "Excuse me, please!\n" .string "Please come with me!$" -RustboroCity_Text_1E1A49: @ 81E1A49 +RustboroCity_Text_MayHiLetsRegister: @ 81E1A49 .string "MAY: Oh, hi, {PLAYER}{KUN}!\p" .string "You had a MATCH CALL feature put\n" .string "on your POKéNAV!\p" @@ -1143,11 +1158,11 @@ RustboroCity_Text_1E1A49: @ 81E1A49 .string "contact one another anytime!\p" .string "… … … … … …$" -RustboroCity_Text_1E1ADB: @ 81E1ADB +RustboroCity_Text_RegisteredMay: @ 81E1ADB .string "Registered MAY\n" .string "in the POKéNAV.$" -RustboroCity_Text_1E1AFA: @ 81E1AFA +RustboroCity_Text_MayPassedBrineyWantToBattle: @ 81E1AFA .string "MAY: Oh, by the way, I passed\n" .string "MR. BRINEY in PETALBURG WOODS.\p" .string "I guess he's on his way home to his\n" @@ -1157,32 +1172,32 @@ RustboroCity_Text_1E1AFA: @ 81E1AFA .string "So…\n" .string "How about a little battle?$" -RustboroCity_Text_1E1BD3: @ 81E1BD3 +RustboroCity_Text_MayOhHaventRaisedPokemonEnough: @ 81E1BD3 .string "MAY: Oh, what's the matter?\p" .string "Haven't you caught or raised your\n" .string "POKéMON very much?\p" .string "That's not very good for a TRAINER!$" -RustboroCity_Text_1E1C48: @ 81E1C48 +RustboroCity_Text_MayWantToBattle: @ 81E1C48 .string "MAY: So, what do you think?\n" .string "How about a little battle here?$" -RustboroCity_Text_1E1C84: @ 81E1C84 +RustboroCity_Text_MayImNotGoingToLose: @ 81E1C84 .string "MAY: You just became a TRAINER,\n" .string "{PLAYER}{KUN}. I'm not going to lose!$" -RustboroCity_Text_1E1CC1: @ 81E1CC1 +RustboroCity_Text_MayDefeat: @ 81E1CC1 .string "Yikes!\n" .string "You're better than I expected!$" -RustboroCity_Text_1E1CE7: @ 81E1CE7 +RustboroCity_Text_MayMrBrineyHint: @ 81E1CE7 .string "MAY: Oh, by the way, MR. BRINEY, who\n" .string "I just passed…\p" .string "{PLAYER}{KUN}, you just moved here so you\n" .string "might not know this, but MR. BRINEY\l" .string "was once a revered seafarer.$" -RustboroCity_Text_1E1D7D: @ 81E1D7D +RustboroCity_Text_BrendanHiLetsRegister: @ 81E1D7D .string "BRENDAN: Oh, hey, {PLAYER}!\p" .string "You had a MATCH CALL feature put\n" .string "on your POKéNAV! Cool!\p" @@ -1190,11 +1205,11 @@ RustboroCity_Text_1E1D7D: @ 81E1D7D .string "get in touch anytime!\p" .string "… … … … … …$" -RustboroCity_Text_1E1E11: @ 81E1E11 +RustboroCity_Text_RegisteredBrendan: @ 81E1E11 .string "Registered BRENDAN\n" .string "in the POKéNAV.$" -RustboroCity_Text_1E1E34: @ 81E1E34 +RustboroCity_Text_BrendanPassedBrineyWantToBattle: @ 81E1E34 .string "BRENDAN: By the way, {PLAYER}, I walked\n" .string "by MR. BRINEY in PETALBURG WOODS.\p" .string "I bet he was on his way home to his\n" @@ -1205,72 +1220,72 @@ RustboroCity_Text_1E1E34: @ 81E1E34 .string "Want to have a battle to test how\n" .string "far you've progressed?$" -RustboroCity_Text_1E1F2F: @ 81E1F2F +RustboroCity_Text_BrendanNoConfidenceInPokemon: @ 81E1F2F .string "BRENDAN: What's the matter? Don't have\n" .string "any confidence in your POKéMON?$" -RustboroCity_Text_1E1F76: @ 81E1F76 +RustboroCity_Text_BrendanWantToBattle: @ 81E1F76 .string "BRENDAN: What's up?\n" .string "Want to have a battle with me?$" -RustboroCity_Text_1E1FA9: @ 81E1FA9 +RustboroCity_Text_BrendanIWontGoEasy: @ 81E1FA9 .string "BRENDAN: I know you just became\n" .string "a TRAINER, but I won't go easy!$" -RustboroCity_Text_1E1FE9: @ 81E1FE9 +RustboroCity_Text_BrendanDefeat: @ 81E1FE9 .string "Hmm…\n" .string "You're pretty good.$" -RustboroCity_Text_1E2002: @ 81E2002 +RustboroCity_Text_BrendanMrBrineyHint: @ 81E2002 .string "BRENDAN: By the way, you know\n" .string "MR. BRINEY? The guy I just passed?\p" .string "I bet you didn't know this, since you\n" .string "just moved here, {PLAYER}, but\l" .string "MR. BRINEY was once a great sailor.$" -RustboroCity_Text_1E20A6: @ 81E20A6 +RustboroCity_Text_TunnelNearingCompletion: @ 81E20A6 .string "“Timesaving tunnel nearing\n" .string "completion!”\p" .string "…Is what it says on the sign, but\n" .string "there's also a big “X” splashed\l" .string "across it in red paint…$" -RustboroCity_Text_1E2128: @ 81E2128 +RustboroCity_Text_DevonCorpSign: @ 81E2128 .string "DEVON CORPORATION\p" .string "“For all your living needs, we make\n" .string "it all.”$" -RustboroCity_Text_1E2167: @ 81E2167 +RustboroCity_Text_GymSign: @ 81E2167 .string "RUSTBORO CITY POKéMON GYM\n" .string "LEADER: ROXANNE\p" .string "“The ROCK-loving honors student!”$" -RustboroCity_Text_1E21B3: @ 81E21B3 +RustboroCity_Text_DevonCorpBranchOfficeSign: @ 81E21B3 .string "DEVON CORP. BRANCH OFFICE\p" .string "“Access limited to DEVON employees\n" .string "and authorized personnel.”$" -RustboroCity_Text_1E220B: @ 81E220B +RustboroCity_Text_CitySign: @ 81E220B .string "RUSTBORO CITY\p" .string "“The city probing the integration of\n" .string "nature and science.”$" -RustboroCity_Text_1E2253: @ 81E2253 +RustboroCity_Text_TrainersSchoolSign: @ 81E2253 .string "POKéMON TRAINER'S SCHOOL\p" .string "“We'll teach you anything about\n" .string "POKéMON!”$" -RustboroCity_Text_1E2296: @ 81E2296 +RustboroCity_Text_CuttersHouse: @ 81E2296 .string "CUTTER'S HOUSE$" -RustboroCity_Text_1E22A5: @ 81E22A5 +RustboroCity_Text_DevelopedNewPokenavFeature: @ 81E22A5 .string "I've been developing an added feature\n" .string "for the POKéNAV…\p" .string "And it turned out great!\p" .string "{PLAYER}, may I see that POKéNAV?\n" .string "The one our PRESIDENT gave you?$" -RustboroCity_Text_1E2331: @ 81E2331 +RustboroCity_Text_AddedMatchCallPleaseCallMrStone: @ 81E2331 .string "There you go, {PLAYER}!\p" .string "I added a new feature named\n" .string "MATCH CALL to your POKéNAV.\p" @@ -1282,14 +1297,14 @@ RustboroCity_Text_1E2331: @ 81E2331 .string "Test it out.\n" .string "Please give our PRESIDENT a call.$" -RustboroCity_Text_1E2449: @ 81E2449 +RustboroCity_Text_PleaseSelectPokenav: @ 81E2449 .string "Please select the POKéNAV.$" -RustboroCity_Text_1E2464: @ 81E2464 +RustboroCity_Text_IdBetterGetBackToWork: @ 81E2464 .string "Okay, I'd better get back to work.\n" .string "Please take care, {PLAYER}!$" -RustboroCity_Text_1E249D: @ 81E249D +RustboroCity_Text_YouCanHave2On2Battle: @ 81E249D .string "Did you know this?\p" .string "You can have a 2-on-2 battle even\n" .string "if you're not with another TRAINER.\p" diff --git a/data/maps/RustboroCity_CuttersHouse/map.json b/data/maps/RustboroCity_CuttersHouse/map.json index 134b9f726..a4bc47476 100644 --- a/data/maps/RustboroCity_CuttersHouse/map.json +++ b/data/maps/RustboroCity_CuttersHouse/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_CuttersHouse_EventScript_215BD4", + "script": "RustboroCity_CuttersHouse_EventScript_Cutter", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_CuttersHouse_EventScript_215C0A", + "script": "RustboroCity_CuttersHouse_EventScript_Lass", "flag": "0" } ], diff --git a/data/maps/RustboroCity_CuttersHouse/scripts.inc b/data/maps/RustboroCity_CuttersHouse/scripts.inc index ab74d5340..f19d56a2d 100644 --- a/data/maps/RustboroCity_CuttersHouse/scripts.inc +++ b/data/maps/RustboroCity_CuttersHouse/scripts.inc @@ -1,27 +1,27 @@ RustboroCity_CuttersHouse_MapScripts:: @ 8215BD3 .byte 0 -RustboroCity_CuttersHouse_EventScript_215BD4:: @ 8215BD4 +RustboroCity_CuttersHouse_EventScript_Cutter:: @ 8215BD4 lock faceplayer - goto_if_set FLAG_RECEIVED_HM01, RustboroCity_CuttersHouse_EventScript_215C00 - msgbox RustboroCity_CuttersHouse_Text_215C13, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_HM01, RustboroCity_CuttersHouse_EventScript_ExplainCut + msgbox RustboroCity_CuttersHouse_Text_YouCanPutThisHMToGoodUse, MSGBOX_DEFAULT giveitem_std ITEM_HM01 setflag FLAG_RECEIVED_HM01 - msgbox RustboroCity_CuttersHouse_Text_215D33, MSGBOX_DEFAULT + msgbox RustboroCity_CuttersHouse_Text_ExplainCut, MSGBOX_DEFAULT release end -RustboroCity_CuttersHouse_EventScript_215C00:: @ 8215C00 - msgbox RustboroCity_CuttersHouse_Text_215D33, MSGBOX_DEFAULT +RustboroCity_CuttersHouse_EventScript_ExplainCut:: @ 8215C00 + msgbox RustboroCity_CuttersHouse_Text_ExplainCut, MSGBOX_DEFAULT release end -RustboroCity_CuttersHouse_EventScript_215C0A:: @ 8215C0A - msgbox RustboroCity_CuttersHouse_Text_215E39, MSGBOX_NPC +RustboroCity_CuttersHouse_EventScript_Lass:: @ 8215C0A + msgbox RustboroCity_CuttersHouse_Text_DadHelpedClearLandOfTrees, MSGBOX_NPC end -RustboroCity_CuttersHouse_Text_215C13: @ 8215C13 +RustboroCity_CuttersHouse_Text_YouCanPutThisHMToGoodUse: @ 8215C13 .string "That determined expression…\n" .string "That limber way you move…\l" .string "And your well-trained POKéMON…\p" @@ -33,7 +33,7 @@ RustboroCity_CuttersHouse_Text_215C13: @ 8215C13 .string "No need to be modest or shy.\n" .string "Go on, take it!$" -RustboroCity_CuttersHouse_Text_215D33: @ 8215D33 +RustboroCity_CuttersHouse_Text_ExplainCut: @ 8215D33 .string "That HIDDEN MACHINE, or HM for\n" .string "short, is CUT.\p" .string "An HM move is one that can be used\n" @@ -44,7 +44,7 @@ RustboroCity_CuttersHouse_Text_215D33: @ 8215D33 .string "And, unlike a TM, an HM can be used\n" .string "more than once.$" -RustboroCity_CuttersHouse_Text_215E39: @ 8215E39 +RustboroCity_CuttersHouse_Text_DadHelpedClearLandOfTrees: @ 8215E39 .string "When they were expanding the city of\n" .string "RUSTBORO, my dad helped out.\p" .string "He made his POKéMON use CUT to clear\n" diff --git a/data/maps/RustboroCity_DevonCorp_2F/map.json b/data/maps/RustboroCity_DevonCorp_2F/map.json index c841406b8..b7dbdb3d5 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/map.json +++ b/data/maps/RustboroCity_DevonCorp_2F/map.json @@ -89,7 +89,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_DevonCorp_2F_EventScript_PokenavFeatureScientist", + "script": "RustboroCity_DevonCorp_2F_EventScript_MatchCallScientist", "flag": "0" } ], diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc index 2db001f0d..d2a5acd0f 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc @@ -277,7 +277,7 @@ RustboroCity_DevonCorp_2F_EventScript_CancelFossilSelect:: @ 8211BCD release end -RustboroCity_DevonCorp_2F_EventScript_PokenavFeatureScientist:: @ 8211BCF +RustboroCity_DevonCorp_2F_EventScript_MatchCallScientist:: @ 8211BCF lock faceplayer compare VAR_FOSSIL_RESURRECTION_STATE, 1 diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc index b4eee4866..27152e8d6 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc @@ -66,7 +66,7 @@ RustboroCity_DevonCorp_3F_EventScript_MeetPresident:: @ 821246E clearflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY clearflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO setvar VAR_BRINEY_LOCATION, 1 - clearflag FLAG_HIDE_RUSBORO_CITY_RIVAL + clearflag FLAG_HIDE_RUSTBORO_CITY_RIVAL setvar VAR_DEVON_CORP_3F_STATE, 1 setvar VAR_RUSTBORO_CITY_STATE, 6 releaseall diff --git a/data/maps/RustboroCity_Flat1_1F/map.json b/data/maps/RustboroCity_Flat1_1F/map.json index bc016aa2c..a35fe32cf 100644 --- a/data/maps/RustboroCity_Flat1_1F/map.json +++ b/data/maps/RustboroCity_Flat1_1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Flat1_1F_EventScript_2150CE", + "script": "RustboroCity_Flat1_1F_EventScript_Man", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Flat1_1F_EventScript_2150D7", + "script": "RustboroCity_Flat1_1F_EventScript_Woman", "flag": "0" } ], diff --git a/data/maps/RustboroCity_Flat1_1F/scripts.inc b/data/maps/RustboroCity_Flat1_1F/scripts.inc index 9cff0b010..c52c7f069 100644 --- a/data/maps/RustboroCity_Flat1_1F/scripts.inc +++ b/data/maps/RustboroCity_Flat1_1F/scripts.inc @@ -1,18 +1,18 @@ RustboroCity_Flat1_1F_MapScripts:: @ 82150CD .byte 0 -RustboroCity_Flat1_1F_EventScript_2150CE:: @ 82150CE - msgbox RustboroCity_Flat1_1F_Text_2150E0, MSGBOX_NPC +RustboroCity_Flat1_1F_EventScript_Man:: @ 82150CE + msgbox RustboroCity_Flat1_1F_Text_EveryPokemonHasAbility, MSGBOX_NPC end -RustboroCity_Flat1_1F_EventScript_2150D7:: @ 82150D7 - msgbox RustboroCity_Flat1_1F_Text_215115, MSGBOX_NPC +RustboroCity_Flat1_1F_EventScript_Woman:: @ 82150D7 + msgbox RustboroCity_Flat1_1F_Text_PokemonStrange, MSGBOX_NPC end -RustboroCity_Flat1_1F_Text_2150E0: @ 82150E0 +RustboroCity_Flat1_1F_Text_EveryPokemonHasAbility: @ 82150E0 .string "Every POKéMON has a special ability\n" .string "that it can use.$" -RustboroCity_Flat1_1F_Text_215115: @ 8215115 +RustboroCity_Flat1_1F_Text_PokemonStrange: @ 8215115 .string "POKéMON are such strange creatures.$" diff --git a/data/maps/RustboroCity_Flat1_2F/map.json b/data/maps/RustboroCity_Flat1_2F/map.json index 5c047888e..b937d323a 100644 --- a/data/maps/RustboroCity_Flat1_2F/map.json +++ b/data/maps/RustboroCity_Flat1_2F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Flat1_2F_EventScript_21523D", + "script": "RustboroCity_Flat1_2F_EventScript_WaldasMom", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Flat1_2F_EventScript_215246", + "script": "RustboroCity_Flat1_2F_EventScript_PokeDoll", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Flat1_2F_EventScript_215246", + "script": "RustboroCity_Flat1_2F_EventScript_PokeDoll", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Flat1_2F_EventScript_215246", + "script": "RustboroCity_Flat1_2F_EventScript_PokeDoll", "flag": "0" }, { @@ -89,7 +89,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Flat1_2F_EventScript_21513A", + "script": "RustboroCity_Flat1_2F_EventScript_WaldasDad", "flag": "0" }, { @@ -102,7 +102,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Flat1_2F_EventScript_215246", + "script": "RustboroCity_Flat1_2F_EventScript_PokeDoll", "flag": "0" }, { @@ -115,7 +115,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Flat1_2F_EventScript_215246", + "script": "RustboroCity_Flat1_2F_EventScript_PokeDoll", "flag": "0" } ], diff --git a/data/maps/RustboroCity_Flat1_2F/scripts.inc b/data/maps/RustboroCity_Flat1_2F/scripts.inc index 5a4b50ccc..4295f0447 100644 --- a/data/maps/RustboroCity_Flat1_2F/scripts.inc +++ b/data/maps/RustboroCity_Flat1_2F/scripts.inc @@ -1,90 +1,90 @@ RustboroCity_Flat1_2F_MapScripts:: @ 8215139 .byte 0 -RustboroCity_Flat1_2F_EventScript_21513A:: @ 821513A +RustboroCity_Flat1_2F_EventScript_WaldasDad:: @ 821513A lock faceplayer specialvar VAR_RESULT, TryBufferWaldaPhrase - compare VAR_RESULT, 0 - goto_if_eq RustboroCity_Flat1_2F_EventScript_21518D - compare VAR_RESULT, 1 - goto_if_eq RustboroCity_Flat1_2F_EventScript_2151AD + compare VAR_RESULT, FALSE + goto_if_eq RustboroCity_Flat1_2F_EventScript_WaldasDadFirstPhrase + compare VAR_RESULT, TRUE + goto_if_eq RustboroCity_Flat1_2F_EventScript_WaldasDadNewPhrase -RustboroCity_Flat1_2F_EventScript_215157:: @ 8215157 +RustboroCity_Flat1_2F_EventScript_GivePhrase:: @ 8215157 special DoWaldaNamingScreen waitstate compare VAR_0x8004, 1 - goto_if_eq RustboroCity_Flat1_2F_EventScript_2151D7 + goto_if_eq RustboroCity_Flat1_2F_EventScript_CancelGivePhrase compare VAR_0x8004, 2 - goto_if_eq RustboroCity_Flat1_2F_EventScript_2151E1 + goto_if_eq RustboroCity_Flat1_2F_EventScript_CancelGiveFirstPhrase specialvar VAR_RESULT, TryGetWallpaperWithWaldaPhrase - compare VAR_RESULT, 1 - goto_if_eq RustboroCity_Flat1_2F_EventScript_2151F8 - compare VAR_RESULT, 0 - goto_if_eq RustboroCity_Flat1_2F_EventScript_215221 + compare VAR_RESULT, TRUE + goto_if_eq RustboroCity_Flat1_2F_EventScript_WaldaLikesPhrase + compare VAR_RESULT, FALSE + goto_if_eq RustboroCity_Flat1_2F_EventScript_WaldaDoesntLikePhrase end -RustboroCity_Flat1_2F_EventScript_21518D:: @ 821518D - msgbox RustboroCity_Flat1_2F_Text_2152FA, MSGBOX_YESNO +RustboroCity_Flat1_2F_EventScript_WaldasDadFirstPhrase:: @ 821518D + msgbox RustboroCity_Flat1_2F_Text_HelloDoYouKnowFunnyPhrase, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq RustboroCity_Flat1_2F_EventScript_2151CD - msgbox RustboroCity_Flat1_2F_Text_2154AD, MSGBOX_DEFAULT - goto RustboroCity_Flat1_2F_EventScript_215157 + goto_if_eq RustboroCity_Flat1_2F_EventScript_DeclineGivePhrase + msgbox RustboroCity_Flat1_2F_Text_WonderfulLetsHearSuggestion, MSGBOX_DEFAULT + goto RustboroCity_Flat1_2F_EventScript_GivePhrase -RustboroCity_Flat1_2F_EventScript_2151AD:: @ 82151AD - msgbox RustboroCity_Flat1_2F_Text_215448, MSGBOX_YESNO +RustboroCity_Flat1_2F_EventScript_WaldasDadNewPhrase:: @ 82151AD + msgbox RustboroCity_Flat1_2F_Text_BeenSayingXDoYouKnowBetterPhrase, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq RustboroCity_Flat1_2F_EventScript_2151CD - msgbox RustboroCity_Flat1_2F_Text_2154AD, MSGBOX_DEFAULT - goto RustboroCity_Flat1_2F_EventScript_215157 + goto_if_eq RustboroCity_Flat1_2F_EventScript_DeclineGivePhrase + msgbox RustboroCity_Flat1_2F_Text_WonderfulLetsHearSuggestion, MSGBOX_DEFAULT + goto RustboroCity_Flat1_2F_EventScript_GivePhrase -RustboroCity_Flat1_2F_EventScript_2151CD:: @ 82151CD - msgbox RustboroCity_Flat1_2F_Text_2154E7, MSGBOX_DEFAULT +RustboroCity_Flat1_2F_EventScript_DeclineGivePhrase:: @ 82151CD + msgbox RustboroCity_Flat1_2F_Text_OhIsThatRight, MSGBOX_DEFAULT release end -RustboroCity_Flat1_2F_EventScript_2151D7:: @ 82151D7 - msgbox RustboroCity_Flat1_2F_Text_2156E3, MSGBOX_DEFAULT +RustboroCity_Flat1_2F_EventScript_CancelGivePhrase:: @ 82151D7 + msgbox RustboroCity_Flat1_2F_Text_OhYouDontKnowAny, MSGBOX_DEFAULT release end -RustboroCity_Flat1_2F_EventScript_2151E1:: @ 82151E1 - msgbox RustboroCity_Flat1_2F_Text_21561E, MSGBOX_DEFAULT - call RustboroCity_Flat1_2F_EventScript_215238 - msgbox RustboroCity_Flat1_2F_Text_215699, MSGBOX_DEFAULT +RustboroCity_Flat1_2F_EventScript_CancelGiveFirstPhrase:: @ 82151E1 + msgbox RustboroCity_Flat1_2F_Text_ThinkOfMyOwnPhrase, MSGBOX_DEFAULT + call RustboroCity_Flat1_2F_EventScript_WaldasDadFaceWalda + msgbox RustboroCity_Flat1_2F_Text_ShesNotSmilingAtAll2, MSGBOX_DEFAULT release end -RustboroCity_Flat1_2F_EventScript_2151F8:: @ 82151F8 - msgbox RustboroCity_Flat1_2F_Text_215535, MSGBOX_DEFAULT - call RustboroCity_Flat1_2F_EventScript_215238 - msgbox RustboroCity_Flat1_2F_Text_215565, MSGBOX_DEFAULT +RustboroCity_Flat1_2F_EventScript_WaldaLikesPhrase:: @ 82151F8 + msgbox RustboroCity_Flat1_2F_Text_LetsGiveItATry2, MSGBOX_DEFAULT + call RustboroCity_Flat1_2F_EventScript_WaldasDadFaceWalda + msgbox RustboroCity_Flat1_2F_Text_OhShesLaughing, MSGBOX_DEFAULT applymovement 6, Common_Movement_FacePlayer waitmovement 0 - msgbox RustboroCity_Flat1_2F_Text_215792, MSGBOX_DEFAULT + msgbox RustboroCity_Flat1_2F_Text_ThankYouIllGiveYouWallpaper, MSGBOX_DEFAULT release end -RustboroCity_Flat1_2F_EventScript_215221:: @ 8215221 - msgbox RustboroCity_Flat1_2F_Text_2155A4, MSGBOX_DEFAULT - call RustboroCity_Flat1_2F_EventScript_215238 - msgbox RustboroCity_Flat1_2F_Text_2155D4, MSGBOX_DEFAULT +RustboroCity_Flat1_2F_EventScript_WaldaDoesntLikePhrase:: @ 8215221 + msgbox RustboroCity_Flat1_2F_Text_LetsGiveItATry, MSGBOX_DEFAULT + call RustboroCity_Flat1_2F_EventScript_WaldasDadFaceWalda + msgbox RustboroCity_Flat1_2F_Text_ShesNotSmilingAtAll, MSGBOX_DEFAULT release end -RustboroCity_Flat1_2F_EventScript_215238:: @ 8215238 +RustboroCity_Flat1_2F_EventScript_WaldasDadFaceWalda:: @ 8215238 turnobject 6, DIR_EAST return -RustboroCity_Flat1_2F_EventScript_21523D:: @ 821523D - msgbox RustboroCity_Flat1_2F_Text_21524F, MSGBOX_NPC +RustboroCity_Flat1_2F_EventScript_WaldasMom:: @ 821523D + msgbox RustboroCity_Flat1_2F_Text_ComingUpWithMealsIsHard, MSGBOX_NPC end -RustboroCity_Flat1_2F_EventScript_215246:: @ 8215246 - msgbox RustboroCity_Flat1_2F_Text_215923, MSGBOX_SIGN +RustboroCity_Flat1_2F_EventScript_PokeDoll:: @ 8215246 + msgbox RustboroCity_Flat1_2F_Text_ItsAPokemonPlushDoll, MSGBOX_SIGN end -RustboroCity_Flat1_2F_Text_21524F: @ 821524F +RustboroCity_Flat1_2F_Text_ComingUpWithMealsIsHard: @ 821524F .string "Oh, it's so hard every day…\p" .string "What's hard?\n" .string "You need to ask?\p" @@ -93,7 +93,7 @@ RustboroCity_Flat1_2F_Text_21524F: @ 821524F .string "It really isn't easy coming up with\n" .string "meals every day.$" -RustboroCity_Flat1_2F_Text_2152FA: @ 82152FA +RustboroCity_Flat1_2F_Text_HelloDoYouKnowFunnyPhrase: @ 82152FA .string "Oh, hello!\n" .string "Welcome to the PEPPER household.\p" .string "I have a question for you.\n" @@ -107,62 +107,62 @@ RustboroCity_Flat1_2F_Text_2152FA: @ 82152FA .string "Do you know of a funny word or\n" .string "phrase you can tell me?$" -RustboroCity_Flat1_2F_Text_215448: @ 8215448 +RustboroCity_Flat1_2F_Text_BeenSayingXDoYouKnowBetterPhrase: @ 8215448 .string "I've been saying “{STR_VAR_1}”\n" .string "to amuse her lately.\p" .string "Do you know of a better word or\n" .string "a phrase that might work?$" -RustboroCity_Flat1_2F_Text_2154AD: @ 82154AD +RustboroCity_Flat1_2F_Text_WonderfulLetsHearSuggestion: @ 82154AD .string "Oh, that's wonderful.\n" .string "So, let's hear it, your suggestion.$" -RustboroCity_Flat1_2F_Text_2154E7: @ 82154E7 +RustboroCity_Flat1_2F_Text_OhIsThatRight: @ 82154E7 .string "Oh, is that right?\p" .string "Well, if you come up with a good\n" .string "suggestion, I'm all ears.$" -RustboroCity_Flat1_2F_Text_215535: @ 8215535 +RustboroCity_Flat1_2F_Text_LetsGiveItATry2: @ 8215535 .string "Ah, I see.\n" .string "Well, let's give it a try, shall we?$" -RustboroCity_Flat1_2F_Text_215565: @ 8215565 +RustboroCity_Flat1_2F_Text_OhShesLaughing: @ 8215565 .string "{STR_VAR_1}.\n" .string "{STR_VAR_1}.\p" .string "Oh, yes! She's laughing!\n" .string "Oh, I am as delighted as she!$" -RustboroCity_Flat1_2F_Text_2155A4: @ 82155A4 +RustboroCity_Flat1_2F_Text_LetsGiveItATry: @ 82155A4 .string "Ah, I see.\n" .string "Well, let's give it a try, shall we?$" -RustboroCity_Flat1_2F_Text_2155D4: @ 82155D4 +RustboroCity_Flat1_2F_Text_ShesNotSmilingAtAll: @ 82155D4 .string "{STR_VAR_1}.\n" .string "{STR_VAR_1}.\p" .string "Hmmm… She's not smiling at all.\n" .string "Maybe WALDA is one serious child…$" -RustboroCity_Flat1_2F_Text_21561E: @ 821561E +RustboroCity_Flat1_2F_Text_ThinkOfMyOwnPhrase: @ 821561E .string "Oh, so you don't know any good words.\n" .string "I'd better think for myself, then.\p" .string "Hmm…\n" .string "How about “{STR_VAR_1}”?\l" .string "Let's see if that will work.$" -RustboroCity_Flat1_2F_Text_215699: @ 8215699 +RustboroCity_Flat1_2F_Text_ShesNotSmilingAtAll2: @ 8215699 .string "{STR_VAR_1}.\n" .string "{STR_VAR_1}.\p" .string "Hmmm… She's not smiling at all.\n" .string "Maybe WALDA is one serious child…$" -RustboroCity_Flat1_2F_Text_2156E3: @ 82156E3 +RustboroCity_Flat1_2F_Text_OhYouDontKnowAny: @ 82156E3 .string "Oh, so you don't know any good words.\n" .string "I guess I'll try to amuse her with\l" .string "the saying I used before.\p" .string "Anyways, if you have a good suggestion,\n" .string "don't hesitate in telling me, okay?$" -RustboroCity_Flat1_2F_Text_215792: @ 8215792 +RustboroCity_Flat1_2F_Text_ThankYouIllGiveYouWallpaper: @ 8215792 .string "Thank you!\p" .string "Thanks to you, my darling WALDA\n" .string "laughed for me!\p" @@ -179,6 +179,6 @@ RustboroCity_Flat1_2F_Text_215792: @ 8215792 .string "That will give you access to the new\n" .string "wallpaper patterns.$" -RustboroCity_Flat1_2F_Text_215923: @ 8215923 +RustboroCity_Flat1_2F_Text_ItsAPokemonPlushDoll: @ 8215923 .string "It's a POKéMON plush DOLL!$" diff --git a/data/maps/RustboroCity_Flat2_1F/map.json b/data/maps/RustboroCity_Flat2_1F/map.json index 6d10fe9d8..6ca0fbd1b 100644 --- a/data/maps/RustboroCity_Flat2_1F/map.json +++ b/data/maps/RustboroCity_Flat2_1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Flat2_1F_EventScript_215F80", + "script": "RustboroCity_Flat2_1F_EventScript_Skitty", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Flat2_1F_EventScript_215F77", + "script": "RustboroCity_Flat2_1F_EventScript_OldWoman", "flag": "0" } ], diff --git a/data/maps/RustboroCity_Flat2_1F/scripts.inc b/data/maps/RustboroCity_Flat2_1F/scripts.inc index 8fc7e4972..182060955 100644 --- a/data/maps/RustboroCity_Flat2_1F/scripts.inc +++ b/data/maps/RustboroCity_Flat2_1F/scripts.inc @@ -1,24 +1,24 @@ RustboroCity_Flat2_1F_MapScripts:: @ 8215F76 .byte 0 -RustboroCity_Flat2_1F_EventScript_215F77:: @ 8215F77 - msgbox RustboroCity_Flat2_1F_Text_215F93, MSGBOX_NPC +RustboroCity_Flat2_1F_EventScript_OldWoman:: @ 8215F77 + msgbox RustboroCity_Flat2_1F_Text_DevonWorkersLiveHere, MSGBOX_NPC end -RustboroCity_Flat2_1F_EventScript_215F80:: @ 8215F80 +RustboroCity_Flat2_1F_EventScript_Skitty:: @ 8215F80 lock faceplayer waitse playmoncry SPECIES_SKITTY, 0 - msgbox RustboroCity_Flat2_1F_Text_215FC6, MSGBOX_DEFAULT + msgbox RustboroCity_Flat2_1F_Text_Skitty, MSGBOX_DEFAULT waitmoncry release end -RustboroCity_Flat2_1F_Text_215F93: @ 8215F93 +RustboroCity_Flat2_1F_Text_DevonWorkersLiveHere: @ 8215F93 .string "DEVON CORPORATION's workers live in\n" .string "this building.$" -RustboroCity_Flat2_1F_Text_215FC6: @ 8215FC6 +RustboroCity_Flat2_1F_Text_Skitty: @ 8215FC6 .string "SKITTY: Gyaaaah!$" diff --git a/data/maps/RustboroCity_Flat2_2F/map.json b/data/maps/RustboroCity_Flat2_2F/map.json index a7d254e4d..9667ebf92 100644 --- a/data/maps/RustboroCity_Flat2_2F/map.json +++ b/data/maps/RustboroCity_Flat2_2F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Flat2_2F_EventScript_215FD8", + "script": "RustboroCity_Flat2_2F_EventScript_OldMan", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Flat2_2F_EventScript_215FE1", + "script": "RustboroCity_Flat2_2F_EventScript_NinjaBoy", "flag": "0" } ], diff --git a/data/maps/RustboroCity_Flat2_2F/scripts.inc b/data/maps/RustboroCity_Flat2_2F/scripts.inc index d4b940c9f..f328b71c1 100644 --- a/data/maps/RustboroCity_Flat2_2F/scripts.inc +++ b/data/maps/RustboroCity_Flat2_2F/scripts.inc @@ -1,15 +1,15 @@ RustboroCity_Flat2_2F_MapScripts:: @ 8215FD7 .byte 0 -RustboroCity_Flat2_2F_EventScript_215FD8:: @ 8215FD8 - msgbox RustboroCity_Flat2_2F_Text_21601A, MSGBOX_NPC +RustboroCity_Flat2_2F_EventScript_OldMan:: @ 8215FD8 + msgbox RustboroCity_Flat2_2F_Text_DevonWasTinyInOldDays, MSGBOX_NPC end -RustboroCity_Flat2_2F_EventScript_215FE1:: @ 8215FE1 +RustboroCity_Flat2_2F_EventScript_NinjaBoy:: @ 8215FE1 lock faceplayer - goto_if_set FLAG_RECEIVED_PREMIER_BALL_RUSTBORO, RustboroCity_Flat2_2F_EventScript_216010 - msgbox RustboroCity_Flat2_2F_Text_21605A, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_PREMIER_BALL_RUSTBORO, RustboroCity_Flat2_2F_EventScript_GavePremierBall + msgbox RustboroCity_Flat2_2F_Text_MyDaddyMadeThisYouCanHaveIt, MSGBOX_DEFAULT giveitem_std ITEM_PREMIER_BALL compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull @@ -17,21 +17,21 @@ RustboroCity_Flat2_2F_EventScript_215FE1:: @ 8215FE1 release end -RustboroCity_Flat2_2F_EventScript_216010:: @ 8216010 - msgbox RustboroCity_Flat2_2F_Text_2160BD, MSGBOX_DEFAULT +RustboroCity_Flat2_2F_EventScript_GavePremierBall:: @ 8216010 + msgbox RustboroCity_Flat2_2F_Text_GoingToWorkAtDevonToo, MSGBOX_DEFAULT release end -RustboroCity_Flat2_2F_Text_21601A: @ 821601A +RustboroCity_Flat2_2F_Text_DevonWasTinyInOldDays: @ 821601A .string "Way back in the old days, DEVON was just\n" .string "a teeny, tiny company.$" -RustboroCity_Flat2_2F_Text_21605A: @ 821605A +RustboroCity_Flat2_2F_Text_MyDaddyMadeThisYouCanHaveIt: @ 821605A .string "My daddy's working at the CORPORATION.\p" .string "My daddy made this!\n" .string "But I can't use it, so you can have it.$" -RustboroCity_Flat2_2F_Text_2160BD: @ 82160BD +RustboroCity_Flat2_2F_Text_GoingToWorkAtDevonToo: @ 82160BD .string "My daddy's working at the CORPORATION.\p" .string "When I grow up, I'm going to work for\n" .string "DEVON, too.$" diff --git a/data/maps/RustboroCity_Flat2_3F/map.json b/data/maps/RustboroCity_Flat2_3F/map.json index 2366b5392..a9c1e40cd 100644 --- a/data/maps/RustboroCity_Flat2_3F/map.json +++ b/data/maps/RustboroCity_Flat2_3F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Flat2_3F_EventScript_216117", + "script": "RustboroCity_Flat2_3F_EventScript_DevonEmployee", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Flat2_3F_EventScript_216120", + "script": "RustboroCity_Flat2_3F_EventScript_Woman", "flag": "0" } ], diff --git a/data/maps/RustboroCity_Flat2_3F/scripts.inc b/data/maps/RustboroCity_Flat2_3F/scripts.inc index dd5a86dae..8af31531d 100644 --- a/data/maps/RustboroCity_Flat2_3F/scripts.inc +++ b/data/maps/RustboroCity_Flat2_3F/scripts.inc @@ -1,19 +1,19 @@ RustboroCity_Flat2_3F_MapScripts:: @ 8216116 .byte 0 -RustboroCity_Flat2_3F_EventScript_216117:: @ 8216117 - msgbox RustboroCity_Flat2_3F_Text_216129, MSGBOX_NPC +RustboroCity_Flat2_3F_EventScript_DevonEmployee:: @ 8216117 + msgbox RustboroCity_Flat2_3F_Text_PresidentCollectsRareStones, MSGBOX_NPC end -RustboroCity_Flat2_3F_EventScript_216120:: @ 8216120 - msgbox RustboroCity_Flat2_3F_Text_216159, MSGBOX_NPC +RustboroCity_Flat2_3F_EventScript_Woman:: @ 8216120 + msgbox RustboroCity_Flat2_3F_Text_PresidentsSonAlsoCollectsRareStones, MSGBOX_NPC end -RustboroCity_Flat2_3F_Text_216129: @ 8216129 +RustboroCity_Flat2_3F_Text_PresidentCollectsRareStones: @ 8216129 .string "DEVON's PRESIDENT likes to collect\n" .string "rare stones.$" -RustboroCity_Flat2_3F_Text_216159: @ 8216159 +RustboroCity_Flat2_3F_Text_PresidentsSonAlsoCollectsRareStones: @ 8216159 .string "I think the PRESIDENT's son also\n" .string "collects rare stones.$" diff --git a/data/maps/RustboroCity_House1/map.json b/data/maps/RustboroCity_House1/map.json index bc889d66b..5d3000846 100644 --- a/data/maps/RustboroCity_House1/map.json +++ b/data/maps/RustboroCity_House1/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_House1_EventScript_21593F", + "script": "RustboroCity_House1_EventScript_Trader", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_House1_EventScript_2159DF", + "script": "RustboroCity_House1_EventScript_Hiker", "flag": "0" } ], diff --git a/data/maps/RustboroCity_House1/scripts.inc b/data/maps/RustboroCity_House1/scripts.inc index f578b251b..cf1cec610 100644 --- a/data/maps/RustboroCity_House1/scripts.inc +++ b/data/maps/RustboroCity_House1/scripts.inc @@ -1,58 +1,58 @@ RustboroCity_House1_MapScripts:: @ 821593E .byte 0 -RustboroCity_House1_EventScript_21593F:: @ 821593F +RustboroCity_House1_EventScript_Trader:: @ 821593F lock faceplayer - goto_if_set FLAG_RUSTBORO_NPC_TRADE_COMPLETED, RustboroCity_House1_EventScript_2159D5 + goto_if_set FLAG_RUSTBORO_NPC_TRADE_COMPLETED, RustboroCity_House1_EventScript_TradeCompleted setvar VAR_0x8008, INGAME_TRADE_SEEDOT copyvar VAR_0x8004, VAR_0x8008 specialvar VAR_RESULT, GetInGameTradeSpeciesInfo copyvar VAR_0x8009, VAR_RESULT - msgbox RustboroCity_House1_Text_2159E8, MSGBOX_YESNO + msgbox RustboroCity_House1_Text_IllTradeIfYouWant, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq RustboroCity_House1_EventScript_2159BD + goto_if_eq RustboroCity_House1_EventScript_DeclineTrade special ChoosePartyMon waitstate copyvar VAR_0x800A, VAR_0x8004 compare VAR_0x8004, 255 - goto_if_eq RustboroCity_House1_EventScript_2159BD + goto_if_eq RustboroCity_House1_EventScript_DeclineTrade copyvar VAR_0x8005, VAR_0x800A specialvar VAR_RESULT, GetTradeSpecies copyvar VAR_0x800B, VAR_RESULT compare VAR_RESULT, VAR_0x8009 - goto_if_ne RustboroCity_House1_EventScript_2159C7 + goto_if_ne RustboroCity_House1_EventScript_NotRequestedMon copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8005, VAR_0x800A special CreateInGameTradePokemon special DoInGameTradeScene waitstate - msgbox RustboroCity_House1_Text_215A77, MSGBOX_DEFAULT + msgbox RustboroCity_House1_Text_PleaseBeGoodToMyPokemon, MSGBOX_DEFAULT setflag FLAG_RUSTBORO_NPC_TRADE_COMPLETED release end -RustboroCity_House1_EventScript_2159BD:: @ 82159BD - msgbox RustboroCity_House1_Text_215ACE, MSGBOX_DEFAULT +RustboroCity_House1_EventScript_DeclineTrade:: @ 82159BD + msgbox RustboroCity_House1_Text_YouDontWantToThatsOkay, MSGBOX_DEFAULT release end -RustboroCity_House1_EventScript_2159C7:: @ 82159C7 +RustboroCity_House1_EventScript_NotRequestedMon:: @ 82159C7 bufferspeciesname 0, VAR_0x8009 - msgbox RustboroCity_House1_Text_215A9D, MSGBOX_DEFAULT + msgbox RustboroCity_House1_Text_DoesntLookLikeMonToMe, MSGBOX_DEFAULT release end -RustboroCity_House1_EventScript_2159D5:: @ 82159D5 - msgbox RustboroCity_House1_Text_215B17, MSGBOX_DEFAULT +RustboroCity_House1_EventScript_TradeCompleted:: @ 82159D5 + msgbox RustboroCity_House1_Text_AnyPokemonCanBeCute, MSGBOX_DEFAULT release end -RustboroCity_House1_EventScript_2159DF:: @ 82159DF - msgbox RustboroCity_House1_Text_215B57, MSGBOX_NPC +RustboroCity_House1_EventScript_Hiker:: @ 82159DF + msgbox RustboroCity_House1_Text_AllSortsOfPlaces, MSGBOX_NPC end -RustboroCity_House1_Text_2159E8: @ 82159E8 +RustboroCity_House1_Text_IllTradeIfYouWant: @ 82159E8 .string "Huh? My POKéMON is cute?\n" .string "Sure, I knew that.\p" .string "But if you really want, I'm willing\n" @@ -60,23 +60,23 @@ RustboroCity_House1_Text_2159E8: @ 82159E8 .string "I'll trade you my {STR_VAR_2} for\n" .string "a {STR_VAR_1} if you want.$" -RustboroCity_House1_Text_215A77: @ 8215A77 +RustboroCity_House1_Text_PleaseBeGoodToMyPokemon: @ 8215A77 .string "Eheheh…\n" .string "Please be good to my POKéMON.$" -RustboroCity_House1_Text_215A9D: @ 8215A9D +RustboroCity_House1_Text_DoesntLookLikeMonToMe: @ 8215A9D .string "Huh? That doesn't look anything like\n" .string "a {STR_VAR_1} to me.$" -RustboroCity_House1_Text_215ACE: @ 8215ACE +RustboroCity_House1_Text_YouDontWantToThatsOkay: @ 8215ACE .string "Oh, if you don't want to, that's okay.\n" .string "But my POKéMON is cute, you know…$" -RustboroCity_House1_Text_215B17: @ 8215B17 +RustboroCity_House1_Text_AnyPokemonCanBeCute: @ 8215B17 .string "Any POKéMON can be cute if you raise\n" .string "it with care and kindness.$" -RustboroCity_House1_Text_215B57: @ 8215B57 +RustboroCity_House1_Text_AllSortsOfPlaces: @ 8215B57 .string "In all sorts of places, there are all\n" .string "sorts of POKéMON and people.\p" .string "I find that fascinating, so I go to all\n" diff --git a/data/maps/RustboroCity_House2/map.json b/data/maps/RustboroCity_House2/map.json index b10b2c074..6dcd38ab4 100644 --- a/data/maps/RustboroCity_House2/map.json +++ b/data/maps/RustboroCity_House2/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_House2_EventScript_215EB4", + "script": "RustboroCity_House2_EventScript_PokefanF", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_House2_EventScript_215EBD", + "script": "RustboroCity_House2_EventScript_LittleGirl", "flag": "0" } ], diff --git a/data/maps/RustboroCity_House2/scripts.inc b/data/maps/RustboroCity_House2/scripts.inc index 632eb6877..c8e80ee9f 100644 --- a/data/maps/RustboroCity_House2/scripts.inc +++ b/data/maps/RustboroCity_House2/scripts.inc @@ -1,20 +1,20 @@ RustboroCity_House2_MapScripts:: @ 8215EB3 .byte 0 -RustboroCity_House2_EventScript_215EB4:: @ 8215EB4 - msgbox RustboroCity_House2_Text_215EC6, MSGBOX_NPC +RustboroCity_House2_EventScript_PokefanF:: @ 8215EB4 + msgbox RustboroCity_House2_Text_TrainerSchoolExcellent, MSGBOX_NPC end -RustboroCity_House2_EventScript_215EBD:: @ 8215EBD - msgbox RustboroCity_House2_Text_215F21, MSGBOX_NPC +RustboroCity_House2_EventScript_LittleGirl:: @ 8215EBD + msgbox RustboroCity_House2_Text_RoxanneKnowsALot, MSGBOX_NPC end -RustboroCity_House2_Text_215EC6: @ 8215EC6 +RustboroCity_House2_Text_TrainerSchoolExcellent: @ 8215EC6 .string "The TRAINER'S SCHOOL is excellent.\p" .string "If you study there, you could even\n" .string "become a GYM LEADER.$" -RustboroCity_House2_Text_215F21: @ 8215F21 +RustboroCity_House2_Text_RoxanneKnowsALot: @ 8215F21 .string "ROXANNE, the GYM LEADER, really knows\n" .string "a lot about POKéMON.\p" .string "She's really strong, too!$" diff --git a/data/maps/RustboroCity_House3/map.json b/data/maps/RustboroCity_House3/map.json index 50b5f1295..66fa98833 100644 --- a/data/maps/RustboroCity_House3/map.json +++ b/data/maps/RustboroCity_House3/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_House3_EventScript_216191", + "script": "RustboroCity_House3_EventScript_OldMan", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_House3_EventScript_21619A", + "script": "RustboroCity_House3_EventScript_OldWoman", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_House3_EventScript_2161A3", + "script": "RustboroCity_House3_EventScript_Pekachu", "flag": "0" } ], diff --git a/data/maps/RustboroCity_House3/scripts.inc b/data/maps/RustboroCity_House3/scripts.inc index 04992fbba..d55166e67 100644 --- a/data/maps/RustboroCity_House3/scripts.inc +++ b/data/maps/RustboroCity_House3/scripts.inc @@ -1,36 +1,37 @@ RustboroCity_House3_MapScripts:: @ 8216190 .byte 0 -RustboroCity_House3_EventScript_216191:: @ 8216191 - msgbox RustboroCity_House3_Text_2161B6, MSGBOX_NPC +RustboroCity_House3_EventScript_OldMan:: @ 8216191 + msgbox RustboroCity_House3_Text_IGivePerfectlySuitedNicknames, MSGBOX_NPC end -RustboroCity_House3_EventScript_21619A:: @ 821619A - msgbox RustboroCity_House3_Text_21622A, MSGBOX_NPC +RustboroCity_House3_EventScript_OldWoman:: @ 821619A + msgbox RustboroCity_House3_Text_NamingPikachuPekachu, MSGBOX_NPC end -RustboroCity_House3_EventScript_2161A3:: @ 82161A3 +@ Misspelling on purpose, see nickname +RustboroCity_House3_EventScript_Pekachu:: @ 82161A3 lock faceplayer waitse playmoncry SPECIES_PIKACHU, 0 - msgbox RustboroCity_House3_Text_2162AB, MSGBOX_DEFAULT + msgbox RustboroCity_House3_Text_Pekachu, MSGBOX_DEFAULT waitmoncry release end -RustboroCity_House3_Text_2161B6: @ 82161B6 +RustboroCity_House3_Text_IGivePerfectlySuitedNicknames: @ 82161B6 .string "For my own POKéMON, I give them\n" .string "perfectly suited nicknames!\p" .string "It's my expression of, uh…\n" .string "originality, yes, that's it!$" -RustboroCity_House3_Text_21622A: @ 821622A +RustboroCity_House3_Text_NamingPikachuPekachu: @ 821622A .string "But giving the name PEKACHU to\n" .string "a PIKACHU? It seems pointless.\p" .string "I suppose it is good to use a name\n" .string "that's easy to understand, but…$" -RustboroCity_House3_Text_2162AB: @ 82162AB +RustboroCity_House3_Text_Pekachu: @ 82162AB .string "PEKACHU: Peka!$" diff --git a/data/maps/RustboroCity_PokemonSchool/map.json b/data/maps/RustboroCity_PokemonSchool/map.json index 614b123c4..a60add1ee 100644 --- a/data/maps/RustboroCity_PokemonSchool/map.json +++ b/data/maps/RustboroCity_PokemonSchool/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_PokemonSchool_EventScript_213F5F", + "script": "RustboroCity_PokemonSchool_EventScript_GameboyKid1", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_PokemonSchool_EventScript_213F68", + "script": "RustboroCity_PokemonSchool_EventScript_GameboyKid2", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_PokemonSchool_EventScript_213F71", + "script": "RustboroCity_PokemonSchool_EventScript_RichBoy", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_PokemonSchool_EventScript_213F7A", + "script": "RustboroCity_PokemonSchool_EventScript_Lass", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_PokemonSchool_EventScript_213F83", + "script": "RustboroCity_PokemonSchool_EventScript_SchoolKidM", "flag": "0" }, { @@ -89,7 +89,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_PokemonSchool_EventScript_213F95", + "script": "RustboroCity_PokemonSchool_EventScript_Teacher", "flag": "0" }, { @@ -102,7 +102,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_PokemonSchool_EventScript_214040", + "script": "RustboroCity_PokemonSchool_EventScript_Scott", "flag": "FLAG_HIDE_RUSTBORO_CITY_POKEMON_SCHOOL_SCOTT" } ], @@ -130,7 +130,7 @@ "y": 2, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "RustboroCity_PokemonSchool_EventScript_213EA9" + "script": "RustboroCity_PokemonSchool_EventScript_Blackboard" }, { "type": "sign", @@ -138,7 +138,7 @@ "y": 2, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "RustboroCity_PokemonSchool_EventScript_213EA9" + "script": "RustboroCity_PokemonSchool_EventScript_Blackboard" }, { "type": "sign", @@ -146,7 +146,7 @@ "y": 2, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "RustboroCity_PokemonSchool_EventScript_213EA9" + "script": "RustboroCity_PokemonSchool_EventScript_Blackboard" }, { "type": "sign", @@ -154,7 +154,7 @@ "y": 2, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "RustboroCity_PokemonSchool_EventScript_213EA9" + "script": "RustboroCity_PokemonSchool_EventScript_Blackboard" }, { "type": "sign", @@ -162,7 +162,7 @@ "y": 5, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "RustboroCity_PokemonSchool_EventScript_213F8C" + "script": "RustboroCity_PokemonSchool_EventScript_StudentNotebook" } ] } \ No newline at end of file diff --git a/data/maps/RustboroCity_PokemonSchool/scripts.inc b/data/maps/RustboroCity_PokemonSchool/scripts.inc index db4bf21f0..9fb4146da 100644 --- a/data/maps/RustboroCity_PokemonSchool/scripts.inc +++ b/data/maps/RustboroCity_PokemonSchool/scripts.inc @@ -1,88 +1,88 @@ RustboroCity_PokemonSchool_MapScripts:: @ 8213EA8 .byte 0 -RustboroCity_PokemonSchool_EventScript_213EA9:: @ 8213EA9 +RustboroCity_PokemonSchool_EventScript_Blackboard:: @ 8213EA9 lockall - msgbox RustboroCity_PokemonSchool_Text_2140B2, MSGBOX_DEFAULT - goto RustboroCity_PokemonSchool_EventScript_213EB8 + msgbox RustboroCity_PokemonSchool_Text_BlackboardListsStatusChanges, MSGBOX_DEFAULT + goto RustboroCity_PokemonSchool_EventScript_ChooseBlackboardTopic end -RustboroCity_PokemonSchool_EventScript_213EB8:: @ 8213EB8 - message RustboroCity_PokemonSchool_Text_2140F9 +RustboroCity_PokemonSchool_EventScript_ChooseBlackboardTopic:: @ 8213EB8 + message RustboroCity_PokemonSchool_Text_ReadWhichTopic waitmessage multichoicegrid 8, 1, MULTI_STATUS_INFO, 3, 0 switch VAR_RESULT - case 0, RustboroCity_PokemonSchool_EventScript_213F17 - case 1, RustboroCity_PokemonSchool_EventScript_213F25 - case 2, RustboroCity_PokemonSchool_EventScript_213F33 - case 3, RustboroCity_PokemonSchool_EventScript_213F41 - case 4, RustboroCity_PokemonSchool_EventScript_213F4F - case 5, RustboroCity_PokemonSchool_EventScript_213F5D - case MULTI_B_PRESSED, RustboroCity_PokemonSchool_EventScript_213F5D + case 0, RustboroCity_PokemonSchool_EventScript_Poison + case 1, RustboroCity_PokemonSchool_EventScript_Paralysis + case 2, RustboroCity_PokemonSchool_EventScript_Sleep + case 3, RustboroCity_PokemonSchool_EventScript_Burn + case 4, RustboroCity_PokemonSchool_EventScript_Freeze + case 5, RustboroCity_PokemonSchool_EventScript_ExitTopicSelect + case MULTI_B_PRESSED, RustboroCity_PokemonSchool_EventScript_ExitTopicSelect end -RustboroCity_PokemonSchool_EventScript_213F17:: @ 8213F17 - msgbox RustboroCity_PokemonSchool_Text_21411A, MSGBOX_DEFAULT - goto RustboroCity_PokemonSchool_EventScript_213EB8 +RustboroCity_PokemonSchool_EventScript_Poison:: @ 8213F17 + msgbox RustboroCity_PokemonSchool_Text_ExplainPoison, MSGBOX_DEFAULT + goto RustboroCity_PokemonSchool_EventScript_ChooseBlackboardTopic end -RustboroCity_PokemonSchool_EventScript_213F25:: @ 8213F25 - msgbox RustboroCity_PokemonSchool_Text_2141D8, MSGBOX_DEFAULT - goto RustboroCity_PokemonSchool_EventScript_213EB8 +RustboroCity_PokemonSchool_EventScript_Paralysis:: @ 8213F25 + msgbox RustboroCity_PokemonSchool_Text_ExplainParalysis, MSGBOX_DEFAULT + goto RustboroCity_PokemonSchool_EventScript_ChooseBlackboardTopic end -RustboroCity_PokemonSchool_EventScript_213F33:: @ 8213F33 - msgbox RustboroCity_PokemonSchool_Text_21427D, MSGBOX_DEFAULT - goto RustboroCity_PokemonSchool_EventScript_213EB8 +RustboroCity_PokemonSchool_EventScript_Sleep:: @ 8213F33 + msgbox RustboroCity_PokemonSchool_Text_ExplainSleep, MSGBOX_DEFAULT + goto RustboroCity_PokemonSchool_EventScript_ChooseBlackboardTopic end -RustboroCity_PokemonSchool_EventScript_213F41:: @ 8213F41 - msgbox RustboroCity_PokemonSchool_Text_214336, MSGBOX_DEFAULT - goto RustboroCity_PokemonSchool_EventScript_213EB8 +RustboroCity_PokemonSchool_EventScript_Burn:: @ 8213F41 + msgbox RustboroCity_PokemonSchool_Text_ExplainBurn, MSGBOX_DEFAULT + goto RustboroCity_PokemonSchool_EventScript_ChooseBlackboardTopic end -RustboroCity_PokemonSchool_EventScript_213F4F:: @ 8213F4F - msgbox RustboroCity_PokemonSchool_Text_2143B8, MSGBOX_DEFAULT - goto RustboroCity_PokemonSchool_EventScript_213EB8 +RustboroCity_PokemonSchool_EventScript_Freeze:: @ 8213F4F + msgbox RustboroCity_PokemonSchool_Text_ExplainFreeze, MSGBOX_DEFAULT + goto RustboroCity_PokemonSchool_EventScript_ChooseBlackboardTopic end -RustboroCity_PokemonSchool_EventScript_213F5D:: @ 8213F5D +RustboroCity_PokemonSchool_EventScript_ExitTopicSelect:: @ 8213F5D releaseall end -RustboroCity_PokemonSchool_EventScript_213F5F:: @ 8213F5F - msgbox RustboroCity_PokemonSchool_Text_21459F, MSGBOX_NPC +RustboroCity_PokemonSchool_EventScript_GameboyKid1:: @ 8213F5F + msgbox RustboroCity_PokemonSchool_Text_TradingRightNow, MSGBOX_NPC end -RustboroCity_PokemonSchool_EventScript_213F68:: @ 8213F68 - msgbox RustboroCity_PokemonSchool_Text_2145CD, MSGBOX_NPC +RustboroCity_PokemonSchool_EventScript_GameboyKid2:: @ 8213F68 + msgbox RustboroCity_PokemonSchool_Text_AlwaysWantedSeedot, MSGBOX_NPC end -RustboroCity_PokemonSchool_EventScript_213F71:: @ 8213F71 - msgbox RustboroCity_PokemonSchool_Text_214604, MSGBOX_NPC +RustboroCity_PokemonSchool_EventScript_RichBoy:: @ 8213F71 + msgbox RustboroCity_PokemonSchool_Text_PokemontCantUseManMadeItems, MSGBOX_NPC end -RustboroCity_PokemonSchool_EventScript_213F7A:: @ 8213F7A - msgbox RustboroCity_PokemonSchool_Text_214669, MSGBOX_NPC +RustboroCity_PokemonSchool_EventScript_Lass:: @ 8213F7A + msgbox RustboroCity_PokemonSchool_Text_ConfusedPokemonAttacksItself, MSGBOX_NPC end -RustboroCity_PokemonSchool_EventScript_213F83:: @ 8213F83 - msgbox RustboroCity_PokemonSchool_Text_214719, MSGBOX_NPC +RustboroCity_PokemonSchool_EventScript_SchoolKidM:: @ 8213F83 + msgbox RustboroCity_PokemonSchool_Text_PokemonHealItselfWithBerry, MSGBOX_NPC end -RustboroCity_PokemonSchool_EventScript_213F8C:: @ 8213F8C - msgbox RustboroCity_PokemonSchool_Text_2147A2, MSGBOX_SIGN +RustboroCity_PokemonSchool_EventScript_StudentNotebook:: @ 8213F8C + msgbox RustboroCity_PokemonSchool_Text_StudentsNotes, MSGBOX_SIGN end -RustboroCity_PokemonSchool_EventScript_213F95:: @ 8213F95 +RustboroCity_PokemonSchool_EventScript_Teacher:: @ 8213F95 lock faceplayer - goto_if_set FLAG_RECEIVED_QUICK_CLAW, RustboroCity_PokemonSchool_EventScript_213FFB + goto_if_set FLAG_RECEIVED_QUICK_CLAW, RustboroCity_PokemonSchool_EventScript_GaveQuickClaw compare VAR_FACING, DIR_EAST - call_if_eq RustboroCity_PokemonSchool_EventScript_213FE5 + call_if_eq RustboroCity_PokemonSchool_EventScript_TeacherCheckOnStudentsEast compare VAR_FACING, DIR_WEST - call_if_eq RustboroCity_PokemonSchool_EventScript_213FF0 - msgbox RustboroCity_PokemonSchool_Text_214433, MSGBOX_DEFAULT + call_if_eq RustboroCity_PokemonSchool_EventScript_TeacherCheckOnStudentsWest + msgbox RustboroCity_PokemonSchool_Text_StudentsWhoDontStudyGetQuickClaw, MSGBOX_DEFAULT giveitem_std ITEM_QUICK_CLAW compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull @@ -93,25 +93,25 @@ RustboroCity_PokemonSchool_EventScript_213F95:: @ 8213F95 release end -RustboroCity_PokemonSchool_EventScript_213FE5:: @ 8213FE5 - applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_214027 +RustboroCity_PokemonSchool_EventScript_TeacherCheckOnStudentsEast:: @ 8213FE5 + applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_TeacherCheckOnStudentsEast waitmovement 0 return -RustboroCity_PokemonSchool_EventScript_213FF0:: @ 8213FF0 - applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_214010 +RustboroCity_PokemonSchool_EventScript_TeacherCheckOnStudentsWest:: @ 8213FF0 + applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_TeacherCheckOnStudentsWest waitmovement 0 return -RustboroCity_PokemonSchool_EventScript_213FFB:: @ 8213FFB - msgbox RustboroCity_PokemonSchool_Text_2144C8, MSGBOX_DEFAULT +RustboroCity_PokemonSchool_EventScript_GaveQuickClaw:: @ 8213FFB + msgbox RustboroCity_PokemonSchool_Text_ExplainQuickClaw, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown waitmovement 0 release end -RustboroCity_PokemonSchool_Movement_214010: @ 8214010 +RustboroCity_PokemonSchool_Movement_TeacherCheckOnStudentsWest: @ 8214010 walk_left walk_down walk_down @@ -136,7 +136,7 @@ RustboroCity_PokemonSchool_Movement_214010: @ 8214010 walk_right step_end -RustboroCity_PokemonSchool_Movement_214027: @ 8214027 +RustboroCity_PokemonSchool_Movement_TeacherCheckOnStudentsEast: @ 8214027 walk_right walk_right walk_down @@ -163,53 +163,53 @@ RustboroCity_PokemonSchool_Movement_214027: @ 8214027 walk_left step_end -RustboroCity_PokemonSchool_EventScript_214040:: @ 8214040 +RustboroCity_PokemonSchool_EventScript_Scott:: @ 8214040 lock faceplayer - goto_if_set FLAG_MET_SCOTT_AFTER_OBTAINING_STONE_BADGE, RustboroCity_PokemonSchool_EventScript_2140A8 - goto_if_set FLAG_MET_SCOTT_RUSTBORO, RustboroCity_PokemonSchool_EventScript_21406F - goto_if_set FLAG_BADGE01_GET, RustboroCity_PokemonSchool_EventScript_214082 - msgbox RustboroCity_PokemonSchool_Text_2148C0, MSGBOX_DEFAULT + goto_if_set FLAG_MET_SCOTT_AFTER_OBTAINING_STONE_BADGE, RustboroCity_PokemonSchool_EventScript_ScottWatchStudents + goto_if_set FLAG_MET_SCOTT_RUSTBORO, RustboroCity_PokemonSchool_EventScript_ScottSpokeAlready + goto_if_set FLAG_BADGE01_GET, RustboroCity_PokemonSchool_EventScript_ScottGreetHasBadge + msgbox RustboroCity_PokemonSchool_Text_ScottMetAlreadyCut, MSGBOX_DEFAULT addvar VAR_SCOTT_STATE, 1 setflag FLAG_MET_SCOTT_RUSTBORO release end -RustboroCity_PokemonSchool_EventScript_21406F:: @ 821406F - goto_if_set FLAG_BADGE01_GET, RustboroCity_PokemonSchool_EventScript_214090 - msgbox RustboroCity_PokemonSchool_Text_214A5F, MSGBOX_DEFAULT +RustboroCity_PokemonSchool_EventScript_ScottSpokeAlready:: @ 821406F + goto_if_set FLAG_BADGE01_GET, RustboroCity_PokemonSchool_EventScript_ScottNoticeBadge + msgbox RustboroCity_PokemonSchool_Text_StudentTalentLevelUnknown, MSGBOX_DEFAULT release end -RustboroCity_PokemonSchool_EventScript_214082:: @ 8214082 - msgbox RustboroCity_PokemonSchool_Text_214B8A, MSGBOX_DEFAULT - goto RustboroCity_PokemonSchool_EventScript_21409E +RustboroCity_PokemonSchool_EventScript_ScottGreetHasBadge:: @ 8214082 + msgbox RustboroCity_PokemonSchool_Text_ScottMetAlreadyStoneBadge, MSGBOX_DEFAULT + goto RustboroCity_PokemonSchool_EventScript_MetScottAfterBadge end -RustboroCity_PokemonSchool_EventScript_214090:: @ 8214090 - msgbox RustboroCity_PokemonSchool_Text_214AB6, MSGBOX_DEFAULT - goto RustboroCity_PokemonSchool_EventScript_21409E +RustboroCity_PokemonSchool_EventScript_ScottNoticeBadge:: @ 8214090 + msgbox RustboroCity_PokemonSchool_Text_ScottStoneBadge, MSGBOX_DEFAULT + goto RustboroCity_PokemonSchool_EventScript_MetScottAfterBadge end -RustboroCity_PokemonSchool_EventScript_21409E:: @ 821409E +RustboroCity_PokemonSchool_EventScript_MetScottAfterBadge:: @ 821409E addvar VAR_SCOTT_STATE, 1 setflag FLAG_MET_SCOTT_AFTER_OBTAINING_STONE_BADGE release end -RustboroCity_PokemonSchool_EventScript_2140A8:: @ 82140A8 - msgbox RustboroCity_PokemonSchool_Text_214A5F, MSGBOX_DEFAULT +RustboroCity_PokemonSchool_EventScript_ScottWatchStudents:: @ 82140A8 + msgbox RustboroCity_PokemonSchool_Text_StudentTalentLevelUnknown, MSGBOX_DEFAULT release end -RustboroCity_PokemonSchool_Text_2140B2: @ 82140B2 +RustboroCity_PokemonSchool_Text_BlackboardListsStatusChanges: @ 82140B2 .string "The blackboard lists status changes\n" .string "that may affect POKéMON in battle.$" -RustboroCity_PokemonSchool_Text_2140F9: @ 82140F9 +RustboroCity_PokemonSchool_Text_ReadWhichTopic: @ 82140F9 .string "Which topic do you want to read?$" -RustboroCity_PokemonSchool_Text_21411A: @ 821411A +RustboroCity_PokemonSchool_Text_ExplainPoison: @ 821411A .string "If a POKéMON is poisoned, it will\n" .string "steadily lose HP.\p" .string "The effects of poison remain after\n" @@ -218,7 +218,7 @@ RustboroCity_PokemonSchool_Text_21411A: @ 821411A .string "while it is traveling.\p" .string "Heal a poisoning using an ANTIDOTE.$" -RustboroCity_PokemonSchool_Text_2141D8: @ 82141D8 +RustboroCity_PokemonSchool_Text_ExplainParalysis: @ 82141D8 .string "If a POKéMON becomes paralyzed,\n" .string "its SPEED drops.\p" .string "It may also not be able to move while\n" @@ -226,7 +226,7 @@ RustboroCity_PokemonSchool_Text_2141D8: @ 82141D8 .string "Paralysis remains after battle.\n" .string "Cure it using a PARLYZ HEAL.$" -RustboroCity_PokemonSchool_Text_21427D: @ 821427D +RustboroCity_PokemonSchool_Text_ExplainSleep: @ 821427D .string "If a POKéMON falls asleep, it will be\n" .string "unable to attack.\p" .string "A POKéMON may wake up on its own,\n" @@ -234,26 +234,26 @@ RustboroCity_PokemonSchool_Text_21427D: @ 821427D .string "sleeping, it will stay asleep.\p" .string "Wake it up using an AWAKENING.$" -RustboroCity_PokemonSchool_Text_214336: @ 8214336 +RustboroCity_PokemonSchool_Text_ExplainBurn: @ 8214336 .string "A burn reduces ATTACK power, and it\n" .string "steadily reduces the victim's HP.\p" .string "A burn lingers after battle.\n" .string "Cure a burn using a BURN HEAL.$" -RustboroCity_PokemonSchool_Text_2143B8: @ 82143B8 +RustboroCity_PokemonSchool_Text_ExplainFreeze: @ 82143B8 .string "If a POKéMON is frozen, it becomes\n" .string "completely helpless.\p" .string "It will remain frozen after battle.\n" .string "Thaw it out using an ICE HEAL.$" -RustboroCity_PokemonSchool_Text_214433: @ 8214433 +RustboroCity_PokemonSchool_Text_StudentsWhoDontStudyGetQuickClaw: @ 8214433 .string "Students who don't study get a little\n" .string "taste of my QUICK CLAW.\p" .string "Whether or not you are a good student \n" .string "will be evident from the way you use\l" .string "this item.$" -RustboroCity_PokemonSchool_Text_2144C8: @ 82144C8 +RustboroCity_PokemonSchool_Text_ExplainQuickClaw: @ 82144C8 .string "A POKéMON holding the QUICK CLAW will\n" .string "occasionally speed up and get to move\l" .string "before its opponent.\p" @@ -262,20 +262,20 @@ RustboroCity_PokemonSchool_Text_2144C8: @ 82144C8 .string "Just those alone will give you many\n" .string "topics to study!$" -RustboroCity_PokemonSchool_Text_21459F: @ 821459F +RustboroCity_PokemonSchool_Text_TradingRightNow: @ 821459F .string "I'm trading POKéMON with my friend\n" .string "right now.$" -RustboroCity_PokemonSchool_Text_2145CD: @ 82145CD +RustboroCity_PokemonSchool_Text_AlwaysWantedSeedot: @ 82145CD .string "I always wanted a SEEDOT, and\n" .string "I'm finally getting one!$" -RustboroCity_PokemonSchool_Text_214604: @ 8214604 +RustboroCity_PokemonSchool_Text_PokemontCantUseManMadeItems: @ 8214604 .string "POKéMON can hold items, but they\n" .string "don't know what to do with man-made\l" .string "items like POTION and ANTIDOTE.$" -RustboroCity_PokemonSchool_Text_214669: @ 8214669 +RustboroCity_PokemonSchool_Text_ConfusedPokemonAttacksItself: @ 8214669 .string "You know how some POKéMON moves can\n" .string "confuse a POKéMON?\p" .string "A confused POKéMON will sometimes\n" @@ -283,7 +283,7 @@ RustboroCity_PokemonSchool_Text_214669: @ 8214669 .string "But once it leaves battle, it will\n" .string "return to normal.$" -RustboroCity_PokemonSchool_Text_214719: @ 8214719 +RustboroCity_PokemonSchool_Text_PokemonHealItselfWithBerry: @ 8214719 .string "A POKéMON holding a BERRY will heal\n" .string "itself…\p" .string "There are many kinds of items that\n" @@ -291,7 +291,7 @@ RustboroCity_PokemonSchool_Text_214719: @ 8214719 .string "Boy, it sure is hard taking notes\n" .string "down…$" -RustboroCity_PokemonSchool_Text_2147A2: @ 82147A2 +RustboroCity_PokemonSchool_Text_StudentsNotes: @ 82147A2 .string "It's this student's notebook…\p" .string "POKéMON are to be caught using\n" .string "POKé BALLS.\p" @@ -304,7 +304,7 @@ RustboroCity_PokemonSchool_Text_2147A2: @ 82147A2 .string "the strong TRAINERS who await\l" .string "challengers in POKéMON GYMS.$" -RustboroCity_PokemonSchool_Text_2148C0: @ 82148C0 +RustboroCity_PokemonSchool_Text_ScottMetAlreadyCut: @ 82148C0 .string "Hello? Didn't we meet before?\n" .string "I think back in PETALBURG CITY.\p" .string "Let me introduce myself.\n" @@ -320,12 +320,12 @@ RustboroCity_PokemonSchool_Text_2148C0: @ 82148C0 .string "If I remember correctly, someone in\n" .string "this town has CUT.$" -RustboroCity_PokemonSchool_Text_214A5F: @ 8214A5F +RustboroCity_PokemonSchool_Text_StudentTalentLevelUnknown: @ 8214A5F .string "SCOTT: Hmm…\p" .string "The talent levels of the students here\n" .string "are unknown. The potential's there.$" -RustboroCity_PokemonSchool_Text_214AB6: @ 8214AB6 +RustboroCity_PokemonSchool_Text_ScottStoneBadge: @ 8214AB6 .string "SCOTT: Oh, what's that?\p" .string "It's a STONE BADGE, isn't it?\n" .string "That's pretty impressive, I'd say.\p" @@ -334,7 +334,7 @@ RustboroCity_PokemonSchool_Text_214AB6: @ 8214AB6 .string "It's hard to tell what you're like as\n" .string "a TRAINER from a LEAGUE BADGE.$" -RustboroCity_PokemonSchool_Text_214B8A: @ 8214B8A +RustboroCity_PokemonSchool_Text_ScottMetAlreadyStoneBadge: @ 8214B8A .string "Hello? Didn't we meet before?\n" .string "I think back in PETALBURG CITY.\p" .string "Let me introduce myself.\n" diff --git a/data/scripts/new_game.inc b/data/scripts/new_game.inc index 4357199c4..e39c6eca6 100644 --- a/data/scripts/new_game.inc +++ b/data/scripts/new_game.inc @@ -95,7 +95,7 @@ EventScript_ResetAllMapFlags:: @ 82715DE setflag FLAG_UNKNOWN_0x363 setflag FLAG_HIDE_RUSTBORO_CITY_AQUA_GRUNT setflag FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1 - setflag FLAG_HIDE_RUSBORO_CITY_RIVAL + setflag FLAG_HIDE_RUSTBORO_CITY_RIVAL setflag FLAG_HIDE_RUSTBORO_CITY_SCIENTIST setflag FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY diff --git a/data/specials.inc b/data/specials.inc index c8fd515db..62311ce14 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -479,7 +479,7 @@ gSpecials:: @ 81DBA64 def_special ShowFrontierGamblerLookingMessage def_special ShowFrontierGamblerGoMessage def_special Script_DoRayquazaScene - def_special sub_81C72A4 + def_special OpenPokenavForTutorial def_special ScriptMenu_CreateStartMenuForPokenavTutorial def_special CountPlayerTrainerStars def_special BufferBattleFrontierTutorMoveName diff --git a/include/constants/flags.h b/include/constants/flags.h index 687fea766..368f4f287 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -854,7 +854,7 @@ #define FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CYNDAQUIL 0x32B #define FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_TOTODILE 0x32C #define FLAG_HIDE_ROUTE_116_DROPPED_GLASSES_MAN 0x32D -#define FLAG_HIDE_RUSBORO_CITY_RIVAL 0x32E +#define FLAG_HIDE_RUSTBORO_CITY_RIVAL 0x32E #define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_SWABLU_DOLL 0x32F #define FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE 0x330 #define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL 0x331 diff --git a/src/pokenav.c b/src/pokenav.c index 2a1647a6f..9f12380df 100644 --- a/src/pokenav.c +++ b/src/pokenav.c @@ -48,8 +48,8 @@ static void VBlankCB_Pokenav(void); static void CB2_Pokenav(void); static void Task_RunLoopedTask_LinkMode(u8 a0); static void Task_RunLoopedTask(u8 taskId); -static void sub_81C742C(u8 taskId); -static void sub_81C72BC(void); +static void Task_Pokenav(u8 taskId); +static void CB2_InitPokenavForTutorial(void); const struct UnknownPokenavCallbackStruct PokenavMenuCallbacks[15] = { @@ -311,19 +311,19 @@ void CB2_InitPokeNav(void) InitPokenavResources(gPokenavResources); ResetTasks(); SetVBlankCallback(NULL); - CreateTask(sub_81C742C, 0); + CreateTask(Task_Pokenav, 0); SetMainCallback2(CB2_Pokenav); SetVBlankCallback(VBlankCB_Pokenav); } } -void sub_81C72A4(void) +void OpenPokenavForTutorial(void) { - SetMainCallback2(sub_81C72BC); + SetMainCallback2(CB2_InitPokenavForTutorial); FadeScreen(1, 0); } -static void sub_81C72BC(void) +static void CB2_InitPokenavForTutorial(void) { UpdatePaletteFade(); if (gPaletteFade.active) @@ -342,7 +342,7 @@ static void sub_81C72BC(void) ResetSpriteData(); FreeAllSpritePalettes(); SetVBlankCallback(NULL); - CreateTask(sub_81C742C, 0); + CreateTask(Task_Pokenav, 0); SetMainCallback2(CB2_Pokenav); SetVBlankCallback(VBlankCB_Pokenav); } @@ -416,7 +416,7 @@ static void VBlankCB_Pokenav(void) ProcessSpriteCopyRequests(); } -static void sub_81C742C(u8 taskId) +static void Task_Pokenav(u8 taskId) { u32 v1; s16 *data = gTasks[taskId].data; From 481c09fcad0db1bacadea534a3cc6cc291e8dfbd Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 5 Nov 2019 14:16:54 -0500 Subject: [PATCH 03/40] Clean up Rustboro script doc --- data/maps/RustboroCity/scripts.inc | 4 ++-- data/maps/RustboroCity_DevonCorp_2F/scripts.inc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc index 4cfb0ae6e..04c7ea505 100644 --- a/data/maps/RustboroCity/scripts.inc +++ b/data/maps/RustboroCity/scripts.inc @@ -172,12 +172,12 @@ RustboroCity_EventScript_Man1HaveBadge:: @ 81E08A8 RustboroCity_EventScript_Boy2:: @ 81E08B2 lock faceplayer - goto_if_set FLAG_RECEIVED_POKENAV, RustboroCity_EventScript_BrineyLeftTunnel + goto_if_set FLAG_RECEIVED_POKENAV, RustboroCity_EventScript_Boy2BrineyLeftTunnel msgbox RustboroCity_Text_MrBrineyWalksInTheTunnel, MSGBOX_DEFAULT release end -RustboroCity_EventScript_BrineyLeftTunnel:: @ 81E08C7 +RustboroCity_EventScript_Boy2BrineyLeftTunnel:: @ 81E08C7 msgbox RustboroCity_Text_MrBrineyLovesPeeko, MSGBOX_DEFAULT release end diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc index d2a5acd0f..7b8dbdadf 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc @@ -76,6 +76,7 @@ RustboroCity_DevonCorp_2F_EventScript_FossilScientist:: @ 82118F1 release end +@ This whole section has needless duplication and could be condensed considerably RustboroCity_DevonCorp_2F_EventScript_NoticeRootFossil:: @ 8211933 closemessage playse SE_PIN @@ -143,7 +144,6 @@ RustboroCity_DevonCorp_2F_EventScript_FossilMonReady:: @ 8211A03 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_AnorithReady end -@ This whole section has needless duplication and could be condensed considerably RustboroCity_DevonCorp_2F_EventScript_LileepReady:: @ 8211A1A bufferspeciesname 1, SPECIES_LILEEP msgbox RustboroCity_DevonCorp_2F_Text_FossilizedMonBroughtBackToLife, MSGBOX_DEFAULT From 58dcd6d99dd7456006fe834e5fbab6b120698280 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 5 Nov 2019 15:08:07 -0500 Subject: [PATCH 04/40] Clean up mystery event msg --- asm/macros/event.inc | 8 ++ data/mystery_event_msg.s | 263 ++++++++++++++++++++++++------------- data/specials.inc | 2 +- include/constants/mevent.h | 15 +++ src/field_specials.c | 19 +-- src/mevent2.c | 11 +- 6 files changed, 215 insertions(+), 103 deletions(-) create mode 100644 include/constants/mevent.h diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 64f2cdc92..e633a9d84 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -1630,6 +1630,14 @@ call_if 5, \dest .endm + .macro vgoto_if_eq dest:req + vgoto_if 1, \dest + .endm + + .macro vgoto_if_ne dest:req + vgoto_if 0, \dest + .endm + .macro switch var:req copyvar VAR_0x8000, \var .endm diff --git a/data/mystery_event_msg.s b/data/mystery_event_msg.s index 33af5269c..07612d89a 100644 --- a/data/mystery_event_msg.s +++ b/data/mystery_event_msg.s @@ -1,6 +1,8 @@ +#include "constants/global.h" #include "constants/flags.h" #include "constants/items.h" #include "constants/map_scripts.h" +#include "constants/mevent.h" #include "constants/moves.h" #include "constants/region_map_sections.h" #include "constants/songs.h" @@ -16,10 +18,10 @@ MysteryEventScript_StampCard:: @ 8674CB0 setvaddress MysteryEventScript_StampCard - setorcopyvar VAR_RESULT, 1 - specialvar VAR_0x8008, sub_813986C - setorcopyvar VAR_RESULT, 0 - specialvar VAR_0x8009, sub_813986C + setorcopyvar VAR_RESULT, GET_MAX_STAMPS + specialvar VAR_0x8008, GetMysteryEventCardVal + setorcopyvar VAR_RESULT, GET_NUM_STAMPS + specialvar VAR_0x8009, GetMysteryEventCardVal subvar VAR_0x8008, VAR_0x8009 buffernumberstring 0, VAR_0x8008 lock @@ -31,18 +33,21 @@ MysteryEventScript_StampCard:: @ 8674CB0 end sText_MysteryGiftStampCard: - .string "Thank you for using the STAMP CARD\nSystem.\pYou have {STR_VAR_1} more to collect to\nfill your STAMP CARD.$" + .string "Thank you for using the STAMP CARD\n" + .string "System.\p" + .string "You have {STR_VAR_1} more to collect to\n" + .string "fill your STAMP CARD.$" MysteryEventScript_SurfPichu:: @ 8674D3D setvaddress MysteryEventScript_SurfPichu checkflag FLAG_MYSTERY_EVENT_DONE - vgoto_if 0, SurfPichu_GiveIfPossible + vgoto_if_ne SurfPichu_GiveIfPossible returnram SurfPichu_GiveIfPossible: @ 8674D4C specialvar VAR_EVENT_PICHU_SLOT, CalculatePlayerPartyCount - compare_var_to_value VAR_EVENT_PICHU_SLOT, 6 - vgoto_if 1, SurfPichu_FullParty + compare_var_to_value VAR_EVENT_PICHU_SLOT, PARTY_SIZE + vgoto_if_eq SurfPichu_FullParty setflag FLAG_MYSTERY_EVENT_DONE vcall SurfPichu_GiveEgg lock @@ -69,15 +74,15 @@ SurfPichu_GiveEgg: @ 8674D7E setmonobedient VAR_EVENT_PICHU_SLOT setmonmetlocation VAR_EVENT_PICHU_SLOT, METLOC_FATEFUL_ENCOUNTER compare_var_to_value VAR_EVENT_PICHU_SLOT, 1 - vgoto_if 1, SurfPichu_Slot1 + vgoto_if_eq SurfPichu_Slot1 compare_var_to_value VAR_EVENT_PICHU_SLOT, 2 - vgoto_if 1, SurfPichu_Slot2 + vgoto_if_eq SurfPichu_Slot2 compare_var_to_value VAR_EVENT_PICHU_SLOT, 3 - vgoto_if 1, SurfPichu_Slot3 + vgoto_if_eq SurfPichu_Slot3 compare_var_to_value VAR_EVENT_PICHU_SLOT, 4 - vgoto_if 1, SurfPichu_Slot4 + vgoto_if_eq SurfPichu_Slot4 compare_var_to_value VAR_EVENT_PICHU_SLOT, 5 - vgoto_if 1, SurfPichu_Slot5 + vgoto_if_eq SurfPichu_Slot5 return SurfPichu_Slot1: @ 8674DC0 @@ -101,19 +106,26 @@ SurfPichu_Slot5: @ 8674DD8 return sText_MysteryGiftEgg: - .string "Thank you for using the MYSTERY\nGIFT System.\pFrom the POKéMON CENTER we\nhave a gift--a POKéMON EGG!\pPlease raise it with love and\nkindness.$" + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.\p" + .string "From the POKéMON CENTER we\n" + .string "have a gift--a POKéMON EGG!\p" + .string "Please raise it with love and\n" + .string "kindness.$" sText_FullParty: - .string "Oh, your party appears to be full.\pPlease come see me after storing\na POKéMON on a PC.$" + .string "Oh, your party appears to be full.\p" + .string "Please come see me after storing\n" + .string "a POKéMON on a PC.$" MysteryEventScript_VisitingTrainer:: @ 8674EC1 setvaddress MysteryEventScript_VisitingTrainer special ValidateEReaderTrainer compare_var_to_value VAR_RESULT, 0 - vgoto_if 1, MysteryEventScript_VisitingTrainerArrived + vgoto_if_eq MysteryEventScript_VisitingTrainerArrived lock faceplayer - vmessage sText_MysteryGiftVisitingTrainer + vmessage sText_MysteryGiftVisitingTrainerInstructions waitmessage waitbuttonpress release @@ -122,29 +134,51 @@ MysteryEventScript_VisitingTrainer:: @ 8674EC1 MysteryEventScript_VisitingTrainerArrived: @ 8674EDF lock faceplayer - vmessage sText_MysteryGiftVisitingTrainer_2 + vmessage sText_MysteryGiftVisitingTrainerArrived waitmessage waitbuttonpress release end -sText_MysteryGiftVisitingTrainer: - .string "Thank you for using the MYSTERY\nGIFT System.\pBy holding this WONDER CARD, you\nmay take part in a survey at a\lPOKéMON MART.\pUse these surveys to invite\nTRAINERS to SOOTOPOLIS CITY.\p…Let me give you a secret\npassword for a survey:\p“GIVE ME\nAWESOME TRAINER”\pWrite that in on a survey and send\nit to the WIRELESS\lCOMMUNICATION SYSTEM.$" +sText_MysteryGiftVisitingTrainerInstructions: + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.\p" + .string "By holding this WONDER CARD, you\n" + .string "may take part in a survey at a\l" + .string "POKéMON MART.\p" + .string "Use these surveys to invite\n" + .string "TRAINERS to SOOTOPOLIS CITY.\p" + .string "…Let me give you a secret\n" + .string "password for a survey:\p" + .string "“GIVE ME\n" + .string "AWESOME TRAINER”\p" + .string "Write that in on a survey and send\n" + .string "it to the WIRELESS\l" + .string "COMMUNICATION SYSTEM.$" -sText_MysteryGiftVisitingTrainer_2: - .string "Thank you for using the MYSTERY\nGIFT System.\pA TRAINER has arrived in\nSOOTOPOLIS CITY looking for you.\pWe hope you will enjoy\nbattling the visiting TRAINER.\pYou may invite other TRAINERS by\nentering other passwords.\pTry looking for other passwords\nthat may work.$" +sText_MysteryGiftVisitingTrainerArrived: + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.\p" + .string "A TRAINER has arrived in\n" + .string "SOOTOPOLIS CITY looking for you.\p" + .string "We hope you will enjoy\n" + .string "battling the visiting TRAINER.\p" + .string "You may invite other TRAINERS by\n" + .string "entering other passwords.\p" + .string "Try looking for other passwords\n" + .string "that may work.$" MysteryEventScript_BattleCard:: @ 867513C setvaddress MysteryEventScript_BattleCard checkflag FLAG_MYSTERY_EVENT_DONE - vgoto_if 1, MysteryEventScript_BattleCardInfo - setorcopyvar VAR_RESULT, 2 - specialvar VAR_0x8008, sub_813986C - compare_var_to_value VAR_0x8008, 3 - vgoto_if 0, MysteryEventScript_BattleCardInfo + vgoto_if_eq MysteryEventScript_BattleCardInfo + setorcopyvar VAR_RESULT, GET_CARD_BATTLES_WON + specialvar VAR_0x8008, GetMysteryEventCardVal + compare_var_to_value VAR_0x8008, REQUIRED_CARD_BATTLES + vgoto_if_ne MysteryEventScript_BattleCardInfo lock faceplayer - vmessage sText_MysteryGiftBattleCountCard_2 + vmessage sText_MysteryGiftBattleCountCard_WonPrize waitmessage waitbuttonpress giveitem_std ITEM_POTION @@ -162,122 +196,157 @@ MysteryEventScript_BattleCardInfo: @ 8675179 end sText_MysteryGiftBattleCountCard: - .string "Thank you for using the MYSTERY\nGIFT System.\pYour BATTLE COUNT CARD keeps\ntrack of your battle record against\lTRAINERS with the same CARD.\pLook for and battle TRAINERS who\nhave the same CARD as you.\pYou may check the overall rankings\nby reading the NEWS.\pPlease do give it a try!$" + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.\p" + .string "Your BATTLE COUNT CARD keeps\n" + .string "track of your battle record against\l" + .string "TRAINERS with the same CARD.\p" + .string "Look for and battle TRAINERS who\n" + .string "have the same CARD as you.\p" + .string "You may check the overall rankings\n" + .string "by reading the NEWS.\p" + .string "Please do give it a try!$" -sText_MysteryGiftBattleCountCard_2: - .string "Thank you for using the MYSTERY\nGIFT System.\pCongratulations!\pYou have won a prize for winning\nthree battles!\pWe hope you will be inspired to\nbattle some more.$" +sText_MysteryGiftBattleCountCard_WonPrize: + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.\p" + .string "Congratulations!\p" + .string "You have won a prize for winning\n" + .string "three battles!\p" + .string "We hope you will be inspired to\n" + .string "battle some more.$" MysteryEventScript_AuroraTicket:: @ 867533C setvaddress MysteryEventScript_AuroraTicket lock faceplayer checkflag FLAG_RECEIVED_AURORA_TICKET - vgoto_if 1, AuroraTicket_Obtained + vgoto_if_eq AuroraTicket_Obtained checkflag FLAG_BATTLED_DEOXYS - vgoto_if 1, AuroraTicket_Obtained + vgoto_if_eq AuroraTicket_Obtained checkitem ITEM_AURORA_TICKET, 1 - compare_var_to_value VAR_RESULT, 1 - vgoto_if 1, AuroraTicket_Obtained - vmessage sText_AuroraTicket1 + compare_var_to_value VAR_RESULT, TRUE + vgoto_if_eq AuroraTicket_Obtained + vmessage sText_AuroraTicketForYou waitmessage waitbuttonpress checkitemspace ITEM_AURORA_TICKET, 1 - compare_var_to_value VAR_RESULT, 0 - vgoto_if 1, AuroraTicket_NoBagSpace + compare_var_to_value VAR_RESULT, FALSE + vgoto_if_eq AuroraTicket_NoBagSpace giveitem_std ITEM_AURORA_TICKET setflag FLAG_ENABLE_SHIP_BIRTH_ISLAND setflag FLAG_RECEIVED_AURORA_TICKET - vmessage sText_AuroraTicket2 + vmessage sText_AuroraTicketUseAtPort waitmessage waitbuttonpress release end AuroraTicket_NoBagSpace: @ 8675397 - vmessage sText_AuroraTicketNoPlace + vmessage sText_AuroraTicketBagFull waitmessage waitbuttonpress release end AuroraTicket_Obtained: @ 86753A0 - vmessage sText_AuroraTicketGot + vmessage sText_AuroraTicketThankYou waitmessage waitbuttonpress release end -sText_AuroraTicket1: - .string "Thank you for using the MYSTERY\nGIFT System.\pYou must be {PLAYER}.\nThere is a ticket here for you.$" +sText_AuroraTicketForYou: + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.\p" + .string "You must be {PLAYER}.\n" + .string "There is a ticket here for you.$" -sText_AuroraTicket2: - .string "It appears to be for use at the\nLILYCOVE CITY port.\pWhy not give it a try and see what\nit is about?$" +sText_AuroraTicketUseAtPort: + .string "It appears to be for use at the\n" + .string "LILYCOVE CITY port.\p" + .string "Why not give it a try and see what\n" + .string "it is about?$" -sText_AuroraTicketGot: - .string "Thank you for using the MYSTERY\nGIFT System.$" +sText_AuroraTicketThankYou: + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.$" -sText_AuroraTicketNoPlace: - .string "Oh, I'm sorry, {PLAYER}.\nYour BAG's KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$" +sText_AuroraTicketBagFull: + .string "Oh, I'm sorry, {PLAYER}.\n" + .string "Your BAG's KEY ITEMS POCKET is full.\p" + .string "Please store something on your PC,\n" + .string "then come back for this.$" MysteryEventScript_MysticTicket:: @ 867550B setvaddress MysteryEventScript_MysticTicket lock faceplayer checkflag FLAG_RECEIVED_MYSTIC_TICKET - vgoto_if 1, MysticTicket_Obtained + vgoto_if_eq MysticTicket_Obtained checkflag FLAG_CAUGHT_LUGIA - vgoto_if 1, MysticTicket_Obtained + vgoto_if_eq MysticTicket_Obtained checkflag FLAG_CAUGHT_HO_OH - vgoto_if 1, MysticTicket_Obtained + vgoto_if_eq MysticTicket_Obtained checkitem ITEM_MYSTIC_TICKET, 1 - compare_var_to_value VAR_RESULT, 1 - vgoto_if 1, MysticTicket_Obtained - vmessage sText_MysticTicket2 + compare_var_to_value VAR_RESULT, TRUE + vgoto_if_eq MysticTicket_Obtained + vmessage sText_MysticTicketForYou waitmessage waitbuttonpress checkitemspace ITEM_MYSTIC_TICKET, 1 - compare_var_to_value VAR_RESULT, 0 - vgoto_if 1, MysticTicket_NoBagSpace + compare_var_to_value VAR_RESULT, FALSE + vgoto_if_eq MysticTicket_NoBagSpace giveitem_std ITEM_MYSTIC_TICKET setflag FLAG_ENABLE_SHIP_NAVEL_ROCK setflag FLAG_RECEIVED_MYSTIC_TICKET - vmessage sText_MysticTicket1 + vmessage sText_MysticTicketUseAtPort waitmessage waitbuttonpress release end MysticTicket_NoBagSpace: @ 867556F - vmessage sText_MysticTicketNoPlace + vmessage sText_MysticTicketBagFull waitmessage waitbuttonpress release end MysticTicket_Obtained: @ 8675578 - vmessage sText_MysticTicketGot + vmessage sText_MysticTicketThankYou waitmessage waitbuttonpress release end -sText_MysticTicket2: - .string "Thank you for using the MYSTERY\nGIFT System.\pYou must be {PLAYER}.\nThere is a ticket here for you.$" +sText_MysticTicketForYou: + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.\p" + .string "You must be {PLAYER}.\n" + .string "There is a ticket here for you.$" -sText_MysticTicket1: - .string "It appears to be for use at the\nLILYCOVE CITY port.\pWhy not give it a try and see what\nit is about?$" +sText_MysticTicketUseAtPort: + .string "It appears to be for use at the\n" + .string "LILYCOVE CITY port.\p" + .string "Why not give it a try and see what\n" + .string "it is about?$" -sText_MysticTicketGot: - .string "Thank you for using the MYSTERY\nGIFT System.$" +sText_MysticTicketThankYou: + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.$" -sText_MysticTicketNoPlace: - .string "Oh, I'm sorry, {PLAYER}.\nYour BAG's KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$" +sText_MysticTicketBagFull: + .string "Oh, I'm sorry, {PLAYER}.\n" + .string "Your BAG's KEY ITEMS POCKET is full.\p" + .string "Please store something on your PC,\n" + .string "then come back for this.$" MysteryEventScript_AlteringCave:: @ 86756E3 setvaddress MysteryEventScript_AlteringCave addvar VAR_ALTERING_CAVE_WILD_SET, 1 compare_var_to_value VAR_ALTERING_CAVE_WILD_SET, 10 - vgoto_if 0, MysteryEventScript_AlteringCave_ + vgoto_if_ne MysteryEventScript_AlteringCave_ setvar VAR_ALTERING_CAVE_WILD_SET, 0 MysteryEventScript_AlteringCave_: @ 86756FD lock @@ -289,56 +358,74 @@ MysteryEventScript_AlteringCave_: @ 86756FD end sText_MysteryGiftAlteringCave:: - .string "Thank you for using the MYSTERY\nGIFT System.\pThere appears to be a rumor about\nrare POKéMON sightings.\pThe sightings reportedly came from\nthe ALTERING CAVE on ROUTE 103.\pPerhaps it would be worthwhile for\nyou to investigate this rumor.$" + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.\p" + .string "There appears to be a rumor about\n" + .string "rare POKéMON sightings.\p" + .string "The sightings reportedly came from\n" + .string "the ALTERING CAVE on ROUTE 103.\p" + .string "Perhaps it would be worthwhile for\n" + .string "you to investigate this rumor.$" MysteryEventScript_OldSeaMap:: @ 86757F4 setvaddress MysteryEventScript_OldSeaMap lock faceplayer checkflag FLAG_RECEIVED_OLD_SEA_MAP - vgoto_if 1, OldSeaMap_Obtained + vgoto_if_eq OldSeaMap_Obtained checkflag FLAG_CAUGHT_MEW - vgoto_if 1, OldSeaMap_Obtained + vgoto_if_eq OldSeaMap_Obtained checkitem ITEM_OLD_SEA_MAP, 1 - compare_var_to_value VAR_RESULT, 1 - vgoto_if 1, OldSeaMap_Obtained - vmessage sText_MysteryGiftOldSeaMap + compare_var_to_value VAR_RESULT, TRUE + vgoto_if_eq OldSeaMap_Obtained + vmessage sText_MysteryGiftOldSeaMapForYou waitmessage waitbuttonpress checkitemspace ITEM_OLD_SEA_MAP, 1 - compare_var_to_value VAR_RESULT, 0 - vgoto_if 1, OldSeaMap_NoBagSpace + compare_var_to_value VAR_RESULT, FALSE + vgoto_if_eq OldSeaMap_NoBagSpace giveitem_std ITEM_OLD_SEA_MAP setflag FLAG_ENABLE_SHIP_FARAWAY_ISLAND setflag FLAG_RECEIVED_OLD_SEA_MAP - vmessage sText_MysteryGiftOldSeaMap_1 + vmessage sText_MysteryGiftOldSeaMapUseAtPort waitmessage waitbuttonpress release end OldSeaMap_NoBagSpace: @ 867584F - vmessage sText_MysteryGiftOldSeaMap_3 + vmessage sText_MysteryGiftOldSeaMapBagFull waitmessage waitbuttonpress release end OldSeaMap_Obtained: @ 8675858 - vmessage sText_MysteryGiftOldSeaMap_2 + vmessage sText_MysteryGiftOldSeaMapThankYou waitmessage waitbuttonpress release end -sText_MysteryGiftOldSeaMap: - .string "Thank you for using the MYSTERY\nGIFT System.\pLet me confirm--you are {PLAYER}?\pWe received this OLD SEA MAP\naddressed to you.$" +sText_MysteryGiftOldSeaMapForYou: + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.\p" + .string "Let me confirm--you are {PLAYER}?\p" + .string "We received this OLD SEA MAP\n" + .string "addressed to you.$" -sText_MysteryGiftOldSeaMap_1: - .string "It appears to be for use at the\nLILYCOVE CITY port.\pWhy not give it a try and see what\nit is about?$" +sText_MysteryGiftOldSeaMapUseAtPort: + .string "It appears to be for use at the\n" + .string "LILYCOVE CITY port.\p" + .string "Why not give it a try and see what\n" + .string "it is about?$" -sText_MysteryGiftOldSeaMap_2: - .string "Thank you for using the MYSTERY\nGIFT System.$" +sText_MysteryGiftOldSeaMapThankYou: + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.$" -sText_MysteryGiftOldSeaMap_3: - .string "Oh, I'm sorry, {PLAYER}.\nYour BAG's KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$" +sText_MysteryGiftOldSeaMapBagFull: + .string "Oh, I'm sorry, {PLAYER}.\n" + .string "Your BAG's KEY ITEMS POCKET is full.\p" + .string "Please store something on your PC,\n" + .string "then come back for this.$" diff --git a/data/specials.inc b/data/specials.inc index 62311ce14..1ec8bb230 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -400,7 +400,7 @@ gSpecials:: @ 81DBA64 def_special ClearQuizLadyQuestionAndAnswer def_special QuizLadySetCustomQuestion def_special QuizLadyTakePrizeForCustomQuiz - def_special sub_813986C + def_special GetMysteryEventCardVal def_special QuizLadyRecordCustomQuizData def_special QuizLadySetWaitingForChallenger def_special BufferQuizCorrectAnswer diff --git a/include/constants/mevent.h b/include/constants/mevent.h new file mode 100644 index 000000000..25bbcdf36 --- /dev/null +++ b/include/constants/mevent.h @@ -0,0 +1,15 @@ +#ifndef GUARD_CONSTANTS_MEVENT_H +#define GUARD_CONSTANTS_MEVENT_H + +// mevent2.c +#define GET_NUM_STAMPS 0 +#define GET_MAX_STAMPS 1 +#define GET_CARD_BATTLES_WON 2 + +#define GET_NUM_STAMPS_INTERNAL 3 +#define GET_MAX_STAMPS_INTERNAL 4 +#define GET_CARD_BATTLES_WON_INTERNAL 0 + +#define REQUIRED_CARD_BATTLES 3 + +#endif //GUARD_MEVENT_H diff --git a/src/field_specials.c b/src/field_specials.c index 7c323792a..65bc3a095 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -55,6 +55,7 @@ #include "constants/heal_locations.h" #include "constants/map_types.h" #include "constants/maps.h" +#include "constants/mevent.h" #include "constants/tv.h" #include "constants/script_menu.h" #include "constants/songs.h" @@ -1655,19 +1656,19 @@ void BufferLottoTicketNumber(void) } } -u16 sub_813986C(void) +u16 GetMysteryEventCardVal(void) { switch (gSpecialVar_Result) { - case 0: - return mevent_081445C0(3); - case 1: - return mevent_081445C0(4); - case 2: - return mevent_081445C0(0); - case 3: + case GET_NUM_STAMPS: + return mevent_081445C0(GET_NUM_STAMPS_INTERNAL); + case GET_MAX_STAMPS: + return mevent_081445C0(GET_MAX_STAMPS_INTERNAL); + case GET_CARD_BATTLES_WON: + return mevent_081445C0(GET_CARD_BATTLES_WON_INTERNAL); + case 3: // Never occurs return mevent_081445C0(1); - case 4: + case 4: // Never occurs return mevent_081445C0(2); default: return 0; diff --git a/src/mevent2.c b/src/mevent2.c index f36e5d06b..aedc7b366 100755 --- a/src/mevent2.c +++ b/src/mevent2.c @@ -9,6 +9,7 @@ #include "string_util.h" #include "new_game.h" #include "mevent.h" +#include "constants/mevent.h" #include "constants/species.h" static EWRAM_DATA bool32 gUnknown_02022C70 = FALSE; @@ -493,7 +494,7 @@ u16 mevent_081445C0(u32 command) { switch (command) { - case 0: + case GET_CARD_BATTLES_WON_INTERNAL: { struct WonderCard *data = &gSaveBlock1Ptr->unk_322C.wonderCard.data; if (data->unk_08_0 == 2) @@ -503,7 +504,7 @@ u16 mevent_081445C0(u32 command) } break; } - case 1: + case 1: // Never occurs { struct WonderCard *data = &gSaveBlock1Ptr->unk_322C.wonderCard.data; if (data->unk_08_0 == 2) @@ -513,7 +514,7 @@ u16 mevent_081445C0(u32 command) } break; } - case 2: + case 2: // Never occurs { struct WonderCard *data = &gSaveBlock1Ptr->unk_322C.wonderCard.data; if (data->unk_08_0 == 2) @@ -523,14 +524,14 @@ u16 mevent_081445C0(u32 command) } break; } - case 3: + case GET_NUM_STAMPS_INTERNAL: { struct WonderCard *data = &gSaveBlock1Ptr->unk_322C.wonderCard.data; if (data->unk_08_0 == 1) return sub_801B4CC(); break; } - case 4: + case GET_MAX_STAMPS_INTERNAL: { struct WonderCard *data = &gSaveBlock1Ptr->unk_322C.wonderCard.data; if (data->unk_08_0 == 1) From e7f6459a890901d59ca179c40f58bd84b255e467 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 5 Nov 2019 15:19:08 -0500 Subject: [PATCH 05/40] Split mystery event msg --- data/mystery_event_msg.s | 422 +---------------------- data/scripts/meventmsg_altering_cave.inc | 24 ++ data/scripts/meventmsg_aurora_ticket.inc | 61 ++++ data/scripts/meventmsg_battle_card.inc | 47 +++ data/scripts/meventmsg_mystic_ticket.inc | 63 ++++ data/scripts/meventmsg_old_sea_map.inc | 62 ++++ data/scripts/meventmsg_pichu.inc | 79 +++++ data/scripts/meventmsg_stamp_card.inc | 21 ++ data/scripts/meventmsg_trainer.inc | 49 +++ 9 files changed, 414 insertions(+), 414 deletions(-) create mode 100644 data/scripts/meventmsg_altering_cave.inc create mode 100644 data/scripts/meventmsg_aurora_ticket.inc create mode 100644 data/scripts/meventmsg_battle_card.inc create mode 100644 data/scripts/meventmsg_mystic_ticket.inc create mode 100644 data/scripts/meventmsg_old_sea_map.inc create mode 100644 data/scripts/meventmsg_pichu.inc create mode 100644 data/scripts/meventmsg_stamp_card.inc create mode 100644 data/scripts/meventmsg_trainer.inc diff --git a/data/mystery_event_msg.s b/data/mystery_event_msg.s index 07612d89a..877e5c649 100644 --- a/data/mystery_event_msg.s +++ b/data/mystery_event_msg.s @@ -15,417 +15,11 @@ .section .rodata .align 2 - -MysteryEventScript_StampCard:: @ 8674CB0 - setvaddress MysteryEventScript_StampCard - setorcopyvar VAR_RESULT, GET_MAX_STAMPS - specialvar VAR_0x8008, GetMysteryEventCardVal - setorcopyvar VAR_RESULT, GET_NUM_STAMPS - specialvar VAR_0x8009, GetMysteryEventCardVal - subvar VAR_0x8008, VAR_0x8009 - buffernumberstring 0, VAR_0x8008 - lock - faceplayer - vmessage sText_MysteryGiftStampCard - waitmessage - waitbuttonpress - release - end - -sText_MysteryGiftStampCard: - .string "Thank you for using the STAMP CARD\n" - .string "System.\p" - .string "You have {STR_VAR_1} more to collect to\n" - .string "fill your STAMP CARD.$" - -MysteryEventScript_SurfPichu:: @ 8674D3D - setvaddress MysteryEventScript_SurfPichu - checkflag FLAG_MYSTERY_EVENT_DONE - vgoto_if_ne SurfPichu_GiveIfPossible - returnram - -SurfPichu_GiveIfPossible: @ 8674D4C - specialvar VAR_EVENT_PICHU_SLOT, CalculatePlayerPartyCount - compare_var_to_value VAR_EVENT_PICHU_SLOT, PARTY_SIZE - vgoto_if_eq SurfPichu_FullParty - setflag FLAG_MYSTERY_EVENT_DONE - vcall SurfPichu_GiveEgg - lock - faceplayer - vmessage sText_MysteryGiftEgg - waitmessage - waitbuttonpress - playfanfare MUS_FANFA4 - waitfanfare - release - end - -SurfPichu_FullParty: @ 8674D73 - lock - faceplayer - vmessage sText_FullParty - waitmessage - waitbuttonpress - release - end - -SurfPichu_GiveEgg: @ 8674D7E - giveegg SPECIES_PICHU - setmonobedient VAR_EVENT_PICHU_SLOT - setmonmetlocation VAR_EVENT_PICHU_SLOT, METLOC_FATEFUL_ENCOUNTER - compare_var_to_value VAR_EVENT_PICHU_SLOT, 1 - vgoto_if_eq SurfPichu_Slot1 - compare_var_to_value VAR_EVENT_PICHU_SLOT, 2 - vgoto_if_eq SurfPichu_Slot2 - compare_var_to_value VAR_EVENT_PICHU_SLOT, 3 - vgoto_if_eq SurfPichu_Slot3 - compare_var_to_value VAR_EVENT_PICHU_SLOT, 4 - vgoto_if_eq SurfPichu_Slot4 - compare_var_to_value VAR_EVENT_PICHU_SLOT, 5 - vgoto_if_eq SurfPichu_Slot5 - return - -SurfPichu_Slot1: @ 8674DC0 - setmonmove 1, 2, MOVE_SURF - return - -SurfPichu_Slot2:: @ 8674DC6 - setmonmove 2, 2, MOVE_SURF - return - -SurfPichu_Slot3: @ 8674DCC - setmonmove 3, 2, MOVE_SURF - return - -SurfPichu_Slot4: @ 8674DD2 - setmonmove 4, 2, MOVE_SURF - return - -SurfPichu_Slot5: @ 8674DD8 - setmonmove 5, 2, MOVE_SURF - return - -sText_MysteryGiftEgg: - .string "Thank you for using the MYSTERY\n" - .string "GIFT System.\p" - .string "From the POKéMON CENTER we\n" - .string "have a gift--a POKéMON EGG!\p" - .string "Please raise it with love and\n" - .string "kindness.$" - -sText_FullParty: - .string "Oh, your party appears to be full.\p" - .string "Please come see me after storing\n" - .string "a POKéMON on a PC.$" - -MysteryEventScript_VisitingTrainer:: @ 8674EC1 - setvaddress MysteryEventScript_VisitingTrainer - special ValidateEReaderTrainer - compare_var_to_value VAR_RESULT, 0 - vgoto_if_eq MysteryEventScript_VisitingTrainerArrived - lock - faceplayer - vmessage sText_MysteryGiftVisitingTrainerInstructions - waitmessage - waitbuttonpress - release - end - -MysteryEventScript_VisitingTrainerArrived: @ 8674EDF - lock - faceplayer - vmessage sText_MysteryGiftVisitingTrainerArrived - waitmessage - waitbuttonpress - release - end - -sText_MysteryGiftVisitingTrainerInstructions: - .string "Thank you for using the MYSTERY\n" - .string "GIFT System.\p" - .string "By holding this WONDER CARD, you\n" - .string "may take part in a survey at a\l" - .string "POKéMON MART.\p" - .string "Use these surveys to invite\n" - .string "TRAINERS to SOOTOPOLIS CITY.\p" - .string "…Let me give you a secret\n" - .string "password for a survey:\p" - .string "“GIVE ME\n" - .string "AWESOME TRAINER”\p" - .string "Write that in on a survey and send\n" - .string "it to the WIRELESS\l" - .string "COMMUNICATION SYSTEM.$" - -sText_MysteryGiftVisitingTrainerArrived: - .string "Thank you for using the MYSTERY\n" - .string "GIFT System.\p" - .string "A TRAINER has arrived in\n" - .string "SOOTOPOLIS CITY looking for you.\p" - .string "We hope you will enjoy\n" - .string "battling the visiting TRAINER.\p" - .string "You may invite other TRAINERS by\n" - .string "entering other passwords.\p" - .string "Try looking for other passwords\n" - .string "that may work.$" - -MysteryEventScript_BattleCard:: @ 867513C - setvaddress MysteryEventScript_BattleCard - checkflag FLAG_MYSTERY_EVENT_DONE - vgoto_if_eq MysteryEventScript_BattleCardInfo - setorcopyvar VAR_RESULT, GET_CARD_BATTLES_WON - specialvar VAR_0x8008, GetMysteryEventCardVal - compare_var_to_value VAR_0x8008, REQUIRED_CARD_BATTLES - vgoto_if_ne MysteryEventScript_BattleCardInfo - lock - faceplayer - vmessage sText_MysteryGiftBattleCountCard_WonPrize - waitmessage - waitbuttonpress - giveitem_std ITEM_POTION - release - setflag FLAG_MYSTERY_EVENT_DONE - end - -MysteryEventScript_BattleCardInfo: @ 8675179 - lock - faceplayer - vmessage sText_MysteryGiftBattleCountCard - waitmessage - waitbuttonpress - release - end - -sText_MysteryGiftBattleCountCard: - .string "Thank you for using the MYSTERY\n" - .string "GIFT System.\p" - .string "Your BATTLE COUNT CARD keeps\n" - .string "track of your battle record against\l" - .string "TRAINERS with the same CARD.\p" - .string "Look for and battle TRAINERS who\n" - .string "have the same CARD as you.\p" - .string "You may check the overall rankings\n" - .string "by reading the NEWS.\p" - .string "Please do give it a try!$" - -sText_MysteryGiftBattleCountCard_WonPrize: - .string "Thank you for using the MYSTERY\n" - .string "GIFT System.\p" - .string "Congratulations!\p" - .string "You have won a prize for winning\n" - .string "three battles!\p" - .string "We hope you will be inspired to\n" - .string "battle some more.$" - -MysteryEventScript_AuroraTicket:: @ 867533C - setvaddress MysteryEventScript_AuroraTicket - lock - faceplayer - checkflag FLAG_RECEIVED_AURORA_TICKET - vgoto_if_eq AuroraTicket_Obtained - checkflag FLAG_BATTLED_DEOXYS - vgoto_if_eq AuroraTicket_Obtained - checkitem ITEM_AURORA_TICKET, 1 - compare_var_to_value VAR_RESULT, TRUE - vgoto_if_eq AuroraTicket_Obtained - vmessage sText_AuroraTicketForYou - waitmessage - waitbuttonpress - checkitemspace ITEM_AURORA_TICKET, 1 - compare_var_to_value VAR_RESULT, FALSE - vgoto_if_eq AuroraTicket_NoBagSpace - giveitem_std ITEM_AURORA_TICKET - setflag FLAG_ENABLE_SHIP_BIRTH_ISLAND - setflag FLAG_RECEIVED_AURORA_TICKET - vmessage sText_AuroraTicketUseAtPort - waitmessage - waitbuttonpress - release - end - -AuroraTicket_NoBagSpace: @ 8675397 - vmessage sText_AuroraTicketBagFull - waitmessage - waitbuttonpress - release - end - -AuroraTicket_Obtained: @ 86753A0 - vmessage sText_AuroraTicketThankYou - waitmessage - waitbuttonpress - release - end - -sText_AuroraTicketForYou: - .string "Thank you for using the MYSTERY\n" - .string "GIFT System.\p" - .string "You must be {PLAYER}.\n" - .string "There is a ticket here for you.$" - -sText_AuroraTicketUseAtPort: - .string "It appears to be for use at the\n" - .string "LILYCOVE CITY port.\p" - .string "Why not give it a try and see what\n" - .string "it is about?$" - -sText_AuroraTicketThankYou: - .string "Thank you for using the MYSTERY\n" - .string "GIFT System.$" - -sText_AuroraTicketBagFull: - .string "Oh, I'm sorry, {PLAYER}.\n" - .string "Your BAG's KEY ITEMS POCKET is full.\p" - .string "Please store something on your PC,\n" - .string "then come back for this.$" - -MysteryEventScript_MysticTicket:: @ 867550B - setvaddress MysteryEventScript_MysticTicket - lock - faceplayer - checkflag FLAG_RECEIVED_MYSTIC_TICKET - vgoto_if_eq MysticTicket_Obtained - checkflag FLAG_CAUGHT_LUGIA - vgoto_if_eq MysticTicket_Obtained - checkflag FLAG_CAUGHT_HO_OH - vgoto_if_eq MysticTicket_Obtained - checkitem ITEM_MYSTIC_TICKET, 1 - compare_var_to_value VAR_RESULT, TRUE - vgoto_if_eq MysticTicket_Obtained - vmessage sText_MysticTicketForYou - waitmessage - waitbuttonpress - checkitemspace ITEM_MYSTIC_TICKET, 1 - compare_var_to_value VAR_RESULT, FALSE - vgoto_if_eq MysticTicket_NoBagSpace - giveitem_std ITEM_MYSTIC_TICKET - setflag FLAG_ENABLE_SHIP_NAVEL_ROCK - setflag FLAG_RECEIVED_MYSTIC_TICKET - vmessage sText_MysticTicketUseAtPort - waitmessage - waitbuttonpress - release - end - -MysticTicket_NoBagSpace: @ 867556F - vmessage sText_MysticTicketBagFull - waitmessage - waitbuttonpress - release - end - -MysticTicket_Obtained: @ 8675578 - vmessage sText_MysticTicketThankYou - waitmessage - waitbuttonpress - release - end - -sText_MysticTicketForYou: - .string "Thank you for using the MYSTERY\n" - .string "GIFT System.\p" - .string "You must be {PLAYER}.\n" - .string "There is a ticket here for you.$" - -sText_MysticTicketUseAtPort: - .string "It appears to be for use at the\n" - .string "LILYCOVE CITY port.\p" - .string "Why not give it a try and see what\n" - .string "it is about?$" - -sText_MysticTicketThankYou: - .string "Thank you for using the MYSTERY\n" - .string "GIFT System.$" - -sText_MysticTicketBagFull: - .string "Oh, I'm sorry, {PLAYER}.\n" - .string "Your BAG's KEY ITEMS POCKET is full.\p" - .string "Please store something on your PC,\n" - .string "then come back for this.$" - -MysteryEventScript_AlteringCave:: @ 86756E3 - setvaddress MysteryEventScript_AlteringCave - addvar VAR_ALTERING_CAVE_WILD_SET, 1 - compare_var_to_value VAR_ALTERING_CAVE_WILD_SET, 10 - vgoto_if_ne MysteryEventScript_AlteringCave_ - setvar VAR_ALTERING_CAVE_WILD_SET, 0 -MysteryEventScript_AlteringCave_: @ 86756FD - lock - faceplayer - vmessage sText_MysteryGiftAlteringCave - waitmessage - waitbuttonpress - release - end - -sText_MysteryGiftAlteringCave:: - .string "Thank you for using the MYSTERY\n" - .string "GIFT System.\p" - .string "There appears to be a rumor about\n" - .string "rare POKéMON sightings.\p" - .string "The sightings reportedly came from\n" - .string "the ALTERING CAVE on ROUTE 103.\p" - .string "Perhaps it would be worthwhile for\n" - .string "you to investigate this rumor.$" - -MysteryEventScript_OldSeaMap:: @ 86757F4 - setvaddress MysteryEventScript_OldSeaMap - lock - faceplayer - checkflag FLAG_RECEIVED_OLD_SEA_MAP - vgoto_if_eq OldSeaMap_Obtained - checkflag FLAG_CAUGHT_MEW - vgoto_if_eq OldSeaMap_Obtained - checkitem ITEM_OLD_SEA_MAP, 1 - compare_var_to_value VAR_RESULT, TRUE - vgoto_if_eq OldSeaMap_Obtained - vmessage sText_MysteryGiftOldSeaMapForYou - waitmessage - waitbuttonpress - checkitemspace ITEM_OLD_SEA_MAP, 1 - compare_var_to_value VAR_RESULT, FALSE - vgoto_if_eq OldSeaMap_NoBagSpace - giveitem_std ITEM_OLD_SEA_MAP - setflag FLAG_ENABLE_SHIP_FARAWAY_ISLAND - setflag FLAG_RECEIVED_OLD_SEA_MAP - vmessage sText_MysteryGiftOldSeaMapUseAtPort - waitmessage - waitbuttonpress - release - end - -OldSeaMap_NoBagSpace: @ 867584F - vmessage sText_MysteryGiftOldSeaMapBagFull - waitmessage - waitbuttonpress - release - end - -OldSeaMap_Obtained: @ 8675858 - vmessage sText_MysteryGiftOldSeaMapThankYou - waitmessage - waitbuttonpress - release - end - -sText_MysteryGiftOldSeaMapForYou: - .string "Thank you for using the MYSTERY\n" - .string "GIFT System.\p" - .string "Let me confirm--you are {PLAYER}?\p" - .string "We received this OLD SEA MAP\n" - .string "addressed to you.$" - -sText_MysteryGiftOldSeaMapUseAtPort: - .string "It appears to be for use at the\n" - .string "LILYCOVE CITY port.\p" - .string "Why not give it a try and see what\n" - .string "it is about?$" - -sText_MysteryGiftOldSeaMapThankYou: - .string "Thank you for using the MYSTERY\n" - .string "GIFT System.$" - -sText_MysteryGiftOldSeaMapBagFull: - .string "Oh, I'm sorry, {PLAYER}.\n" - .string "Your BAG's KEY ITEMS POCKET is full.\p" - .string "Please store something on your PC,\n" - .string "then come back for this.$" + .include "data/scripts/meventmsg_stamp_card.inc" + .include "data/scripts/meventmsg_pichu.inc" + .include "data/scripts/meventmsg_trainer.inc" + .include "data/scripts/meventmsg_battle_card.inc" + .include "data/scripts/meventmsg_aurora_ticket.inc" + .include "data/scripts/meventmsg_mystic_ticket.inc" + .include "data/scripts/meventmsg_altering_cave.inc" + .include "data/scripts/meventmsg_old_sea_map.inc" diff --git a/data/scripts/meventmsg_altering_cave.inc b/data/scripts/meventmsg_altering_cave.inc new file mode 100644 index 000000000..072005934 --- /dev/null +++ b/data/scripts/meventmsg_altering_cave.inc @@ -0,0 +1,24 @@ +MysteryEventScript_AlteringCave:: @ 86756E3 + setvaddress MysteryEventScript_AlteringCave + addvar VAR_ALTERING_CAVE_WILD_SET, 1 + compare_var_to_value VAR_ALTERING_CAVE_WILD_SET, 10 + vgoto_if_ne MysteryEventScript_AlteringCave_ + setvar VAR_ALTERING_CAVE_WILD_SET, 0 +MysteryEventScript_AlteringCave_: @ 86756FD + lock + faceplayer + vmessage sText_MysteryGiftAlteringCave + waitmessage + waitbuttonpress + release + end + +sText_MysteryGiftAlteringCave:: + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.\p" + .string "There appears to be a rumor about\n" + .string "rare POKéMON sightings.\p" + .string "The sightings reportedly came from\n" + .string "the ALTERING CAVE on ROUTE 103.\p" + .string "Perhaps it would be worthwhile for\n" + .string "you to investigate this rumor.$" diff --git a/data/scripts/meventmsg_aurora_ticket.inc b/data/scripts/meventmsg_aurora_ticket.inc new file mode 100644 index 000000000..811c840aa --- /dev/null +++ b/data/scripts/meventmsg_aurora_ticket.inc @@ -0,0 +1,61 @@ +MysteryEventScript_AuroraTicket:: @ 867533C + setvaddress MysteryEventScript_AuroraTicket + lock + faceplayer + checkflag FLAG_RECEIVED_AURORA_TICKET + vgoto_if_eq AuroraTicket_Obtained + checkflag FLAG_BATTLED_DEOXYS + vgoto_if_eq AuroraTicket_Obtained + checkitem ITEM_AURORA_TICKET, 1 + compare_var_to_value VAR_RESULT, TRUE + vgoto_if_eq AuroraTicket_Obtained + vmessage sText_AuroraTicketForYou + waitmessage + waitbuttonpress + checkitemspace ITEM_AURORA_TICKET, 1 + compare_var_to_value VAR_RESULT, FALSE + vgoto_if_eq AuroraTicket_NoBagSpace + giveitem_std ITEM_AURORA_TICKET + setflag FLAG_ENABLE_SHIP_BIRTH_ISLAND + setflag FLAG_RECEIVED_AURORA_TICKET + vmessage sText_AuroraTicketUseAtPort + waitmessage + waitbuttonpress + release + end + +AuroraTicket_NoBagSpace: @ 8675397 + vmessage sText_AuroraTicketBagFull + waitmessage + waitbuttonpress + release + end + +AuroraTicket_Obtained: @ 86753A0 + vmessage sText_AuroraTicketThankYou + waitmessage + waitbuttonpress + release + end + +sText_AuroraTicketForYou: + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.\p" + .string "You must be {PLAYER}.\n" + .string "There is a ticket here for you.$" + +sText_AuroraTicketUseAtPort: + .string "It appears to be for use at the\n" + .string "LILYCOVE CITY port.\p" + .string "Why not give it a try and see what\n" + .string "it is about?$" + +sText_AuroraTicketThankYou: + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.$" + +sText_AuroraTicketBagFull: + .string "Oh, I'm sorry, {PLAYER}.\n" + .string "Your BAG's KEY ITEMS POCKET is full.\p" + .string "Please store something on your PC,\n" + .string "then come back for this.$" diff --git a/data/scripts/meventmsg_battle_card.inc b/data/scripts/meventmsg_battle_card.inc new file mode 100644 index 000000000..8c36ed63a --- /dev/null +++ b/data/scripts/meventmsg_battle_card.inc @@ -0,0 +1,47 @@ +MysteryEventScript_BattleCard:: @ 867513C + setvaddress MysteryEventScript_BattleCard + checkflag FLAG_MYSTERY_EVENT_DONE + vgoto_if_eq MysteryEventScript_BattleCardInfo + setorcopyvar VAR_RESULT, GET_CARD_BATTLES_WON + specialvar VAR_0x8008, GetMysteryEventCardVal + compare_var_to_value VAR_0x8008, REQUIRED_CARD_BATTLES + vgoto_if_ne MysteryEventScript_BattleCardInfo + lock + faceplayer + vmessage sText_MysteryGiftBattleCountCard_WonPrize + waitmessage + waitbuttonpress + giveitem_std ITEM_POTION + release + setflag FLAG_MYSTERY_EVENT_DONE + end + +MysteryEventScript_BattleCardInfo: @ 8675179 + lock + faceplayer + vmessage sText_MysteryGiftBattleCountCard + waitmessage + waitbuttonpress + release + end + +sText_MysteryGiftBattleCountCard: + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.\p" + .string "Your BATTLE COUNT CARD keeps\n" + .string "track of your battle record against\l" + .string "TRAINERS with the same CARD.\p" + .string "Look for and battle TRAINERS who\n" + .string "have the same CARD as you.\p" + .string "You may check the overall rankings\n" + .string "by reading the NEWS.\p" + .string "Please do give it a try!$" + +sText_MysteryGiftBattleCountCard_WonPrize: + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.\p" + .string "Congratulations!\p" + .string "You have won a prize for winning\n" + .string "three battles!\p" + .string "We hope you will be inspired to\n" + .string "battle some more.$" diff --git a/data/scripts/meventmsg_mystic_ticket.inc b/data/scripts/meventmsg_mystic_ticket.inc new file mode 100644 index 000000000..0264fb77f --- /dev/null +++ b/data/scripts/meventmsg_mystic_ticket.inc @@ -0,0 +1,63 @@ +MysteryEventScript_MysticTicket:: @ 867550B + setvaddress MysteryEventScript_MysticTicket + lock + faceplayer + checkflag FLAG_RECEIVED_MYSTIC_TICKET + vgoto_if_eq MysticTicket_Obtained + checkflag FLAG_CAUGHT_LUGIA + vgoto_if_eq MysticTicket_Obtained + checkflag FLAG_CAUGHT_HO_OH + vgoto_if_eq MysticTicket_Obtained + checkitem ITEM_MYSTIC_TICKET, 1 + compare_var_to_value VAR_RESULT, TRUE + vgoto_if_eq MysticTicket_Obtained + vmessage sText_MysticTicketForYou + waitmessage + waitbuttonpress + checkitemspace ITEM_MYSTIC_TICKET, 1 + compare_var_to_value VAR_RESULT, FALSE + vgoto_if_eq MysticTicket_NoBagSpace + giveitem_std ITEM_MYSTIC_TICKET + setflag FLAG_ENABLE_SHIP_NAVEL_ROCK + setflag FLAG_RECEIVED_MYSTIC_TICKET + vmessage sText_MysticTicketUseAtPort + waitmessage + waitbuttonpress + release + end + +MysticTicket_NoBagSpace: @ 867556F + vmessage sText_MysticTicketBagFull + waitmessage + waitbuttonpress + release + end + +MysticTicket_Obtained: @ 8675578 + vmessage sText_MysticTicketThankYou + waitmessage + waitbuttonpress + release + end + +sText_MysticTicketForYou: + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.\p" + .string "You must be {PLAYER}.\n" + .string "There is a ticket here for you.$" + +sText_MysticTicketUseAtPort: + .string "It appears to be for use at the\n" + .string "LILYCOVE CITY port.\p" + .string "Why not give it a try and see what\n" + .string "it is about?$" + +sText_MysticTicketThankYou: + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.$" + +sText_MysticTicketBagFull: + .string "Oh, I'm sorry, {PLAYER}.\n" + .string "Your BAG's KEY ITEMS POCKET is full.\p" + .string "Please store something on your PC,\n" + .string "then come back for this.$" diff --git a/data/scripts/meventmsg_old_sea_map.inc b/data/scripts/meventmsg_old_sea_map.inc new file mode 100644 index 000000000..dffb56caa --- /dev/null +++ b/data/scripts/meventmsg_old_sea_map.inc @@ -0,0 +1,62 @@ +MysteryEventScript_OldSeaMap:: @ 86757F4 + setvaddress MysteryEventScript_OldSeaMap + lock + faceplayer + checkflag FLAG_RECEIVED_OLD_SEA_MAP + vgoto_if_eq OldSeaMap_Obtained + checkflag FLAG_CAUGHT_MEW + vgoto_if_eq OldSeaMap_Obtained + checkitem ITEM_OLD_SEA_MAP, 1 + compare_var_to_value VAR_RESULT, TRUE + vgoto_if_eq OldSeaMap_Obtained + vmessage sText_MysteryGiftOldSeaMapForYou + waitmessage + waitbuttonpress + checkitemspace ITEM_OLD_SEA_MAP, 1 + compare_var_to_value VAR_RESULT, FALSE + vgoto_if_eq OldSeaMap_NoBagSpace + giveitem_std ITEM_OLD_SEA_MAP + setflag FLAG_ENABLE_SHIP_FARAWAY_ISLAND + setflag FLAG_RECEIVED_OLD_SEA_MAP + vmessage sText_MysteryGiftOldSeaMapUseAtPort + waitmessage + waitbuttonpress + release + end + +OldSeaMap_NoBagSpace: @ 867584F + vmessage sText_MysteryGiftOldSeaMapBagFull + waitmessage + waitbuttonpress + release + end + +OldSeaMap_Obtained: @ 8675858 + vmessage sText_MysteryGiftOldSeaMapThankYou + waitmessage + waitbuttonpress + release + end + +sText_MysteryGiftOldSeaMapForYou: + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.\p" + .string "Let me confirm--you are {PLAYER}?\p" + .string "We received this OLD SEA MAP\n" + .string "addressed to you.$" + +sText_MysteryGiftOldSeaMapUseAtPort: + .string "It appears to be for use at the\n" + .string "LILYCOVE CITY port.\p" + .string "Why not give it a try and see what\n" + .string "it is about?$" + +sText_MysteryGiftOldSeaMapThankYou: + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.$" + +sText_MysteryGiftOldSeaMapBagFull: + .string "Oh, I'm sorry, {PLAYER}.\n" + .string "Your BAG's KEY ITEMS POCKET is full.\p" + .string "Please store something on your PC,\n" + .string "then come back for this.$" diff --git a/data/scripts/meventmsg_pichu.inc b/data/scripts/meventmsg_pichu.inc new file mode 100644 index 000000000..4df317564 --- /dev/null +++ b/data/scripts/meventmsg_pichu.inc @@ -0,0 +1,79 @@ +MysteryEventScript_SurfPichu:: @ 8674D3D + setvaddress MysteryEventScript_SurfPichu + checkflag FLAG_MYSTERY_EVENT_DONE + vgoto_if_ne SurfPichu_GiveIfPossible + returnram + +SurfPichu_GiveIfPossible: @ 8674D4C + specialvar VAR_EVENT_PICHU_SLOT, CalculatePlayerPartyCount + compare_var_to_value VAR_EVENT_PICHU_SLOT, PARTY_SIZE + vgoto_if_eq SurfPichu_FullParty + setflag FLAG_MYSTERY_EVENT_DONE + vcall SurfPichu_GiveEgg + lock + faceplayer + vmessage sText_MysteryGiftEgg + waitmessage + waitbuttonpress + playfanfare MUS_FANFA4 + waitfanfare + release + end + +SurfPichu_FullParty: @ 8674D73 + lock + faceplayer + vmessage sText_FullParty + waitmessage + waitbuttonpress + release + end + +SurfPichu_GiveEgg: @ 8674D7E + giveegg SPECIES_PICHU + setmonobedient VAR_EVENT_PICHU_SLOT + setmonmetlocation VAR_EVENT_PICHU_SLOT, METLOC_FATEFUL_ENCOUNTER + compare_var_to_value VAR_EVENT_PICHU_SLOT, 1 + vgoto_if_eq SurfPichu_Slot1 + compare_var_to_value VAR_EVENT_PICHU_SLOT, 2 + vgoto_if_eq SurfPichu_Slot2 + compare_var_to_value VAR_EVENT_PICHU_SLOT, 3 + vgoto_if_eq SurfPichu_Slot3 + compare_var_to_value VAR_EVENT_PICHU_SLOT, 4 + vgoto_if_eq SurfPichu_Slot4 + compare_var_to_value VAR_EVENT_PICHU_SLOT, 5 + vgoto_if_eq SurfPichu_Slot5 + return + +SurfPichu_Slot1: @ 8674DC0 + setmonmove 1, 2, MOVE_SURF + return + +SurfPichu_Slot2:: @ 8674DC6 + setmonmove 2, 2, MOVE_SURF + return + +SurfPichu_Slot3: @ 8674DCC + setmonmove 3, 2, MOVE_SURF + return + +SurfPichu_Slot4: @ 8674DD2 + setmonmove 4, 2, MOVE_SURF + return + +SurfPichu_Slot5: @ 8674DD8 + setmonmove 5, 2, MOVE_SURF + return + +sText_MysteryGiftEgg: + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.\p" + .string "From the POKéMON CENTER we\n" + .string "have a gift--a POKéMON EGG!\p" + .string "Please raise it with love and\n" + .string "kindness.$" + +sText_FullParty: + .string "Oh, your party appears to be full.\p" + .string "Please come see me after storing\n" + .string "a POKéMON on a PC.$" diff --git a/data/scripts/meventmsg_stamp_card.inc b/data/scripts/meventmsg_stamp_card.inc new file mode 100644 index 000000000..dcef80a50 --- /dev/null +++ b/data/scripts/meventmsg_stamp_card.inc @@ -0,0 +1,21 @@ +MysteryEventScript_StampCard:: @ 8674CB0 + setvaddress MysteryEventScript_StampCard + setorcopyvar VAR_RESULT, GET_MAX_STAMPS + specialvar VAR_0x8008, GetMysteryEventCardVal + setorcopyvar VAR_RESULT, GET_NUM_STAMPS + specialvar VAR_0x8009, GetMysteryEventCardVal + subvar VAR_0x8008, VAR_0x8009 + buffernumberstring 0, VAR_0x8008 + lock + faceplayer + vmessage sText_MysteryGiftStampCard + waitmessage + waitbuttonpress + release + end + +sText_MysteryGiftStampCard: + .string "Thank you for using the STAMP CARD\n" + .string "System.\p" + .string "You have {STR_VAR_1} more to collect to\n" + .string "fill your STAMP CARD.$" diff --git a/data/scripts/meventmsg_trainer.inc b/data/scripts/meventmsg_trainer.inc new file mode 100644 index 000000000..1b0117078 --- /dev/null +++ b/data/scripts/meventmsg_trainer.inc @@ -0,0 +1,49 @@ +MysteryEventScript_VisitingTrainer:: @ 8674EC1 + setvaddress MysteryEventScript_VisitingTrainer + special ValidateEReaderTrainer + compare_var_to_value VAR_RESULT, 0 + vgoto_if_eq MysteryEventScript_VisitingTrainerArrived + lock + faceplayer + vmessage sText_MysteryGiftVisitingTrainerInstructions + waitmessage + waitbuttonpress + release + end + +MysteryEventScript_VisitingTrainerArrived: @ 8674EDF + lock + faceplayer + vmessage sText_MysteryGiftVisitingTrainerArrived + waitmessage + waitbuttonpress + release + end + +sText_MysteryGiftVisitingTrainerInstructions: + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.\p" + .string "By holding this WONDER CARD, you\n" + .string "may take part in a survey at a\l" + .string "POKéMON MART.\p" + .string "Use these surveys to invite\n" + .string "TRAINERS to SOOTOPOLIS CITY.\p" + .string "…Let me give you a secret\n" + .string "password for a survey:\p" + .string "“GIVE ME\n" + .string "AWESOME TRAINER”\p" + .string "Write that in on a survey and send\n" + .string "it to the WIRELESS\l" + .string "COMMUNICATION SYSTEM.$" + +sText_MysteryGiftVisitingTrainerArrived: + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.\p" + .string "A TRAINER has arrived in\n" + .string "SOOTOPOLIS CITY looking for you.\p" + .string "We hope you will enjoy\n" + .string "battling the visiting TRAINER.\p" + .string "You may invite other TRAINERS by\n" + .string "entering other passwords.\p" + .string "Try looking for other passwords\n" + .string "that may work.$" From 37bd93ec6c3890048e49bada3e41127fd3fcea4f Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 5 Nov 2019 18:19:18 -0500 Subject: [PATCH 06/40] Rename mystery event msg scripts --- data/{mystery_event_msg.s => mystery_event.s} | 16 ++++++++-------- ...ltering_cave.inc => mevent_altering_cave.inc} | 0 ...urora_ticket.inc => mevent_aurora_ticket.inc} | 0 ...sg_battle_card.inc => mevent_battle_card.inc} | 0 ...ystic_ticket.inc => mevent_mystic_ticket.inc} | 0 ...sg_old_sea_map.inc => mevent_old_sea_map.inc} | 0 .../{meventmsg_pichu.inc => mevent_pichu.inc} | 0 ...tmsg_stamp_card.inc => mevent_stamp_card.inc} | 0 ...{meventmsg_trainer.inc => mevent_trainer.inc} | 0 ld_script.txt | 2 +- 10 files changed, 9 insertions(+), 9 deletions(-) rename data/{mystery_event_msg.s => mystery_event.s} (52%) rename data/scripts/{meventmsg_altering_cave.inc => mevent_altering_cave.inc} (100%) rename data/scripts/{meventmsg_aurora_ticket.inc => mevent_aurora_ticket.inc} (100%) rename data/scripts/{meventmsg_battle_card.inc => mevent_battle_card.inc} (100%) rename data/scripts/{meventmsg_mystic_ticket.inc => mevent_mystic_ticket.inc} (100%) rename data/scripts/{meventmsg_old_sea_map.inc => mevent_old_sea_map.inc} (100%) rename data/scripts/{meventmsg_pichu.inc => mevent_pichu.inc} (100%) rename data/scripts/{meventmsg_stamp_card.inc => mevent_stamp_card.inc} (100%) rename data/scripts/{meventmsg_trainer.inc => mevent_trainer.inc} (100%) diff --git a/data/mystery_event_msg.s b/data/mystery_event.s similarity index 52% rename from data/mystery_event_msg.s rename to data/mystery_event.s index 877e5c649..d707731b6 100644 --- a/data/mystery_event_msg.s +++ b/data/mystery_event.s @@ -15,11 +15,11 @@ .section .rodata .align 2 - .include "data/scripts/meventmsg_stamp_card.inc" - .include "data/scripts/meventmsg_pichu.inc" - .include "data/scripts/meventmsg_trainer.inc" - .include "data/scripts/meventmsg_battle_card.inc" - .include "data/scripts/meventmsg_aurora_ticket.inc" - .include "data/scripts/meventmsg_mystic_ticket.inc" - .include "data/scripts/meventmsg_altering_cave.inc" - .include "data/scripts/meventmsg_old_sea_map.inc" + .include "data/scripts/mevent_stamp_card.inc" + .include "data/scripts/mevent_pichu.inc" + .include "data/scripts/mevent_trainer.inc" + .include "data/scripts/mevent_battle_card.inc" + .include "data/scripts/mevent_aurora_ticket.inc" + .include "data/scripts/mevent_mystic_ticket.inc" + .include "data/scripts/mevent_altering_cave.inc" + .include "data/scripts/mevent_old_sea_map.inc" diff --git a/data/scripts/meventmsg_altering_cave.inc b/data/scripts/mevent_altering_cave.inc similarity index 100% rename from data/scripts/meventmsg_altering_cave.inc rename to data/scripts/mevent_altering_cave.inc diff --git a/data/scripts/meventmsg_aurora_ticket.inc b/data/scripts/mevent_aurora_ticket.inc similarity index 100% rename from data/scripts/meventmsg_aurora_ticket.inc rename to data/scripts/mevent_aurora_ticket.inc diff --git a/data/scripts/meventmsg_battle_card.inc b/data/scripts/mevent_battle_card.inc similarity index 100% rename from data/scripts/meventmsg_battle_card.inc rename to data/scripts/mevent_battle_card.inc diff --git a/data/scripts/meventmsg_mystic_ticket.inc b/data/scripts/mevent_mystic_ticket.inc similarity index 100% rename from data/scripts/meventmsg_mystic_ticket.inc rename to data/scripts/mevent_mystic_ticket.inc diff --git a/data/scripts/meventmsg_old_sea_map.inc b/data/scripts/mevent_old_sea_map.inc similarity index 100% rename from data/scripts/meventmsg_old_sea_map.inc rename to data/scripts/mevent_old_sea_map.inc diff --git a/data/scripts/meventmsg_pichu.inc b/data/scripts/mevent_pichu.inc similarity index 100% rename from data/scripts/meventmsg_pichu.inc rename to data/scripts/mevent_pichu.inc diff --git a/data/scripts/meventmsg_stamp_card.inc b/data/scripts/mevent_stamp_card.inc similarity index 100% rename from data/scripts/meventmsg_stamp_card.inc rename to data/scripts/mevent_stamp_card.inc diff --git a/data/scripts/meventmsg_trainer.inc b/data/scripts/mevent_trainer.inc similarity index 100% rename from data/scripts/meventmsg_trainer.inc rename to data/scripts/mevent_trainer.inc diff --git a/ld_script.txt b/ld_script.txt index 92aafebde..ca59a71a7 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -687,7 +687,7 @@ SECTIONS { data/text_input_strings.o(.rodata); data/fonts.o(.rodata); src/mystery_event_msg.o(.rodata); - data/mystery_event_msg.o(.rodata); + data/mystery_event.o(.rodata); src/m4a_tables.o(.rodata); data/sound_data.o(.rodata); } =0 From 6730df23216881d3ec8c70cc5c097ef0b74d5856 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 6 Nov 2019 09:31:04 -0500 Subject: [PATCH 07/40] Document Abandoned Ship scripts --- asm/macros/event.inc | 7 + .../AbandonedShip_CaptainsOffice/map.json | 2 +- .../AbandonedShip_CaptainsOffice/scripts.inc | 24 +-- data/maps/AbandonedShip_Corridors_1F/map.json | 4 +- .../AbandonedShip_Corridors_1F/scripts.inc | 18 +-- .../maps/AbandonedShip_Corridors_B1F/map.json | 6 +- .../AbandonedShip_Corridors_B1F/scripts.inc | 65 ++++----- .../map.json | 8 +- .../scripts.inc | 134 ++++++++--------- .../AbandonedShip_HiddenFloorRooms/map.json | 12 +- .../scripts.inc | 137 ++++++++---------- data/maps/AbandonedShip_Rooms2_1F/map.json | 8 +- data/maps/AbandonedShip_Rooms2_1F/scripts.inc | 98 ++++++------- data/maps/AbandonedShip_Rooms2_B1F/map.json | 2 +- .../maps/AbandonedShip_Rooms2_B1F/scripts.inc | 6 +- data/maps/AbandonedShip_Rooms_1F/map.json | 6 +- data/maps/AbandonedShip_Rooms_1F/scripts.inc | 52 +++---- data/maps/AbandonedShip_Rooms_B1F/map.json | 2 +- data/maps/AbandonedShip_Rooms_B1F/scripts.inc | 10 +- .../AbandonedShip_Underwater1/scripts.inc | 4 +- .../AbandonedShip_Underwater2/scripts.inc | 4 +- include/constants/metatile_labels.h | 8 +- 22 files changed, 300 insertions(+), 317 deletions(-) diff --git a/asm/macros/event.inc b/asm/macros/event.inc index e633a9d84..e616ea3ae 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -1679,3 +1679,10 @@ setorcopyvar VAR_0x8000, \trainer callstd STD_REGISTER_MATCH_CALL .endm + + .macro dofieldeffectsparkle x:req y:req + setfieldeffectargument 0, \x + setfieldeffectargument 1, \y + setfieldeffectargument 2, 0 + dofieldeffect FLDEFF_SPARKLE + .endm diff --git a/data/maps/AbandonedShip_CaptainsOffice/map.json b/data/maps/AbandonedShip_CaptainsOffice/map.json index b876ad849..804fd0afc 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/map.json +++ b/data/maps/AbandonedShip_CaptainsOffice/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "AbandonedShip_CaptainsOffice_EventScript_2387E2", + "script": "AbandonedShip_CaptainsOffice_EventScript_CaptSternAide", "flag": "0" }, { diff --git a/data/maps/AbandonedShip_CaptainsOffice/scripts.inc b/data/maps/AbandonedShip_CaptainsOffice/scripts.inc index 011ea4a07..b2940eb6f 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/scripts.inc +++ b/data/maps/AbandonedShip_CaptainsOffice/scripts.inc @@ -1,42 +1,42 @@ AbandonedShip_CaptainsOffice_MapScripts:: @ 82387E1 .byte 0 -AbandonedShip_CaptainsOffice_EventScript_2387E2:: @ 82387E2 +AbandonedShip_CaptainsOffice_EventScript_CaptSternAide:: @ 82387E2 lock faceplayer - goto_if_set FLAG_EXCHANGED_SCANNER, AbandonedShip_CaptainsOffice_EventScript_23881A + goto_if_set FLAG_EXCHANGED_SCANNER, AbandonedShip_CaptainsOffice_EventScript_ThisIsSSCactus checkitem ITEM_SCANNER, 1 compare VAR_RESULT, 1 - goto_if_eq AbandonedShip_CaptainsOffice_EventScript_238810 - goto_if_set FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER, AbandonedShip_CaptainsOffice_EventScript_23881A - msgbox AbandonedShip_CaptainsOffice_Text_238824, MSGBOX_DEFAULT + goto_if_eq AbandonedShip_CaptainsOffice_EventScript_CanYouDeliverScanner + goto_if_set FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER, AbandonedShip_CaptainsOffice_EventScript_ThisIsSSCactus + msgbox AbandonedShip_CaptainsOffice_Text_NoSuccessFindingScanner, MSGBOX_DEFAULT release end -AbandonedShip_CaptainsOffice_EventScript_238810:: @ 8238810 - msgbox AbandonedShip_CaptainsOffice_Text_23889D, MSGBOX_DEFAULT +AbandonedShip_CaptainsOffice_EventScript_CanYouDeliverScanner:: @ 8238810 + msgbox AbandonedShip_CaptainsOffice_Text_OhCanYouDeliverScanner, MSGBOX_DEFAULT release end -AbandonedShip_CaptainsOffice_EventScript_23881A:: @ 823881A - msgbox AbandonedShip_CaptainsOffice_Text_238918, MSGBOX_DEFAULT +AbandonedShip_CaptainsOffice_EventScript_ThisIsSSCactus:: @ 823881A + msgbox AbandonedShip_CaptainsOffice_Text_ThisIsSSCactus, MSGBOX_DEFAULT release end -AbandonedShip_CaptainsOffice_Text_238824: @ 8238824 +AbandonedShip_CaptainsOffice_Text_NoSuccessFindingScanner: @ 8238824 .string "I'm investigating this ship on behalf\n" .string "of CAPT. STERN.\p" .string "He also asked me to find a SCANNER,\n" .string "but I haven't had any success…$" -AbandonedShip_CaptainsOffice_Text_23889D: @ 823889D +AbandonedShip_CaptainsOffice_Text_OhCanYouDeliverScanner: @ 823889D .string "Oh! That's a SCANNER!\p" .string "Listen, can I get you to deliver that\n" .string "to CAPT. STERN?\p" .string "I want to investigate this ship a\n" .string "little more.$" -AbandonedShip_CaptainsOffice_Text_238918: @ 8238918 +AbandonedShip_CaptainsOffice_Text_ThisIsSSCactus: @ 8238918 .string "This ship is called S.S. CACTUS.\n" .string "It seems to be from an earlier era.$" diff --git a/data/maps/AbandonedShip_Corridors_1F/map.json b/data/maps/AbandonedShip_Corridors_1F/map.json index 4ddf92226..b75fcf3ac 100644 --- a/data/maps/AbandonedShip_Corridors_1F/map.json +++ b/data/maps/AbandonedShip_Corridors_1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "AbandonedShip_Corridors_1F_EventScript_2379A5", + "script": "AbandonedShip_Corridors_1F_EventScript_Youngster", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 7, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "AbandonedShip_Corridors_1F_EventScript_2379AE", + "script": "AbandonedShip_Corridors_1F_EventScript_Charlie", "flag": "0" } ], diff --git a/data/maps/AbandonedShip_Corridors_1F/scripts.inc b/data/maps/AbandonedShip_Corridors_1F/scripts.inc index 15fda4194..a954ee119 100644 --- a/data/maps/AbandonedShip_Corridors_1F/scripts.inc +++ b/data/maps/AbandonedShip_Corridors_1F/scripts.inc @@ -1,26 +1,26 @@ AbandonedShip_Corridors_1F_MapScripts:: @ 82379A4 .byte 0 -AbandonedShip_Corridors_1F_EventScript_2379A5:: @ 82379A5 - msgbox AbandonedShip_Corridors_1F_Text_237A60, MSGBOX_NPC +AbandonedShip_Corridors_1F_EventScript_Youngster:: @ 82379A5 + msgbox AbandonedShip_Corridors_1F_Text_IsntItFunHere, MSGBOX_NPC end -AbandonedShip_Corridors_1F_EventScript_2379AE:: @ 82379AE - trainerbattle_single TRAINER_CHARLIE, AbandonedShip_Corridors_1F_Text_2379C5, AbandonedShip_Corridors_1F_Text_237A01 - msgbox AbandonedShip_Corridors_1F_Text_237A1B, MSGBOX_AUTOCLOSE +AbandonedShip_Corridors_1F_EventScript_Charlie:: @ 82379AE + trainerbattle_single TRAINER_CHARLIE, AbandonedShip_Corridors_1F_Text_CharlieIntro, AbandonedShip_Corridors_1F_Text_CharlieDefeat + msgbox AbandonedShip_Corridors_1F_Text_CharliePostBattle, MSGBOX_AUTOCLOSE end -AbandonedShip_Corridors_1F_Text_2379C5: @ 82379C5 +AbandonedShip_Corridors_1F_Text_CharlieIntro: @ 82379C5 .string "What's so funny about having my inner\n" .string "tube aboard the ship?$" -AbandonedShip_Corridors_1F_Text_237A01: @ 8237A01 +AbandonedShip_Corridors_1F_Text_CharlieDefeat: @ 8237A01 .string "Whoa, you overwhelmed me!$" -AbandonedShip_Corridors_1F_Text_237A1B: @ 8237A1B +AbandonedShip_Corridors_1F_Text_CharliePostBattle: @ 8237A1B .string "It's not easy throwing POKé BALLS\n" .string "while hanging on to an inner tube!$" -AbandonedShip_Corridors_1F_Text_237A60: @ 8237A60 +AbandonedShip_Corridors_1F_Text_IsntItFunHere: @ 8237A60 .string "Isn't it fun here?\n" .string "I get excited just being here!$" diff --git a/data/maps/AbandonedShip_Corridors_B1F/map.json b/data/maps/AbandonedShip_Corridors_B1F/map.json index 9bccfc636..04868ad92 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/map.json +++ b/data/maps/AbandonedShip_Corridors_B1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "AbandonedShip_Corridors_B1F_EventScript_237DBF", + "script": "AbandonedShip_Corridors_B1F_EventScript_TuberM", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "AbandonedShip_Corridors_B1F_EventScript_237E13", + "script": "AbandonedShip_Corridors_B1F_EventScript_Duncan", "flag": "0" } ], @@ -107,7 +107,7 @@ "y": 4, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "AbandonedShip_Corridors_B1F_EventScript_237DC8" + "script": "AbandonedShip_Corridors_B1F_EventScript_StorageRoomDoor" } ] } \ No newline at end of file diff --git a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc index 1012ebce7..c56951a03 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc @@ -1,88 +1,87 @@ AbandonedShip_Corridors_B1F_MapScripts:: @ 8237D84 - map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Corridors_B1F_MapScript1_237D8F - map_script MAP_SCRIPT_ON_LOAD, AbandonedShip_Corridors_B1F_MapScript1_237D98 + map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Corridors_B1F_OnResume + map_script MAP_SCRIPT_ON_LOAD, AbandonedShip_Corridors_B1F_OnLoad .byte 0 -AbandonedShip_Corridors_B1F_MapScript1_237D8F: @ 8237D8F +AbandonedShip_Corridors_B1F_OnResume: @ 8237D8F setdivewarp MAP_ABANDONED_SHIP_UNDERWATER1, 255, 5, 4 end -AbandonedShip_Corridors_B1F_MapScript1_237D98: @ 8237D98 - call_if_unset FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_237DAB - call_if_set FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_237DB5 +AbandonedShip_Corridors_B1F_OnLoad: @ 8237D98 + call_if_unset FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_LockStorageRoom + call_if_set FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_UnlockStorageRoom end -AbandonedShip_Corridors_B1F_EventScript_237DAB:: @ 8237DAB - setmetatile 11, 4, METATILE_InsideShip_InTactDoor0_Bottom, 1 +AbandonedShip_Corridors_B1F_EventScript_LockStorageRoom:: @ 8237DAB + setmetatile 11, 4, METATILE_InsideShip_IntactDoor_Bottom_Locked, 1 return -AbandonedShip_Corridors_B1F_EventScript_237DB5:: @ 8237DB5 - setmetatile 11, 4, METATILE_InsideShip_InTactDoor1_Bottom, 1 +AbandonedShip_Corridors_B1F_EventScript_UnlockStorageRoom:: @ 8237DB5 + setmetatile 11, 4, METATILE_InsideShip_IntactDoor_Bottom_Unlocked, 1 return -AbandonedShip_Corridors_B1F_EventScript_237DBF:: @ 8237DBF - msgbox AbandonedShip_Corridors_B1F_Text_237F03, MSGBOX_NPC +AbandonedShip_Corridors_B1F_EventScript_TuberM:: @ 8237DBF + msgbox AbandonedShip_Corridors_B1F_Text_YayItsAShip, MSGBOX_NPC end -AbandonedShip_Corridors_B1F_EventScript_237DC8:: @ 8237DC8 +AbandonedShip_Corridors_B1F_EventScript_StorageRoomDoor:: @ 8237DC8 lockall - goto_if_set FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_237E09 + goto_if_set FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_DoorIsUnlocked checkitem ITEM_STORAGE_KEY, 1 - compare VAR_RESULT, 0 - goto_if_eq AbandonedShip_Corridors_B1F_EventScript_237DFF - msgbox AbandonedShip_Corridors_B1F_Text_237F4B, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + goto_if_eq AbandonedShip_Corridors_B1F_EventScript_DoorIsLocked + msgbox AbandonedShip_Corridors_B1F_Text_InsertedStorageKey, MSGBOX_DEFAULT playse SE_PIN takeitem ITEM_STORAGE_KEY, 1 setflag FLAG_USED_STORAGE_KEY - call AbandonedShip_Corridors_B1F_EventScript_237DB5 + call AbandonedShip_Corridors_B1F_EventScript_UnlockStorageRoom special DrawWholeMapView releaseall end -AbandonedShip_Corridors_B1F_EventScript_237DFF:: @ 8237DFF - msgbox AbandonedShip_Corridors_B1F_Text_237F15, MSGBOX_DEFAULT +AbandonedShip_Corridors_B1F_EventScript_DoorIsLocked:: @ 8237DFF + msgbox AbandonedShip_Corridors_B1F_Text_DoorIsLocked, MSGBOX_DEFAULT releaseall end -AbandonedShip_Corridors_B1F_EventScript_237E09:: @ 8237E09 - msgbox AbandonedShip_Corridors_B1F_Text_237FA5, MSGBOX_DEFAULT +AbandonedShip_Corridors_B1F_EventScript_DoorIsUnlocked:: @ 8237E09 + msgbox AbandonedShip_Text_TheDoorIsOpen, MSGBOX_DEFAULT releaseall end -AbandonedShip_Corridors_B1F_EventScript_237E13:: @ 8237E13 - trainerbattle_single TRAINER_DUNCAN, AbandonedShip_Corridors_B1F_Text_237E2A, AbandonedShip_Corridors_B1F_Text_237E80 - msgbox AbandonedShip_Corridors_B1F_Text_237E92, MSGBOX_AUTOCLOSE +AbandonedShip_Corridors_B1F_EventScript_Duncan:: @ 8237E13 + trainerbattle_single TRAINER_DUNCAN, AbandonedShip_Corridors_B1F_Text_DuncanIntro, AbandonedShip_Corridors_B1F_Text_DuncanDefeat + msgbox AbandonedShip_Corridors_B1F_Text_DuncanPostBattle, MSGBOX_AUTOCLOSE end -AbandonedShip_Corridors_B1F_Text_237E2A: @ 8237E2A +AbandonedShip_Corridors_B1F_Text_DuncanIntro: @ 8237E2A .string "When we go out to sea, we SAILORS\n" .string "always bring our POKéMON.\l" .string "How about a quick battle?$" -AbandonedShip_Corridors_B1F_Text_237E80: @ 8237E80 +AbandonedShip_Corridors_B1F_Text_DuncanDefeat: @ 8237E80 .string "Whoops, I'm sunk!$" -AbandonedShip_Corridors_B1F_Text_237E92: @ 8237E92 +AbandonedShip_Corridors_B1F_Text_DuncanPostBattle: @ 8237E92 .string "The ship's bottom has sunk into the\n" .string "depths.\p" .string "If a POKéMON knew how to go underwater,\n" .string "we might make some progress…$" -AbandonedShip_Corridors_B1F_Text_237F03: @ 8237F03 +AbandonedShip_Corridors_B1F_Text_YayItsAShip: @ 8237F03 .string "Yay!\n" .string "It's a ship!$" -AbandonedShip_Corridors_B1F_Text_237F15: @ 8237F15 +AbandonedShip_Corridors_B1F_Text_DoorIsLocked: @ 8237F15 .string "The door is locked.\p" .string "“STORAGE” is painted on the door.$" -AbandonedShip_Corridors_B1F_Text_237F4B: @ 8237F4B +AbandonedShip_Corridors_B1F_Text_InsertedStorageKey: @ 8237F4B .string "{PLAYER} inserted and turned the\n" .string "STORAGE KEY.\p" .string "The inserted KEY stuck fast,\n" .string "but the door opened.$" -AbandonedShip_Corridors_B1F_Text_237FA5: @ 8237FA5 -AbandonedShip_HiddenFloorCorridors_Text_237FA5: @ 8237FA5 +AbandonedShip_Text_TheDoorIsOpen: @ 8237FA5 .string "The door is open.$" diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/map.json b/data/maps/AbandonedShip_HiddenFloorCorridors/map.json index 1b1466fe1..81e19fd1f 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/map.json +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/map.json @@ -66,7 +66,7 @@ "y": 8, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "AbandonedShip_HiddenFloorCorridors_EventScript_238A19" + "script": "AbandonedShip_HiddenFloorCorridors_EventScript_Room1Door" }, { "type": "sign", @@ -74,7 +74,7 @@ "y": 8, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "AbandonedShip_HiddenFloorCorridors_EventScript_238A50" + "script": "AbandonedShip_HiddenFloorCorridors_EventScript_Room2Door" }, { "type": "sign", @@ -82,7 +82,7 @@ "y": 4, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "AbandonedShip_HiddenFloorCorridors_EventScript_238A87" + "script": "AbandonedShip_HiddenFloorCorridors_EventScript_Room4Door" }, { "type": "sign", @@ -90,7 +90,7 @@ "y": 4, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "AbandonedShip_HiddenFloorCorridors_EventScript_238ABE" + "script": "AbandonedShip_HiddenFloorCorridors_EventScript_Room6Door" } ] } \ No newline at end of file diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc index 9c6474b6f..5fc4160f8 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc @@ -1,157 +1,157 @@ AbandonedShip_HiddenFloorCorridors_MapScripts:: @ 823896C - map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_HiddenFloorCorridors_MapScript1_238977 - map_script MAP_SCRIPT_ON_LOAD, AbandonedShip_HiddenFloorCorridors_MapScript1_238980 + map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_HiddenFloorCorridors_OnResume + map_script MAP_SCRIPT_ON_LOAD, AbandonedShip_HiddenFloorCorridors_OnLoad .byte 0 -AbandonedShip_HiddenFloorCorridors_MapScript1_238977: @ 8238977 +AbandonedShip_HiddenFloorCorridors_OnResume: @ 8238977 setdivewarp MAP_ABANDONED_SHIP_UNDERWATER1, 255, 5, 4 end -AbandonedShip_HiddenFloorCorridors_MapScript1_238980: @ 8238980 - call_if_unset FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_2389F1 - call_if_unset FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_2389FB - call_if_unset FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_238A05 - call_if_unset FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_238A0F - call_if_set FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_2389C9 - call_if_set FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_2389D3 - call_if_set FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_2389DD - call_if_set FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_2389E7 +AbandonedShip_HiddenFloorCorridors_OnLoad: @ 8238980 + call_if_unset FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom1 + call_if_unset FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom2 + call_if_unset FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom4 + call_if_unset FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom6 + call_if_set FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom1 + call_if_set FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom2 + call_if_set FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom4 + call_if_set FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom6 end -AbandonedShip_HiddenFloorCorridors_EventScript_2389C9:: @ 82389C9 - setmetatile 3, 8, METATILE_InsideShip_InTactDoor1_Bottom, 1 +AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom1:: @ 82389C9 + setmetatile 3, 8, METATILE_InsideShip_IntactDoor_Bottom_Unlocked, 1 return -AbandonedShip_HiddenFloorCorridors_EventScript_2389D3:: @ 82389D3 - setmetatile 6, 8, METATILE_InsideShip_InTactDoor1_Bottom, 1 +AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom2:: @ 82389D3 + setmetatile 6, 8, METATILE_InsideShip_IntactDoor_Bottom_Unlocked, 1 return -AbandonedShip_HiddenFloorCorridors_EventScript_2389DD:: @ 82389DD - setmetatile 3, 3, METATILE_InsideShip_DoorIndent1, 0 +AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom4:: @ 82389DD + setmetatile 3, 3, METATILE_InsideShip_DoorIndent_Unlocked, 0 return -AbandonedShip_HiddenFloorCorridors_EventScript_2389E7:: @ 82389E7 - setmetatile 9, 3, METATILE_InsideShip_DoorIndent1, 0 +AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom6:: @ 82389E7 + setmetatile 9, 3, METATILE_InsideShip_DoorIndent_Unlocked, 0 return -AbandonedShip_HiddenFloorCorridors_EventScript_2389F1:: @ 82389F1 - setmetatile 3, 8, METATILE_InsideShip_InTactDoor0_Bottom, 1 +AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom1:: @ 82389F1 + setmetatile 3, 8, METATILE_InsideShip_IntactDoor_Bottom_Locked, 1 return -AbandonedShip_HiddenFloorCorridors_EventScript_2389FB:: @ 82389FB - setmetatile 6, 8, METATILE_InsideShip_InTactDoor0_Bottom, 1 +AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom2:: @ 82389FB + setmetatile 6, 8, METATILE_InsideShip_IntactDoor_Bottom_Locked, 1 return -AbandonedShip_HiddenFloorCorridors_EventScript_238A05:: @ 8238A05 - setmetatile 3, 3, METATILE_InsideShip_DoorIndent0, 0 +AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom4:: @ 8238A05 + setmetatile 3, 3, METATILE_InsideShip_DoorIndent_Locked, 0 return -AbandonedShip_HiddenFloorCorridors_EventScript_238A0F:: @ 8238A0F - setmetatile 9, 3, METATILE_InsideShip_DoorIndent0, 0 +AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom6:: @ 8238A0F + setmetatile 9, 3, METATILE_InsideShip_DoorIndent_Locked, 0 return -AbandonedShip_HiddenFloorCorridors_EventScript_238A19:: @ 8238A19 +AbandonedShip_HiddenFloorCorridors_EventScript_Room1Door:: @ 8238A19 lockall - goto_if_set FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_238B1D + goto_if_set FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_TheDoorIsOpen checkitem ITEM_ROOM_1_KEY, 1 - compare VAR_RESULT, 0 - goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_238AF5 - msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_Rm1IsLocked + msgbox AbandonedShip_HiddenFloorCorridors_Text_InsertedKey, MSGBOX_DEFAULT playse SE_PIN takeitem ITEM_ROOM_1_KEY, 1 setflag FLAG_USED_ROOM_1_KEY - call AbandonedShip_HiddenFloorCorridors_EventScript_2389C9 + call AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom1 special DrawWholeMapView releaseall end -AbandonedShip_HiddenFloorCorridors_EventScript_238A50:: @ 8238A50 +AbandonedShip_HiddenFloorCorridors_EventScript_Room2Door:: @ 8238A50 lockall - goto_if_set FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_238B1D + goto_if_set FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_TheDoorIsOpen checkitem ITEM_ROOM_2_KEY, 1 - compare VAR_RESULT, 0 - goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_238AFF - msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_Rm2IsLocked + msgbox AbandonedShip_HiddenFloorCorridors_Text_InsertedKey, MSGBOX_DEFAULT playse SE_PIN takeitem ITEM_ROOM_2_KEY, 1 setflag FLAG_USED_ROOM_2_KEY - call AbandonedShip_HiddenFloorCorridors_EventScript_2389D3 + call AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom2 special DrawWholeMapView releaseall end -AbandonedShip_HiddenFloorCorridors_EventScript_238A87:: @ 8238A87 +AbandonedShip_HiddenFloorCorridors_EventScript_Room4Door:: @ 8238A87 lockall - goto_if_set FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_238B1D + goto_if_set FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_TheDoorIsOpen checkitem ITEM_ROOM_4_KEY, 1 - compare VAR_RESULT, 0 - goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B09 - msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_Rm4IsLocked + msgbox AbandonedShip_HiddenFloorCorridors_Text_InsertedKey, MSGBOX_DEFAULT playse SE_PIN takeitem ITEM_ROOM_4_KEY, 1 setflag FLAG_USED_ROOM_4_KEY - call AbandonedShip_HiddenFloorCorridors_EventScript_2389DD + call AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom4 special DrawWholeMapView releaseall end -AbandonedShip_HiddenFloorCorridors_EventScript_238ABE:: @ 8238ABE +AbandonedShip_HiddenFloorCorridors_EventScript_Room6Door:: @ 8238ABE lockall - goto_if_set FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_238B1D + goto_if_set FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_TheDoorIsOpen checkitem ITEM_ROOM_6_KEY, 1 - compare VAR_RESULT, 0 - goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B13 - msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_Rm6IsLocked + msgbox AbandonedShip_HiddenFloorCorridors_Text_InsertedKey, MSGBOX_DEFAULT playse SE_PIN takeitem ITEM_ROOM_6_KEY, 1 setflag FLAG_USED_ROOM_6_KEY - call AbandonedShip_HiddenFloorCorridors_EventScript_2389E7 + call AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom6 special DrawWholeMapView releaseall end -AbandonedShip_HiddenFloorCorridors_EventScript_238AF5:: @ 8238AF5 - msgbox AbandonedShip_HiddenFloorCorridors_Text_238B27, MSGBOX_DEFAULT +AbandonedShip_HiddenFloorCorridors_EventScript_Rm1IsLocked:: @ 8238AF5 + msgbox AbandonedShip_HiddenFloorCorridors_Text_Rm1DoorIsLocked, MSGBOX_DEFAULT releaseall end -AbandonedShip_HiddenFloorCorridors_EventScript_238AFF:: @ 8238AFF - msgbox AbandonedShip_HiddenFloorCorridors_Text_238B5B, MSGBOX_DEFAULT +AbandonedShip_HiddenFloorCorridors_EventScript_Rm2IsLocked:: @ 8238AFF + msgbox AbandonedShip_HiddenFloorCorridors_Text_Rm2DoorIsLocked, MSGBOX_DEFAULT releaseall end -AbandonedShip_HiddenFloorCorridors_EventScript_238B09:: @ 8238B09 - msgbox AbandonedShip_HiddenFloorCorridors_Text_238B8F, MSGBOX_DEFAULT +AbandonedShip_HiddenFloorCorridors_EventScript_Rm4IsLocked:: @ 8238B09 + msgbox AbandonedShip_HiddenFloorCorridors_Text_Rm4DoorIsLocked, MSGBOX_DEFAULT releaseall end -AbandonedShip_HiddenFloorCorridors_EventScript_238B13:: @ 8238B13 - msgbox AbandonedShip_HiddenFloorCorridors_Text_238BC3, MSGBOX_DEFAULT +AbandonedShip_HiddenFloorCorridors_EventScript_Rm6IsLocked:: @ 8238B13 + msgbox AbandonedShip_HiddenFloorCorridors_Text_Rm6DoorIsLocked, MSGBOX_DEFAULT releaseall end -AbandonedShip_HiddenFloorCorridors_EventScript_238B1D:: @ 8238B1D - msgbox AbandonedShip_HiddenFloorCorridors_Text_237FA5, MSGBOX_DEFAULT +AbandonedShip_HiddenFloorCorridors_EventScript_TheDoorIsOpen:: @ 8238B1D + msgbox AbandonedShip_Text_TheDoorIsOpen, MSGBOX_DEFAULT releaseall end -AbandonedShip_HiddenFloorCorridors_Text_238B27: @ 8238B27 +AbandonedShip_HiddenFloorCorridors_Text_Rm1DoorIsLocked: @ 8238B27 .string "The door is locked.\p" .string "“RM. 1” is painted on the door.$" -AbandonedShip_HiddenFloorCorridors_Text_238B5B: @ 8238B5B +AbandonedShip_HiddenFloorCorridors_Text_Rm2DoorIsLocked: @ 8238B5B .string "The door is locked.\p" .string "“RM. 2” is painted on the door.$" -AbandonedShip_HiddenFloorCorridors_Text_238B8F: @ 8238B8F +AbandonedShip_HiddenFloorCorridors_Text_Rm4DoorIsLocked: @ 8238B8F .string "The door is locked.\p" .string "“RM. 4” is painted on the door.$" -AbandonedShip_HiddenFloorCorridors_Text_238BC3: @ 8238BC3 +AbandonedShip_HiddenFloorCorridors_Text_Rm6DoorIsLocked: @ 8238BC3 .string "The door is locked.\p" .string "“RM. 6” is painted on the door.$" -AbandonedShip_HiddenFloorCorridors_Text_238BF7: @ 8238BF7 +AbandonedShip_HiddenFloorCorridors_Text_InsertedKey: @ 8238BF7 .string "{PLAYER} inserted and turned the\n" .string "KEY.\p" .string "The inserted KEY stuck fast,\n" diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/map.json b/data/maps/AbandonedShip_HiddenFloorRooms/map.json index fdfb8a187..f937eb649 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/map.json +++ b/data/maps/AbandonedShip_HiddenFloorRooms/map.json @@ -172,7 +172,7 @@ "y": 5, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "AbandonedShip_HiddenFloorRooms_EventScript_238DF3" + "script": "AbandonedShip_HiddenFloorRooms_EventScript_Trash" }, { "type": "sign", @@ -180,7 +180,7 @@ "y": 3, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "AbandonedShip_HiddenFloorRooms_EventScript_238DF3" + "script": "AbandonedShip_HiddenFloorRooms_EventScript_Trash" }, { "type": "sign", @@ -188,7 +188,7 @@ "y": 10, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "AbandonedShip_HiddenFloorRooms_EventScript_238DF3" + "script": "AbandonedShip_HiddenFloorRooms_EventScript_Trash" }, { "type": "sign", @@ -196,7 +196,7 @@ "y": 3, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "AbandonedShip_HiddenFloorRooms_EventScript_238DF3" + "script": "AbandonedShip_HiddenFloorRooms_EventScript_Trash" }, { "type": "sign", @@ -204,7 +204,7 @@ "y": 2, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "AbandonedShip_HiddenFloorRooms_EventScript_238DF3" + "script": "AbandonedShip_HiddenFloorRooms_EventScript_Trash" }, { "type": "sign", @@ -212,7 +212,7 @@ "y": 6, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "AbandonedShip_HiddenFloorRooms_EventScript_238DF3" + "script": "AbandonedShip_HiddenFloorRooms_EventScript_Trash" } ] } \ No newline at end of file diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc index 2d6f7ee77..8193c788f 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc @@ -1,148 +1,125 @@ AbandonedShip_HiddenFloorRooms_MapScripts:: @ 8238C49 - map_script MAP_SCRIPT_ON_FRAME_TABLE, AbandonedShip_HiddenFloorRooms_MapScript2_238C4F + map_script MAP_SCRIPT_ON_FRAME_TABLE, AbandonedShip_HiddenFloorRooms_OnFrame .byte 0 -AbandonedShip_HiddenFloorRooms_MapScript2_238C4F: @ 8238C4F - map_script_2 VAR_TEMP_1, 0, AbandonedShip_HiddenFloorRooms_EventScript_238C59 +AbandonedShip_HiddenFloorRooms_OnFrame: @ 8238C4F + map_script_2 VAR_TEMP_1, 0, AbandonedShip_HiddenFloorRooms_EventScript_DoHiddenItemSparkle .2byte 0 -AbandonedShip_HiddenFloorRooms_EventScript_238C59:: @ 8238C59 +@ After the below calculation, VAR_TEMP_4 is the room number of the door the player entered +@ Bottom row, left column (Rm 1) +@ Bottom row, middle column (Rm 2) +@ Bottom row, right column (Rm 3) +@ Upper row, left column (Rm 4) +@ Upper row, middle column (Rm 5) +@ Upper row, right column (Rm 6) +AbandonedShip_HiddenFloorRooms_EventScript_DoHiddenItemSparkle:: @ 8238C59 setvar VAR_TEMP_1, 1 getplayerxy VAR_TEMP_2, VAR_TEMP_3 setvar VAR_TEMP_4, 1 compare VAR_TEMP_2, 21 - call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238CD1 + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_InMiddleRoomColumn compare VAR_TEMP_2, 36 - call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238CD7 + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_InRightRoomColumn compare VAR_TEMP_3, 2 - call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238CDD + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_InUpperRoomRow switch VAR_TEMP_4 - case 1, AbandonedShip_HiddenFloorRooms_EventScript_238CE3 - case 2, AbandonedShip_HiddenFloorRooms_EventScript_238D0C - case 3, AbandonedShip_HiddenFloorRooms_EventScript_238D0D - case 4, AbandonedShip_HiddenFloorRooms_EventScript_238D33 - case 5, AbandonedShip_HiddenFloorRooms_EventScript_238D6B - case 6, AbandonedShip_HiddenFloorRooms_EventScript_238DB2 + case 1, AbandonedShip_HiddenFloorRooms_EventScript_EnterRm1 + case 2, AbandonedShip_HiddenFloorRooms_EventScript_EnterRm2 + case 3, AbandonedShip_HiddenFloorRooms_EventScript_EnterRm3 + case 4, AbandonedShip_HiddenFloorRooms_EventScript_EnterRm4 + case 5, AbandonedShip_HiddenFloorRooms_EventScript_EnterRm5 + case 6, AbandonedShip_HiddenFloorRooms_EventScript_EnterRm6 end -AbandonedShip_HiddenFloorRooms_EventScript_238CD1:: @ 8238CD1 +AbandonedShip_HiddenFloorRooms_EventScript_InMiddleRoomColumn:: @ 8238CD1 addvar VAR_TEMP_4, 1 return -AbandonedShip_HiddenFloorRooms_EventScript_238CD7:: @ 8238CD7 +AbandonedShip_HiddenFloorRooms_EventScript_InRightRoomColumn:: @ 8238CD7 addvar VAR_TEMP_4, 2 return -AbandonedShip_HiddenFloorRooms_EventScript_238CDD:: @ 8238CDD +AbandonedShip_HiddenFloorRooms_EventScript_InUpperRoomRow:: @ 8238CDD addvar VAR_TEMP_4, 3 return -AbandonedShip_HiddenFloorRooms_EventScript_238CE3:: @ 8238CE3 +AbandonedShip_HiddenFloorRooms_EventScript_EnterRm1:: @ 8238CE3 delay 20 - setfieldeffectargument 0, 10 - setfieldeffectargument 1, 10 - setfieldeffectargument 2, 0 - dofieldeffect FLDEFF_SPARKLE + dofieldeffectsparkle 10, 10 specialvar VAR_RESULT, FoundAbandonedShipRoom4Key - compare VAR_RESULT, 0 - call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DD3 + compare VAR_RESULT, FALSE + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_Rm4KeySparkle waitfieldeffect FLDEFF_SPARKLE delay 10 end -AbandonedShip_HiddenFloorRooms_EventScript_238D0C:: @ 8238D0C +AbandonedShip_HiddenFloorRooms_EventScript_EnterRm2:: @ 8238D0C end -AbandonedShip_HiddenFloorRooms_EventScript_238D0D:: @ 8238D0D +AbandonedShip_HiddenFloorRooms_EventScript_EnterRm3:: @ 8238D0D specialvar VAR_RESULT, FoundAbandonedShipRoom1Key - compare VAR_RESULT, 1 - goto_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238D32 + compare VAR_RESULT, TRUE + goto_if_eq AbandonedShip_HiddenFloorRooms_EventScript_Rm3NoSparkle delay 20 - compare VAR_RESULT, 0 - call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DB3 + compare VAR_RESULT, FALSE + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_Rm1KeySparkle waitfieldeffect FLDEFF_SPARKLE delay 10 end -AbandonedShip_HiddenFloorRooms_EventScript_238D32:: @ 8238D32 +AbandonedShip_HiddenFloorRooms_EventScript_Rm3NoSparkle:: @ 8238D32 end -AbandonedShip_HiddenFloorRooms_EventScript_238D33:: @ 8238D33 +AbandonedShip_HiddenFloorRooms_EventScript_EnterRm4:: @ 8238D33 delay 20 - setfieldeffectargument 0, 8 - setfieldeffectargument 1, 5 - setfieldeffectargument 2, 0 - dofieldeffect FLDEFF_SPARKLE - setfieldeffectargument 0, 11 - setfieldeffectargument 1, 3 - setfieldeffectargument 2, 0 - dofieldeffect FLDEFF_SPARKLE + dofieldeffectsparkle 8, 5 + dofieldeffectsparkle 11, 3 specialvar VAR_RESULT, FoundAbandonedShipRoom6Key - compare VAR_RESULT, 0 - call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DE3 + compare VAR_RESULT, FALSE + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_Rm6KeySparkle waitfieldeffect FLDEFF_SPARKLE delay 10 end -AbandonedShip_HiddenFloorRooms_EventScript_238D6B:: @ 8238D6B +AbandonedShip_HiddenFloorRooms_EventScript_EnterRm5:: @ 8238D6B delay 20 - setfieldeffectargument 0, 16 - setfieldeffectargument 1, 3 - setfieldeffectargument 2, 0 - dofieldeffect FLDEFF_SPARKLE - setfieldeffectargument 0, 25 - setfieldeffectargument 1, 2 - setfieldeffectargument 2, 0 - dofieldeffect FLDEFF_SPARKLE - setfieldeffectargument 0, 24 - setfieldeffectargument 1, 6 - setfieldeffectargument 2, 0 - dofieldeffect FLDEFF_SPARKLE + dofieldeffectsparkle 16, 3 + dofieldeffectsparkle 25, 2 + dofieldeffectsparkle 24, 6 specialvar VAR_RESULT, FoundAbandonedShipRoom2Key - compare VAR_RESULT, 0 - call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DC3 + compare VAR_RESULT, FALSE + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_Rm2KeySparkle waitfieldeffect FLDEFF_SPARKLE delay 10 end -AbandonedShip_HiddenFloorRooms_EventScript_238DB2:: @ 8238DB2 +AbandonedShip_HiddenFloorRooms_EventScript_EnterRm6:: @ 8238DB2 end -AbandonedShip_HiddenFloorRooms_EventScript_238DB3:: @ 8238DB3 - setfieldeffectargument 0, 42 - setfieldeffectargument 1, 10 - setfieldeffectargument 2, 0 - dofieldeffect FLDEFF_SPARKLE +AbandonedShip_HiddenFloorRooms_EventScript_Rm1KeySparkle:: @ 8238DB3 + dofieldeffectsparkle 42, 10 return -AbandonedShip_HiddenFloorRooms_EventScript_238DC3:: @ 8238DC3 - setfieldeffectargument 0, 20 - setfieldeffectargument 1, 5 - setfieldeffectargument 2, 0 - dofieldeffect FLDEFF_SPARKLE +AbandonedShip_HiddenFloorRooms_EventScript_Rm2KeySparkle:: @ 8238DC3 + dofieldeffectsparkle 20, 5 return -AbandonedShip_HiddenFloorRooms_EventScript_238DD3:: @ 8238DD3 - setfieldeffectargument 0, 1 - setfieldeffectargument 1, 12 - setfieldeffectargument 2, 0 - dofieldeffect FLDEFF_SPARKLE +AbandonedShip_HiddenFloorRooms_EventScript_Rm4KeySparkle:: @ 8238DD3 + dofieldeffectsparkle 1, 12 return -AbandonedShip_HiddenFloorRooms_EventScript_238DE3:: @ 8238DE3 - setfieldeffectargument 0, 1 - setfieldeffectargument 1, 2 - setfieldeffectargument 2, 0 - dofieldeffect FLDEFF_SPARKLE +AbandonedShip_HiddenFloorRooms_EventScript_Rm6KeySparkle:: @ 8238DE3 + dofieldeffectsparkle 1, 2 return -AbandonedShip_HiddenFloorRooms_EventScript_238DF3:: @ 8238DF3 +AbandonedShip_HiddenFloorRooms_EventScript_Trash:: @ 8238DF3 lockall - msgbox AbandonedShip_HiddenFloorRooms_Text_238DFE, MSGBOX_DEFAULT + msgbox AbandonedShip_HiddenFloorRooms_Text_BrightShinyTrash, MSGBOX_DEFAULT releaseall end -AbandonedShip_HiddenFloorRooms_Text_238DFE: @ 8238DFE +AbandonedShip_HiddenFloorRooms_Text_BrightShinyTrash: @ 8238DFE .string "It's bright and shiny!\n" .string "But it's just trash…$" diff --git a/data/maps/AbandonedShip_Rooms2_1F/map.json b/data/maps/AbandonedShip_Rooms2_1F/map.json index 35b029f7f..6f39d4827 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/map.json +++ b/data/maps/AbandonedShip_Rooms2_1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "AbandonedShip_Rooms2_1F_EventScript_2380A7", + "script": "AbandonedShip_Rooms2_1F_EventScript_Dan", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "AbandonedShip_Rooms2_1F_EventScript_23810B", + "script": "AbandonedShip_Rooms2_1F_EventScript_Kira", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "AbandonedShip_Rooms2_1F_EventScript_238186", + "script": "AbandonedShip_Rooms2_1F_EventScript_Garrison", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "AbandonedShip_Rooms2_1F_EventScript_23816F", + "script": "AbandonedShip_Rooms2_1F_EventScript_Jani", "flag": "0" } ], diff --git a/data/maps/AbandonedShip_Rooms2_1F/scripts.inc b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc index ec382e56c..a09242fc9 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/scripts.inc +++ b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc @@ -1,151 +1,151 @@ AbandonedShip_Rooms2_1F_MapScripts:: @ 82380A6 .byte 0 -AbandonedShip_Rooms2_1F_EventScript_2380A7:: @ 82380A7 - trainerbattle_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_23819D, AbandonedShip_Rooms2_1F_Text_2381DA, AbandonedShip_Rooms2_1F_Text_238257, AbandonedShip_Rooms2_1F_EventScript_2380D7 +AbandonedShip_Rooms2_1F_EventScript_Dan:: @ 82380A7 + trainerbattle_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_DanIntro, AbandonedShip_Rooms2_1F_Text_DanDefeat, AbandonedShip_Rooms2_1F_Text_DanNotEnoughMons, AbandonedShip_Rooms2_1F_EventScript_RegisterDan specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq AbandonedShip_Rooms2_1F_EventScript_2380F0 - msgbox AbandonedShip_Rooms2_1F_Text_23820F, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq AbandonedShip_Rooms2_1F_EventScript_DanRematch + msgbox AbandonedShip_Rooms2_1F_Text_DanPostBattle, MSGBOX_DEFAULT release end -AbandonedShip_Rooms2_1F_EventScript_2380D7:: @ 82380D7 - msgbox AbandonedShip_Rooms2_1F_Text_2383BB, MSGBOX_DEFAULT +AbandonedShip_Rooms2_1F_EventScript_RegisterDan:: @ 82380D7 + msgbox AbandonedShip_Rooms2_1F_Text_KiraRegister, MSGBOX_DEFAULT @ Kira speaks for both when registering KiraAndDan register_matchcall TRAINER_KIRA_AND_DAN_1 release end -AbandonedShip_Rooms2_1F_EventScript_2380F0:: @ 82380F0 - trainerbattle_rematch_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_2383FF, AbandonedShip_Rooms2_1F_Text_238473, AbandonedShip_Rooms2_1F_Text_238509 - msgbox AbandonedShip_Rooms2_1F_Text_238491, MSGBOX_AUTOCLOSE +AbandonedShip_Rooms2_1F_EventScript_DanRematch:: @ 82380F0 + trainerbattle_rematch_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_DanRematchIntro, AbandonedShip_Rooms2_1F_Text_DanRematchDefeat, AbandonedShip_Rooms2_1F_Text_DanRematchNotEnoughMons + msgbox AbandonedShip_Rooms2_1F_Text_DanPostRematch, MSGBOX_AUTOCLOSE end -AbandonedShip_Rooms2_1F_EventScript_23810B:: @ 823810B - trainerbattle_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_2382A4, AbandonedShip_Rooms2_1F_Text_2382F4, AbandonedShip_Rooms2_1F_Text_23836F, AbandonedShip_Rooms2_1F_EventScript_23813B +AbandonedShip_Rooms2_1F_EventScript_Kira:: @ 823810B + trainerbattle_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_KiraIntro, AbandonedShip_Rooms2_1F_Text_KiraDefeat, AbandonedShip_Rooms2_1F_Text_KiraNotEnoughMons, AbandonedShip_Rooms2_1F_EventScript_RegisterKira specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq AbandonedShip_Rooms2_1F_EventScript_238154 - msgbox AbandonedShip_Rooms2_1F_Text_23830A, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq AbandonedShip_Rooms2_1F_EventScript_KiraRematch + msgbox AbandonedShip_Rooms2_1F_Text_KiraPostBattle, MSGBOX_DEFAULT release end -AbandonedShip_Rooms2_1F_EventScript_23813B:: @ 823813B - msgbox AbandonedShip_Rooms2_1F_Text_2383BB, MSGBOX_DEFAULT +AbandonedShip_Rooms2_1F_EventScript_RegisterKira:: @ 823813B + msgbox AbandonedShip_Rooms2_1F_Text_KiraRegister, MSGBOX_DEFAULT register_matchcall TRAINER_KIRA_AND_DAN_1 release end -AbandonedShip_Rooms2_1F_EventScript_238154:: @ 8238154 - trainerbattle_rematch_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_238556, AbandonedShip_Rooms2_1F_Text_2385F2, AbandonedShip_Rooms2_1F_Text_238668 - msgbox AbandonedShip_Rooms2_1F_Text_23860B, MSGBOX_AUTOCLOSE +AbandonedShip_Rooms2_1F_EventScript_KiraRematch:: @ 8238154 + trainerbattle_rematch_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_KiraRematchIntro, AbandonedShip_Rooms2_1F_Text_KiraRematchDefeat, AbandonedShip_Rooms2_1F_Text_KiraRematchNotEnoughMons + msgbox AbandonedShip_Rooms2_1F_Text_KiraPostRematch, MSGBOX_AUTOCLOSE end -AbandonedShip_Rooms2_1F_EventScript_23816F:: @ 823816F - trainerbattle_single TRAINER_JANI, AbandonedShip_Rooms2_1F_Text_2386B4, AbandonedShip_Rooms2_1F_Text_2386E8 - msgbox AbandonedShip_Rooms2_1F_Text_238708, MSGBOX_AUTOCLOSE +AbandonedShip_Rooms2_1F_EventScript_Jani:: @ 823816F + trainerbattle_single TRAINER_JANI, AbandonedShip_Rooms2_1F_Text_JaniIntro, AbandonedShip_Rooms2_1F_Text_JaniDefeat + msgbox AbandonedShip_Rooms2_1F_Text_JaniPostBattle, MSGBOX_AUTOCLOSE end -AbandonedShip_Rooms2_1F_EventScript_238186:: @ 8238186 - trainerbattle_single TRAINER_GARRISON, AbandonedShip_Rooms2_1F_Text_23873F, AbandonedShip_Rooms2_1F_Text_238779 - msgbox AbandonedShip_Rooms2_1F_Text_2387A9, MSGBOX_AUTOCLOSE +AbandonedShip_Rooms2_1F_EventScript_Garrison:: @ 8238186 + trainerbattle_single TRAINER_GARRISON, AbandonedShip_Rooms2_1F_Text_GarrisonIntro, AbandonedShip_Rooms2_1F_Text_GarrisonDefeat + msgbox AbandonedShip_Rooms2_1F_Text_GarrisonPostBattle, MSGBOX_AUTOCLOSE end -AbandonedShip_Rooms2_1F_Text_23819D: @ 823819D +AbandonedShip_Rooms2_1F_Text_DanIntro: @ 823819D .string "DAN: While searching for treasures,\n" .string "we discovered a TRAINER!$" -AbandonedShip_Rooms2_1F_Text_2381DA: @ 82381DA +AbandonedShip_Rooms2_1F_Text_DanDefeat: @ 82381DA .string "DAN: We couldn't win even though\n" .string "we worked together…$" -AbandonedShip_Rooms2_1F_Text_23820F: @ 823820F +AbandonedShip_Rooms2_1F_Text_DanPostBattle: @ 823820F .string "DAN: We can't find any treasures…\n" .string "I wonder if someone got them already?$" -AbandonedShip_Rooms2_1F_Text_238257: @ 8238257 +AbandonedShip_Rooms2_1F_Text_DanNotEnoughMons: @ 8238257 .string "DAN: You don't even have two POKéMON.\n" .string "You can't expect to beat us like that.$" -AbandonedShip_Rooms2_1F_Text_2382A4: @ 82382A4 +AbandonedShip_Rooms2_1F_Text_KiraIntro: @ 82382A4 .string "KIRA: Oh?\n" .string "We were searching for treasures.\l" .string "But we discovered a TRAINER instead!$" -AbandonedShip_Rooms2_1F_Text_2382F4: @ 82382F4 +AbandonedShip_Rooms2_1F_Text_KiraDefeat: @ 82382F4 .string "KIRA: Ooh, so strong!$" -AbandonedShip_Rooms2_1F_Text_23830A: @ 823830A +AbandonedShip_Rooms2_1F_Text_KiraPostBattle: @ 823830A .string "KIRA: Where could the treasures be?\p" .string "I've already decided what I'm buying\n" .string "when we find the treasures!$" -AbandonedShip_Rooms2_1F_Text_23836F: @ 823836F +AbandonedShip_Rooms2_1F_Text_KiraNotEnoughMons: @ 823836F .string "KIRA: Oh, you don't have two POKéMON?\n" .string "We'll have to battle some other time!$" -AbandonedShip_Rooms2_1F_Text_2383BB: @ 82383BB +AbandonedShip_Rooms2_1F_Text_KiraRegister: @ 82383BB .string "KIRA: Oh, you make me so angry!\n" .string "I'm going to register you for that!$" -AbandonedShip_Rooms2_1F_Text_2383FF: @ 82383FF +AbandonedShip_Rooms2_1F_Text_DanRematchIntro: @ 82383FF .string "DAN: We've been searching for\n" .string "treasures all this time.\p" .string "Our POKéMON have grown stronger, too.\n" .string "Let us show you, okay?$" -AbandonedShip_Rooms2_1F_Text_238473: @ 8238473 +AbandonedShip_Rooms2_1F_Text_DanRematchDefeat: @ 8238473 .string "DAN: You're strong, as usual!$" -AbandonedShip_Rooms2_1F_Text_238491: @ 8238491 +AbandonedShip_Rooms2_1F_Text_DanPostRematch: @ 8238491 .string "DAN: We can't find any treasures,\n" .string "we lose at POKéMON…\p" .string "I want to go home… But if I say that,\n" .string "she gets all angry with me…$" -AbandonedShip_Rooms2_1F_Text_238509: @ 8238509 +AbandonedShip_Rooms2_1F_Text_DanRematchNotEnoughMons: @ 8238509 .string "DAN: You don't even have two POKéMON.\n" .string "You can't expect to beat us like that.$" -AbandonedShip_Rooms2_1F_Text_238556: @ 8238556 +AbandonedShip_Rooms2_1F_Text_KiraRematchIntro: @ 8238556 .string "KIRA: Oh? We meet again!\p" .string "Just like us, you still haven't given up\n" .string "searching for treasures, have you?\p" .string "Want to make it so the loser has\n" .string "to give up searching?$" -AbandonedShip_Rooms2_1F_Text_2385F2: @ 82385F2 +AbandonedShip_Rooms2_1F_Text_KiraRematchDefeat: @ 82385F2 .string "KIRA: Oh, we lost again…$" -AbandonedShip_Rooms2_1F_Text_23860B: @ 823860B +AbandonedShip_Rooms2_1F_Text_KiraPostRematch: @ 823860B .string "KIRA: We're not leaving until we raise\n" .string "our POKéMON some more and we find\l" .string "the treasures here!$" -AbandonedShip_Rooms2_1F_Text_238668: @ 8238668 +AbandonedShip_Rooms2_1F_Text_KiraRematchNotEnoughMons: @ 8238668 .string "KIRA: Oh, you don't have two POKéMON?\n" .string "We'll have to battle some other time!$" -AbandonedShip_Rooms2_1F_Text_2386B4: @ 82386B4 +AbandonedShip_Rooms2_1F_Text_JaniIntro: @ 82386B4 .string "I'm not good at swimming,\n" .string "but I am good at battles!$" -AbandonedShip_Rooms2_1F_Text_2386E8: @ 82386E8 +AbandonedShip_Rooms2_1F_Text_JaniDefeat: @ 82386E8 .string "Oops.\n" .string "That didn't go very well.$" -AbandonedShip_Rooms2_1F_Text_238708: @ 8238708 +AbandonedShip_Rooms2_1F_Text_JaniPostBattle: @ 8238708 .string "Walking around barefoot in this ship\n" .string "is kind of gross.$" -AbandonedShip_Rooms2_1F_Text_23873F: @ 823873F +AbandonedShip_Rooms2_1F_Text_GarrisonIntro: @ 823873F .string "Strength and compassion…\n" .string "Those are a TRAINER's treasures!$" -AbandonedShip_Rooms2_1F_Text_238779: @ 8238779 +AbandonedShip_Rooms2_1F_Text_GarrisonDefeat: @ 8238779 .string "Ah, there is something about you\n" .string "that sparkles.$" -AbandonedShip_Rooms2_1F_Text_2387A9: @ 82387A9 +AbandonedShip_Rooms2_1F_Text_GarrisonPostBattle: @ 82387A9 .string "In a cabin somewhere on board,\n" .string "I saw something sparkle.$" diff --git a/data/maps/AbandonedShip_Rooms2_B1F/map.json b/data/maps/AbandonedShip_Rooms2_B1F/map.json index 621b80bb1..672d2c54e 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/map.json +++ b/data/maps/AbandonedShip_Rooms2_B1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "AbandonedShip_Rooms2_B1F_EventScript_238025", + "script": "AbandonedShip_Rooms2_B1F_EventScript_Camper", "flag": "0" }, { diff --git a/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc b/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc index a0b9e3946..5c2418696 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc +++ b/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc @@ -1,11 +1,11 @@ AbandonedShip_Rooms2_B1F_MapScripts:: @ 8238024 .byte 0 -AbandonedShip_Rooms2_B1F_EventScript_238025:: @ 8238025 - msgbox AbandonedShip_Rooms2_B1F_Text_23802E, MSGBOX_NPC +AbandonedShip_Rooms2_B1F_EventScript_Camper:: @ 8238025 + msgbox AbandonedShip_Rooms2_B1F_Text_PerfectPlaceToGoExploring, MSGBOX_NPC end -AbandonedShip_Rooms2_B1F_Text_23802E: @ 823802E +AbandonedShip_Rooms2_B1F_Text_PerfectPlaceToGoExploring: @ 823802E .string "This is a perfect place to go exploring!\n" .string "It's exciting here!\p" .string "I bet there're amazing treasures on\n" diff --git a/data/maps/AbandonedShip_Rooms_1F/map.json b/data/maps/AbandonedShip_Rooms_1F/map.json index af25a3994..28feaf940 100644 --- a/data/maps/AbandonedShip_Rooms_1F/map.json +++ b/data/maps/AbandonedShip_Rooms_1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "AbandonedShip_Rooms_1F_EventScript_237A93", + "script": "AbandonedShip_Rooms_1F_EventScript_Gentleman", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "AbandonedShip_Rooms_1F_EventScript_237AB3", + "script": "AbandonedShip_Rooms_1F_EventScript_Thalia", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "AbandonedShip_Rooms_1F_EventScript_237A9C", + "script": "AbandonedShip_Rooms_1F_EventScript_Demetrius", "flag": "0" } ], diff --git a/data/maps/AbandonedShip_Rooms_1F/scripts.inc b/data/maps/AbandonedShip_Rooms_1F/scripts.inc index 2c3ff862a..cabbb45ea 100644 --- a/data/maps/AbandonedShip_Rooms_1F/scripts.inc +++ b/data/maps/AbandonedShip_Rooms_1F/scripts.inc @@ -1,78 +1,78 @@ AbandonedShip_Rooms_1F_MapScripts:: @ 8237A92 .byte 0 -AbandonedShip_Rooms_1F_EventScript_237A93:: @ 8237A93 - msgbox AbandonedShip_Rooms_1F_Text_237B15, MSGBOX_NPC +AbandonedShip_Rooms_1F_EventScript_Gentleman:: @ 8237A93 + msgbox AbandonedShip_Rooms_1F_Text_TakingALookAround, MSGBOX_NPC end -AbandonedShip_Rooms_1F_EventScript_237A9C:: @ 8237A9C - trainerbattle_single TRAINER_DEMETRIUS, AbandonedShip_Rooms_1F_Text_237D0C, AbandonedShip_Rooms_1F_Text_237D2A - msgbox AbandonedShip_Rooms_1F_Text_237D41, MSGBOX_AUTOCLOSE +AbandonedShip_Rooms_1F_EventScript_Demetrius:: @ 8237A9C + trainerbattle_single TRAINER_DEMETRIUS, AbandonedShip_Rooms_1F_Text_DemetriusIntro, AbandonedShip_Rooms_1F_Text_DemetriusDefeat + msgbox AbandonedShip_Rooms_1F_Text_DemetriusPostBattle, MSGBOX_AUTOCLOSE end -AbandonedShip_Rooms_1F_EventScript_237AB3:: @ 8237AB3 - trainerbattle_single TRAINER_THALIA_1, AbandonedShip_Rooms_1F_Text_237B76, AbandonedShip_Rooms_1F_Text_237BB8, AbandonedShip_Rooms_1F_EventScript_237ADF +AbandonedShip_Rooms_1F_EventScript_Thalia:: @ 8237AB3 + trainerbattle_single TRAINER_THALIA_1, AbandonedShip_Rooms_1F_Text_ThaliaIntro, AbandonedShip_Rooms_1F_Text_ThaliaDefeat, AbandonedShip_Rooms_1F_EventScript_RegisterThalia specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq AbandonedShip_Rooms_1F_EventScript_237AFE - msgbox AbandonedShip_Rooms_1F_Text_237BDB, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq AbandonedShip_Rooms_1F_EventScript_ThaliaRematch + msgbox AbandonedShip_Rooms_1F_Text_ThaliaPostBattle, MSGBOX_DEFAULT release end -AbandonedShip_Rooms_1F_EventScript_237ADF:: @ 8237ADF +AbandonedShip_Rooms_1F_EventScript_RegisterThalia:: @ 8237ADF special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox AbandonedShip_Rooms_1F_Text_237C2A, MSGBOX_DEFAULT + msgbox AbandonedShip_Rooms_1F_Text_ThaliaRegister, MSGBOX_DEFAULT register_matchcall TRAINER_THALIA_1 release end -AbandonedShip_Rooms_1F_EventScript_237AFE:: @ 8237AFE - trainerbattle_rematch TRAINER_THALIA_1, AbandonedShip_Rooms_1F_Text_237C69, AbandonedShip_Rooms_1F_Text_237CB2 - msgbox AbandonedShip_Rooms_1F_Text_237CC9, MSGBOX_AUTOCLOSE +AbandonedShip_Rooms_1F_EventScript_ThaliaRematch:: @ 8237AFE + trainerbattle_rematch TRAINER_THALIA_1, AbandonedShip_Rooms_1F_Text_ThaliaRematchIntro, AbandonedShip_Rooms_1F_Text_ThaliaRematchDefeat + msgbox AbandonedShip_Rooms_1F_Text_ThaliaPostRematch, MSGBOX_AUTOCLOSE end -AbandonedShip_Rooms_1F_Text_237B15: @ 8237B15 +AbandonedShip_Rooms_1F_Text_TakingALookAround: @ 8237B15 .string "Ships of this sort are rare, so I'm\n" .string "taking a look around.\p" .string "Hmhm…\n" .string "There appear to be other cabins…$" -AbandonedShip_Rooms_1F_Text_237B76: @ 8237B76 +AbandonedShip_Rooms_1F_Text_ThaliaIntro: @ 8237B76 .string "What on earth would compel you to\n" .string "come here? You must be curious!$" -AbandonedShip_Rooms_1F_Text_237BB8: @ 8237BB8 +AbandonedShip_Rooms_1F_Text_ThaliaDefeat: @ 8237BB8 .string "Not just curious, but also strong…$" -AbandonedShip_Rooms_1F_Text_237BDB: @ 8237BDB +AbandonedShip_Rooms_1F_Text_ThaliaPostBattle: @ 8237BDB .string "The man next door…\p" .string "He says he's just sightseeing,\n" .string "but I don't know about that.$" -AbandonedShip_Rooms_1F_Text_237C2A: @ 8237C2A +AbandonedShip_Rooms_1F_Text_ThaliaRegister: @ 8237C2A .string "You're such a tough TRAINER!\n" .string "Let me register you as a memento!$" -AbandonedShip_Rooms_1F_Text_237C69: @ 8237C69 +AbandonedShip_Rooms_1F_Text_ThaliaRematchIntro: @ 8237C69 .string "What on earth would compel you to\n" .string "come back? You must really be curious!$" -AbandonedShip_Rooms_1F_Text_237CB2: @ 8237CB2 +AbandonedShip_Rooms_1F_Text_ThaliaRematchDefeat: @ 8237CB2 .string "Aren't you too strong?$" -AbandonedShip_Rooms_1F_Text_237CC9: @ 8237CC9 +AbandonedShip_Rooms_1F_Text_ThaliaPostRematch: @ 8237CC9 .string "I'm sure that man's up to something!\n" .string "He just acts so suspiciously!$" -AbandonedShip_Rooms_1F_Text_237D0C: @ 8237D0C +AbandonedShip_Rooms_1F_Text_DemetriusIntro: @ 8237D0C .string "Waaah!\n" .string "I've been found! …Huh?$" -AbandonedShip_Rooms_1F_Text_237D2A: @ 8237D2A +AbandonedShip_Rooms_1F_Text_DemetriusDefeat: @ 8237D2A .string "Oh, you're not my mom.$" -AbandonedShip_Rooms_1F_Text_237D41: @ 8237D41 +AbandonedShip_Rooms_1F_Text_DemetriusPostBattle: @ 8237D41 .string "I'm in trouble with my mom, so I ran.\n" .string "Keep it a secret where I am!$" diff --git a/data/maps/AbandonedShip_Rooms_B1F/map.json b/data/maps/AbandonedShip_Rooms_B1F/map.json index 2e836f3a1..0af0a05ac 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/map.json +++ b/data/maps/AbandonedShip_Rooms_B1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "AbandonedShip_Rooms_B1F_EventScript_237FC6", + "script": "AbandonedShip_Rooms_B1F_EventScript_FatMan", "flag": "0" }, { diff --git a/data/maps/AbandonedShip_Rooms_B1F/scripts.inc b/data/maps/AbandonedShip_Rooms_B1F/scripts.inc index 05223592e..80208b051 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/scripts.inc +++ b/data/maps/AbandonedShip_Rooms_B1F/scripts.inc @@ -1,16 +1,16 @@ AbandonedShip_Rooms_B1F_MapScripts:: @ 8237FB7 - map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Rooms_B1F_MapScript1_237FBD + map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Rooms_B1F_OnResume .byte 0 -AbandonedShip_Rooms_B1F_MapScript1_237FBD: @ 8237FBD +AbandonedShip_Rooms_B1F_OnResume: @ 8237FBD setdivewarp MAP_ABANDONED_SHIP_UNDERWATER2, 255, 17, 4 end -AbandonedShip_Rooms_B1F_EventScript_237FC6:: @ 8237FC6 - msgbox AbandonedShip_Rooms_B1F_Text_237FCF, MSGBOX_NPC +AbandonedShip_Rooms_B1F_EventScript_FatMan:: @ 8237FC6 + msgbox AbandonedShip_Rooms_B1F_Text_GettingQueasy, MSGBOX_NPC end -AbandonedShip_Rooms_B1F_Text_237FCF: @ 8237FCF +AbandonedShip_Rooms_B1F_Text_GettingQueasy: @ 8237FCF .string "Urrrrppp…\p" .string "I'm getting queasy just being aboard\n" .string "this ship…\p" diff --git a/data/maps/AbandonedShip_Underwater1/scripts.inc b/data/maps/AbandonedShip_Underwater1/scripts.inc index b957bb6be..9e10c19f5 100644 --- a/data/maps/AbandonedShip_Underwater1/scripts.inc +++ b/data/maps/AbandonedShip_Underwater1/scripts.inc @@ -1,8 +1,8 @@ AbandonedShip_Underwater1_MapScripts:: @ 8238096 - map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Underwater1_MapScript1_23809C + map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Underwater1_OnResume .byte 0 -AbandonedShip_Underwater1_MapScript1_23809C: @ 823809C +AbandonedShip_Underwater1_OnResume: @ 823809C setdivewarp MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS, 255, 0, 10 end diff --git a/data/maps/AbandonedShip_Underwater2/scripts.inc b/data/maps/AbandonedShip_Underwater2/scripts.inc index cc000b09c..40e6c1e5e 100644 --- a/data/maps/AbandonedShip_Underwater2/scripts.inc +++ b/data/maps/AbandonedShip_Underwater2/scripts.inc @@ -1,8 +1,8 @@ AbandonedShip_Underwater2_MapScripts:: @ 823895D - map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Underwater2_MapScript1_238963 + map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Underwater2_OnResume .byte 0 -AbandonedShip_Underwater2_MapScript1_238963: @ 8238963 +AbandonedShip_Underwater2_OnResume: @ 8238963 setdivewarp MAP_ABANDONED_SHIP_ROOMS_B1F, 255, 13, 7 end diff --git a/include/constants/metatile_labels.h b/include/constants/metatile_labels.h index 2f3ce5f71..6d17fc047 100644 --- a/include/constants/metatile_labels.h +++ b/include/constants/metatile_labels.h @@ -255,10 +255,10 @@ #define METATILE_EliteFour_EntryDoor_ClosedBottom 0x20E // gTileset_InsideShip -#define METATILE_InsideShip_InTactDoor0_Bottom 0x233 -#define METATILE_InsideShip_InTactDoor1_Bottom 0x22B -#define METATILE_InsideShip_DoorIndent1 0x21A -#define METATILE_InsideShip_DoorIndent0 0x234 +#define METATILE_InsideShip_IntactDoor_Bottom_Unlocked 0x22B +#define METATILE_InsideShip_IntactDoor_Bottom_Locked 0x233 +#define METATILE_InsideShip_DoorIndent_Unlocked 0x21A +#define METATILE_InsideShip_DoorIndent_Locked 0x234 // gTileset_BattlePike #define METATILE_BattlePike_Curtain_Stage0_Tile0 0x24A From dba94e3971579e6babf77fa72d8c9e5031cf72fe Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 6 Nov 2019 10:11:54 -0500 Subject: [PATCH 08/40] Update fldeff sparkle macro --- asm/macros/event.inc | 4 ++-- .../scripts.inc | 20 +++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/asm/macros/event.inc b/asm/macros/event.inc index e616ea3ae..40430fe53 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -1680,9 +1680,9 @@ callstd STD_REGISTER_MATCH_CALL .endm - .macro dofieldeffectsparkle x:req y:req + .macro dofieldeffectsparkle x:req, y:req, priority:req setfieldeffectargument 0, \x setfieldeffectargument 1, \y - setfieldeffectargument 2, 0 + setfieldeffectargument 2, \priority dofieldeffect FLDEFF_SPARKLE .endm diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc index 8193c788f..53a7ee2ed 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc @@ -46,7 +46,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_InUpperRoomRow:: @ 8238CDD AbandonedShip_HiddenFloorRooms_EventScript_EnterRm1:: @ 8238CE3 delay 20 - dofieldeffectsparkle 10, 10 + dofieldeffectsparkle 10, 10, 0 specialvar VAR_RESULT, FoundAbandonedShipRoom4Key compare VAR_RESULT, FALSE call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_Rm4KeySparkle @@ -73,8 +73,8 @@ AbandonedShip_HiddenFloorRooms_EventScript_Rm3NoSparkle:: @ 8238D32 AbandonedShip_HiddenFloorRooms_EventScript_EnterRm4:: @ 8238D33 delay 20 - dofieldeffectsparkle 8, 5 - dofieldeffectsparkle 11, 3 + dofieldeffectsparkle 8, 5, 0 + dofieldeffectsparkle 11, 3, 0 specialvar VAR_RESULT, FoundAbandonedShipRoom6Key compare VAR_RESULT, FALSE call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_Rm6KeySparkle @@ -84,9 +84,9 @@ AbandonedShip_HiddenFloorRooms_EventScript_EnterRm4:: @ 8238D33 AbandonedShip_HiddenFloorRooms_EventScript_EnterRm5:: @ 8238D6B delay 20 - dofieldeffectsparkle 16, 3 - dofieldeffectsparkle 25, 2 - dofieldeffectsparkle 24, 6 + dofieldeffectsparkle 16, 3, 0 + dofieldeffectsparkle 25, 2, 0 + dofieldeffectsparkle 24, 6, 0 specialvar VAR_RESULT, FoundAbandonedShipRoom2Key compare VAR_RESULT, FALSE call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_Rm2KeySparkle @@ -98,19 +98,19 @@ AbandonedShip_HiddenFloorRooms_EventScript_EnterRm6:: @ 8238DB2 end AbandonedShip_HiddenFloorRooms_EventScript_Rm1KeySparkle:: @ 8238DB3 - dofieldeffectsparkle 42, 10 + dofieldeffectsparkle 42, 10, 0 return AbandonedShip_HiddenFloorRooms_EventScript_Rm2KeySparkle:: @ 8238DC3 - dofieldeffectsparkle 20, 5 + dofieldeffectsparkle 20, 5, 0 return AbandonedShip_HiddenFloorRooms_EventScript_Rm4KeySparkle:: @ 8238DD3 - dofieldeffectsparkle 1, 12 + dofieldeffectsparkle 1, 12, 0 return AbandonedShip_HiddenFloorRooms_EventScript_Rm6KeySparkle:: @ 8238DE3 - dofieldeffectsparkle 1, 2 + dofieldeffectsparkle 1, 2, 0 return AbandonedShip_HiddenFloorRooms_EventScript_Trash:: @ 8238DF3 From 903b8060a734134a585cbb7ed6ec8d780b5b3281 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 6 Nov 2019 11:09:02 -0500 Subject: [PATCH 09/40] Document Glass Workshop --- data/maps/Route113_GlassWorkshop/map.json | 4 +- data/maps/Route113_GlassWorkshop/scripts.inc | 319 ++++++++++--------- 2 files changed, 166 insertions(+), 157 deletions(-) diff --git a/data/maps/Route113_GlassWorkshop/map.json b/data/maps/Route113_GlassWorkshop/map.json index 70e342048..0f57ce2b8 100644 --- a/data/maps/Route113_GlassWorkshop/map.json +++ b/data/maps/Route113_GlassWorkshop/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route113_GlassWorkshop_EventScript_26ED1E", + "script": "Route113_GlassWorkshop_EventScript_GlassWorker", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route113_GlassWorkshop_EventScript_26F194", + "script": "Route113_GlassWorkshop_EventScript_NinjaBoy", "flag": "0" } ], diff --git a/data/maps/Route113_GlassWorkshop/scripts.inc b/data/maps/Route113_GlassWorkshop/scripts.inc index e1339c75c..b959cf523 100644 --- a/data/maps/Route113_GlassWorkshop/scripts.inc +++ b/data/maps/Route113_GlassWorkshop/scripts.inc @@ -2,313 +2,322 @@ Route113_GlassWorkshop_MapScripts:: @ 826ED03 map_script MAP_SCRIPT_ON_TRANSITION, Route113_GlassWorkshop_OnTransition .byte 0 + .set BLUE_FLUTE_PRICE, 250 + .set YELLOW_FLUTE_PRICE, 500 + .set RED_FLUTE_PRICE, 500 + .set WHITE_FLUTE_PRICE, 1000 + .set BLACK_FLUTE_PRICE, 1000 + .set PRETTY_CHAIR_PRICE, 6000 + .set PRETTY_DESK_PRICE, 8000 + .set LOWEST_ASH_PRICE, BLUE_FLUTE_PRICE + Route113_GlassWorkshop_OnTransition: @ 826ED09 setflag FLAG_LANDMARK_GLASS_WORKSHOP compare VAR_GLASS_WORKSHOP_STATE, 1 - call_if_eq Route113_GlassWorkshop_EventScript_26ED18 + call_if_eq Route113_GlassWorkshop_EventScript_ReenterWorkshopAfterSootSack end -Route113_GlassWorkshop_EventScript_26ED18:: @ 826ED18 +Route113_GlassWorkshop_EventScript_ReenterWorkshopAfterSootSack:: @ 826ED18 setvar VAR_GLASS_WORKSHOP_STATE, 2 return -Route113_GlassWorkshop_EventScript_26ED1E:: @ 826ED1E +Route113_GlassWorkshop_EventScript_GlassWorker:: @ 826ED1E lock faceplayer compare VAR_GLASS_WORKSHOP_STATE, 10 - goto_if_ge Route113_GlassWorkshop_EventScript_26F090 + goto_if_ge Route113_GlassWorkshop_EventScript_GiveItemAfterNoRoom compare VAR_GLASS_WORKSHOP_STATE, 2 - goto_if_eq Route113_GlassWorkshop_EventScript_26ED6E + goto_if_eq Route113_GlassWorkshop_EventScript_CheckCollectedAsh compare VAR_GLASS_WORKSHOP_STATE, 1 - goto_if_eq Route113_GlassWorkshop_EventScript_26ED64 - msgbox Route113_GlassWorkshop_Text_26F19D, MSGBOX_DEFAULT + goto_if_eq Route113_GlassWorkshop_EventScript_ExplainSootSack + msgbox Route113_GlassWorkshop_Text_GoCollectAshWithThis, MSGBOX_DEFAULT giveitem_std ITEM_SOOT_SACK setvar VAR_GLASS_WORKSHOP_STATE, 1 - msgbox Route113_GlassWorkshop_Text_26F252, MSGBOX_DEFAULT + msgbox Route113_GlassWorkshop_Text_ExplainSootSack, MSGBOX_DEFAULT release end -Route113_GlassWorkshop_EventScript_26ED64:: @ 826ED64 - msgbox Route113_GlassWorkshop_Text_26F252, MSGBOX_DEFAULT +Route113_GlassWorkshop_EventScript_ExplainSootSack:: @ 826ED64 + msgbox Route113_GlassWorkshop_Text_ExplainSootSack, MSGBOX_DEFAULT release end -Route113_GlassWorkshop_EventScript_26ED6E:: @ 826ED6E +Route113_GlassWorkshop_EventScript_CheckCollectedAsh:: @ 826ED6E checkitem ITEM_SOOT_SACK, 1 - compare VAR_RESULT, 0 - goto_if_eq Route113_GlassWorkshop_EventScript_26ED9D - msgbox Route113_GlassWorkshop_Text_26F312, MSGBOX_DEFAULT - compare VAR_ASH_GATHER_COUNT, 250 - goto_if_lt Route113_GlassWorkshop_EventScript_26EFD6 - message Route113_GlassWorkshop_Text_26F40A + compare VAR_RESULT, FALSE + goto_if_eq Route113_GlassWorkshop_EventScript_SootSackNotInBag + msgbox Route113_GlassWorkshop_Text_LetsSeeCollectedAshes, MSGBOX_DEFAULT + compare VAR_ASH_GATHER_COUNT, LOWEST_ASH_PRICE + goto_if_lt Route113_GlassWorkshop_EventScript_NotEnoughAsh + message Route113_GlassWorkshop_Text_WhichGlassItemWoudYouLike waitmessage - goto Route113_GlassWorkshop_EventScript_26EDA7 + goto Route113_GlassWorkshop_EventScript_ChooseGlassItem end -Route113_GlassWorkshop_EventScript_26ED9D:: @ 826ED9D - msgbox Route113_GlassWorkshop_Text_26F772, MSGBOX_DEFAULT +Route113_GlassWorkshop_EventScript_SootSackNotInBag:: @ 826ED9D + msgbox Route113_GlassWorkshop_Text_HaventGotYourSootSack, MSGBOX_DEFAULT release end -Route113_GlassWorkshop_EventScript_26EDA7:: @ 826EDA7 +Route113_GlassWorkshop_EventScript_ChooseGlassItem:: @ 826EDA7 setvar VAR_0x8009, 0 setvar VAR_0x8004, SCROLL_MULTI_GLASS_WORKSHOP_VENDOR special ShowScrollableMultichoice waitstate switch VAR_RESULT - case 0, Route113_GlassWorkshop_EventScript_26EE1E - case 1, Route113_GlassWorkshop_EventScript_26EE5A - case 2, Route113_GlassWorkshop_EventScript_26EE96 - case 3, Route113_GlassWorkshop_EventScript_26EED2 - case 4, Route113_GlassWorkshop_EventScript_26EF0E - case 5, Route113_GlassWorkshop_EventScript_26EF4A - case 6, Route113_GlassWorkshop_EventScript_26EF8B - case 7, Route113_GlassWorkshop_EventScript_26EFCC - case MULTI_B_PRESSED, Route113_GlassWorkshop_EventScript_26EFCC + case 0, Route113_GlassWorkshop_EventScript_BlueFlute + case 1, Route113_GlassWorkshop_EventScript_YellowFlute + case 2, Route113_GlassWorkshop_EventScript_RedFlute + case 3, Route113_GlassWorkshop_EventScript_WhiteFlute + case 4, Route113_GlassWorkshop_EventScript_BlackFlute + case 5, Route113_GlassWorkshop_EventScript_PrettyChair + case 6, Route113_GlassWorkshop_EventScript_PrettyDesk + case 7, Route113_GlassWorkshop_EventScript_CancelGlassItemSelect + case MULTI_B_PRESSED, Route113_GlassWorkshop_EventScript_CancelGlassItemSelect end -Route113_GlassWorkshop_EventScript_26EE1E:: @ 826EE1E +Route113_GlassWorkshop_EventScript_BlueFlute:: @ 826EE1E setvar VAR_0x8008, ITEM_BLUE_FLUTE bufferitemname 0, VAR_0x8008 - setvar VAR_0x800A, 250 - compare VAR_ASH_GATHER_COUNT, 250 - goto_if_lt Route113_GlassWorkshop_EventScript_26EFEE - msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO + setvar VAR_0x800A, BLUE_FLUTE_PRICE + compare VAR_ASH_GATHER_COUNT, BLUE_FLUTE_PRICE + goto_if_lt Route113_GlassWorkshop_EventScript_NotEnoughAshForItem + msgbox Route113_GlassWorkshop_Text_IsThatTheItemForYou, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq Route113_GlassWorkshop_EventScript_26F003 + goto_if_eq Route113_GlassWorkshop_EventScript_ChooseDifferentItem setvar VAR_GLASS_WORKSHOP_STATE, 10 - subvar VAR_ASH_GATHER_COUNT, 250 - goto Route113_GlassWorkshop_EventScript_26F00F + subvar VAR_ASH_GATHER_COUNT, BLUE_FLUTE_PRICE + goto Route113_GlassWorkshop_EventScript_MakeGlassItem end -Route113_GlassWorkshop_EventScript_26EE5A:: @ 826EE5A +Route113_GlassWorkshop_EventScript_YellowFlute:: @ 826EE5A setvar VAR_0x8008, ITEM_YELLOW_FLUTE bufferitemname 0, VAR_0x8008 - setvar VAR_0x800A, 500 - compare VAR_ASH_GATHER_COUNT, 500 - goto_if_lt Route113_GlassWorkshop_EventScript_26EFEE - msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO + setvar VAR_0x800A, YELLOW_FLUTE_PRICE + compare VAR_ASH_GATHER_COUNT, YELLOW_FLUTE_PRICE + goto_if_lt Route113_GlassWorkshop_EventScript_NotEnoughAshForItem + msgbox Route113_GlassWorkshop_Text_IsThatTheItemForYou, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq Route113_GlassWorkshop_EventScript_26F003 + goto_if_eq Route113_GlassWorkshop_EventScript_ChooseDifferentItem setvar VAR_GLASS_WORKSHOP_STATE, 11 - subvar VAR_ASH_GATHER_COUNT, 500 - goto Route113_GlassWorkshop_EventScript_26F00F + subvar VAR_ASH_GATHER_COUNT, YELLOW_FLUTE_PRICE + goto Route113_GlassWorkshop_EventScript_MakeGlassItem end -Route113_GlassWorkshop_EventScript_26EE96:: @ 826EE96 +Route113_GlassWorkshop_EventScript_RedFlute:: @ 826EE96 setvar VAR_0x8008, ITEM_RED_FLUTE bufferitemname 0, VAR_0x8008 - setvar VAR_0x800A, 500 - compare VAR_ASH_GATHER_COUNT, 500 - goto_if_lt Route113_GlassWorkshop_EventScript_26EFEE - msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO + setvar VAR_0x800A, RED_FLUTE_PRICE + compare VAR_ASH_GATHER_COUNT, RED_FLUTE_PRICE + goto_if_lt Route113_GlassWorkshop_EventScript_NotEnoughAshForItem + msgbox Route113_GlassWorkshop_Text_IsThatTheItemForYou, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq Route113_GlassWorkshop_EventScript_26F003 + goto_if_eq Route113_GlassWorkshop_EventScript_ChooseDifferentItem setvar VAR_GLASS_WORKSHOP_STATE, 12 - subvar VAR_ASH_GATHER_COUNT, 500 - goto Route113_GlassWorkshop_EventScript_26F00F + subvar VAR_ASH_GATHER_COUNT, RED_FLUTE_PRICE + goto Route113_GlassWorkshop_EventScript_MakeGlassItem end -Route113_GlassWorkshop_EventScript_26EED2:: @ 826EED2 +Route113_GlassWorkshop_EventScript_WhiteFlute:: @ 826EED2 setvar VAR_0x8008, ITEM_WHITE_FLUTE bufferitemname 0, VAR_0x8008 - setvar VAR_0x800A, 1000 - compare VAR_ASH_GATHER_COUNT, 1000 - goto_if_lt Route113_GlassWorkshop_EventScript_26EFEE - msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO + setvar VAR_0x800A, WHITE_FLUTE_PRICE + compare VAR_ASH_GATHER_COUNT, WHITE_FLUTE_PRICE + goto_if_lt Route113_GlassWorkshop_EventScript_NotEnoughAshForItem + msgbox Route113_GlassWorkshop_Text_IsThatTheItemForYou, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq Route113_GlassWorkshop_EventScript_26F003 + goto_if_eq Route113_GlassWorkshop_EventScript_ChooseDifferentItem setvar VAR_GLASS_WORKSHOP_STATE, 13 - subvar VAR_ASH_GATHER_COUNT, 1000 - goto Route113_GlassWorkshop_EventScript_26F00F + subvar VAR_ASH_GATHER_COUNT, WHITE_FLUTE_PRICE + goto Route113_GlassWorkshop_EventScript_MakeGlassItem end -Route113_GlassWorkshop_EventScript_26EF0E:: @ 826EF0E +Route113_GlassWorkshop_EventScript_BlackFlute:: @ 826EF0E setvar VAR_0x8008, ITEM_BLACK_FLUTE bufferitemname 0, VAR_0x8008 - setvar VAR_0x800A, 1000 - compare VAR_ASH_GATHER_COUNT, 1000 - goto_if_lt Route113_GlassWorkshop_EventScript_26EFEE - msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO + setvar VAR_0x800A, BLACK_FLUTE_PRICE + compare VAR_ASH_GATHER_COUNT, BLACK_FLUTE_PRICE + goto_if_lt Route113_GlassWorkshop_EventScript_NotEnoughAshForItem + msgbox Route113_GlassWorkshop_Text_IsThatTheItemForYou, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq Route113_GlassWorkshop_EventScript_26F003 + goto_if_eq Route113_GlassWorkshop_EventScript_ChooseDifferentItem setvar VAR_GLASS_WORKSHOP_STATE, 14 - subvar VAR_ASH_GATHER_COUNT, 1000 - goto Route113_GlassWorkshop_EventScript_26F00F + subvar VAR_ASH_GATHER_COUNT, BLACK_FLUTE_PRICE + goto Route113_GlassWorkshop_EventScript_MakeGlassItem end -Route113_GlassWorkshop_EventScript_26EF4A:: @ 826EF4A +Route113_GlassWorkshop_EventScript_PrettyChair:: @ 826EF4A setvar VAR_0x8009, 1 setvar VAR_0x8008, DECOR_PRETTY_CHAIR bufferdecorationname 0, VAR_0x8008 - setvar VAR_0x800A, 6000 - compare VAR_ASH_GATHER_COUNT, 6000 - goto_if_lt Route113_GlassWorkshop_EventScript_26EFEE - msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO + setvar VAR_0x800A, PRETTY_CHAIR_PRICE + compare VAR_ASH_GATHER_COUNT, PRETTY_CHAIR_PRICE + goto_if_lt Route113_GlassWorkshop_EventScript_NotEnoughAshForItem + msgbox Route113_GlassWorkshop_Text_IsThatTheItemForYou, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq Route113_GlassWorkshop_EventScript_26F003 + goto_if_eq Route113_GlassWorkshop_EventScript_ChooseDifferentItem setvar VAR_GLASS_WORKSHOP_STATE, 15 - subvar VAR_ASH_GATHER_COUNT, 6000 - goto Route113_GlassWorkshop_EventScript_26F00F + subvar VAR_ASH_GATHER_COUNT, PRETTY_CHAIR_PRICE + goto Route113_GlassWorkshop_EventScript_MakeGlassItem end -Route113_GlassWorkshop_EventScript_26EF8B:: @ 826EF8B +Route113_GlassWorkshop_EventScript_PrettyDesk:: @ 826EF8B setvar VAR_0x8009, 1 setvar VAR_0x8008, DECOR_PRETTY_DESK bufferdecorationname 0, VAR_0x8008 - setvar VAR_0x800A, 8000 - compare VAR_ASH_GATHER_COUNT, 8000 - goto_if_lt Route113_GlassWorkshop_EventScript_26EFEE - msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO + setvar VAR_0x800A, PRETTY_DESK_PRICE + compare VAR_ASH_GATHER_COUNT, PRETTY_DESK_PRICE + goto_if_lt Route113_GlassWorkshop_EventScript_NotEnoughAshForItem + msgbox Route113_GlassWorkshop_Text_IsThatTheItemForYou, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq Route113_GlassWorkshop_EventScript_26F003 + goto_if_eq Route113_GlassWorkshop_EventScript_ChooseDifferentItem setvar VAR_GLASS_WORKSHOP_STATE, 16 - subvar VAR_ASH_GATHER_COUNT, 8000 - goto Route113_GlassWorkshop_EventScript_26F00F + subvar VAR_ASH_GATHER_COUNT, PRETTY_DESK_PRICE + goto Route113_GlassWorkshop_EventScript_MakeGlassItem end -Route113_GlassWorkshop_EventScript_26EFCC:: @ 826EFCC - msgbox Route113_GlassWorkshop_Text_26F641, MSGBOX_DEFAULT +Route113_GlassWorkshop_EventScript_CancelGlassItemSelect:: @ 826EFCC + msgbox Route113_GlassWorkshop_Text_AllThatAshButDontWantAnything, MSGBOX_DEFAULT release end -Route113_GlassWorkshop_EventScript_26EFD6:: @ 826EFD6 - setvar VAR_0x800A, 250 +Route113_GlassWorkshop_EventScript_NotEnoughAsh:: @ 826EFD6 + setvar VAR_0x800A, LOWEST_ASH_PRICE subvar VAR_0x800A, VAR_ASH_GATHER_COUNT buffernumberstring 0, VAR_0x800A - msgbox Route113_GlassWorkshop_Text_26F34E, MSGBOX_DEFAULT + msgbox Route113_GlassWorkshop_Text_NotEnoughAshNeedX, MSGBOX_DEFAULT release end -Route113_GlassWorkshop_EventScript_26EFEE:: @ 826EFEE +Route113_GlassWorkshop_EventScript_NotEnoughAshForItem:: @ 826EFEE subvar VAR_0x800A, VAR_ASH_GATHER_COUNT buffernumberstring 1, VAR_0x800A - message Route113_GlassWorkshop_Text_26F543 + message Route113_GlassWorkshop_Text_NotEnoughAshToMakeItem waitmessage - goto Route113_GlassWorkshop_EventScript_26EDA7 + goto Route113_GlassWorkshop_EventScript_ChooseGlassItem end -Route113_GlassWorkshop_EventScript_26F003:: @ 826F003 - message Route113_GlassWorkshop_Text_26F4B5 +Route113_GlassWorkshop_EventScript_ChooseDifferentItem:: @ 826F003 + message Route113_GlassWorkshop_Text_WhichWouldYouLike waitmessage - goto Route113_GlassWorkshop_EventScript_26EDA7 + goto Route113_GlassWorkshop_EventScript_ChooseGlassItem end -Route113_GlassWorkshop_EventScript_26F00F:: @ 826F00F - msgbox Route113_GlassWorkshop_Text_26F4DA, MSGBOX_DEFAULT +Route113_GlassWorkshop_EventScript_MakeGlassItem:: @ 826F00F + msgbox Route113_GlassWorkshop_Text_IllMakeItemForYou, MSGBOX_DEFAULT closemessage fadescreen 1 playse SE_SELECT delay 30 fadescreen 0 - msgbox Route113_GlassWorkshop_Text_26F688, MSGBOX_DEFAULT + msgbox Route113_GlassWorkshop_Text_IveFinishedGlassItem, MSGBOX_DEFAULT compare VAR_0x8009, 0 - call_if_eq Route113_GlassWorkshop_EventScript_26F047 + call_if_eq Route113_GlassWorkshop_EventScript_GiveGlassFlute compare VAR_0x8009, 1 - call_if_eq Route113_GlassWorkshop_EventScript_26F05F + call_if_eq Route113_GlassWorkshop_EventScript_GiveGlassDecor setvar VAR_GLASS_WORKSHOP_STATE, 2 release end -Route113_GlassWorkshop_EventScript_26F047:: @ 826F047 +Route113_GlassWorkshop_EventScript_GiveGlassFlute:: @ 826F047 giveitem_std VAR_0x8008 - compare VAR_RESULT, 0 - goto_if_eq Route113_GlassWorkshop_EventScript_26F072 + compare VAR_RESULT, FALSE + goto_if_eq Route113_GlassWorkshop_EventScript_NoRoomForFlute return -Route113_GlassWorkshop_EventScript_26F05F:: @ 826F05F +Route113_GlassWorkshop_EventScript_GiveGlassDecor:: @ 826F05F givedecoration_std VAR_0x8008 - compare VAR_RESULT, 0 - goto_if_eq Route113_GlassWorkshop_EventScript_26F081 + compare VAR_RESULT, FALSE + goto_if_eq Route113_GlassWorkshop_EventScript_NoRoomForDecor return -Route113_GlassWorkshop_EventScript_26F072:: @ 826F072 +Route113_GlassWorkshop_EventScript_NoRoomForFlute:: @ 826F072 call Common_EventScript_BagIsFull - msgbox Route113_GlassWorkshop_Text_26F6B7, MSGBOX_DEFAULT + msgbox Route113_GlassWorkshop_Text_NoRoomInBag, MSGBOX_DEFAULT release end -Route113_GlassWorkshop_EventScript_26F081:: @ 826F081 +Route113_GlassWorkshop_EventScript_NoRoomForDecor:: @ 826F081 call Common_EventScript_NoRoomLeftForAnother - msgbox Route113_GlassWorkshop_Text_26F715, MSGBOX_DEFAULT + msgbox Route113_GlassWorkshop_Text_NoRoomInPC, MSGBOX_DEFAULT release end -Route113_GlassWorkshop_EventScript_26F090:: @ 826F090 +Route113_GlassWorkshop_EventScript_GiveItemAfterNoRoom:: @ 826F090 switch VAR_GLASS_WORKSHOP_STATE - case 10, Route113_GlassWorkshop_EventScript_26F0E3 - case 11, Route113_GlassWorkshop_EventScript_26F0F7 - case 12, Route113_GlassWorkshop_EventScript_26F10B - case 13, Route113_GlassWorkshop_EventScript_26F11F - case 14, Route113_GlassWorkshop_EventScript_26F133 - case 15, Route113_GlassWorkshop_EventScript_26F147 - case 16, Route113_GlassWorkshop_EventScript_26F15B + case 10, Route113_GlassWorkshop_EventScript_GiveBlueFlute + case 11, Route113_GlassWorkshop_EventScript_GiveYellowFlute + case 12, Route113_GlassWorkshop_EventScript_GiveRedFlute + case 13, Route113_GlassWorkshop_EventScript_GiveWhiteFlute + case 14, Route113_GlassWorkshop_EventScript_GiveBlackFlute + case 15, Route113_GlassWorkshop_EventScript_GivePrettyChair + case 16, Route113_GlassWorkshop_EventScript_GivePrettyDesk end -Route113_GlassWorkshop_EventScript_26F0E3:: @ 826F0E3 +Route113_GlassWorkshop_EventScript_GiveBlueFlute:: @ 826F0E3 setvar VAR_0x8009, 0 setvar VAR_0x8008, ITEM_BLUE_FLUTE bufferitemname 0, VAR_0x8008 - goto Route113_GlassWorkshop_EventScript_26F16F + goto Route113_GlassWorkshop_EventScript_TryGiveItemAgain end -Route113_GlassWorkshop_EventScript_26F0F7:: @ 826F0F7 +Route113_GlassWorkshop_EventScript_GiveYellowFlute:: @ 826F0F7 setvar VAR_0x8009, 0 setvar VAR_0x8008, ITEM_YELLOW_FLUTE bufferitemname 0, VAR_0x8008 - goto Route113_GlassWorkshop_EventScript_26F16F + goto Route113_GlassWorkshop_EventScript_TryGiveItemAgain end -Route113_GlassWorkshop_EventScript_26F10B:: @ 826F10B +Route113_GlassWorkshop_EventScript_GiveRedFlute:: @ 826F10B setvar VAR_0x8009, 0 setvar VAR_0x8008, ITEM_RED_FLUTE bufferitemname 0, VAR_0x8008 - goto Route113_GlassWorkshop_EventScript_26F16F + goto Route113_GlassWorkshop_EventScript_TryGiveItemAgain end -Route113_GlassWorkshop_EventScript_26F11F:: @ 826F11F +Route113_GlassWorkshop_EventScript_GiveWhiteFlute:: @ 826F11F setvar VAR_0x8009, 0 setvar VAR_0x8008, ITEM_WHITE_FLUTE bufferitemname 0, VAR_0x8008 - goto Route113_GlassWorkshop_EventScript_26F16F + goto Route113_GlassWorkshop_EventScript_TryGiveItemAgain end -Route113_GlassWorkshop_EventScript_26F133:: @ 826F133 +Route113_GlassWorkshop_EventScript_GiveBlackFlute:: @ 826F133 setvar VAR_0x8009, 0 setvar VAR_0x8008, ITEM_BLACK_FLUTE bufferitemname 0, VAR_0x8008 - goto Route113_GlassWorkshop_EventScript_26F16F + goto Route113_GlassWorkshop_EventScript_TryGiveItemAgain end -Route113_GlassWorkshop_EventScript_26F147:: @ 826F147 +Route113_GlassWorkshop_EventScript_GivePrettyChair:: @ 826F147 setvar VAR_0x8009, 1 setvar VAR_0x8008, DECOR_PRETTY_CHAIR bufferdecorationname 0, DECOR_PRETTY_CHAIR - goto Route113_GlassWorkshop_EventScript_26F16F + goto Route113_GlassWorkshop_EventScript_TryGiveItemAgain end -Route113_GlassWorkshop_EventScript_26F15B:: @ 826F15B +Route113_GlassWorkshop_EventScript_GivePrettyDesk:: @ 826F15B setvar VAR_0x8009, 1 setvar VAR_0x8008, DECOR_PRETTY_DESK bufferdecorationname 0, DECOR_PRETTY_DESK - goto Route113_GlassWorkshop_EventScript_26F16F + goto Route113_GlassWorkshop_EventScript_TryGiveItemAgain end -Route113_GlassWorkshop_EventScript_26F16F:: @ 826F16F - msgbox Route113_GlassWorkshop_Text_26F688, MSGBOX_DEFAULT +Route113_GlassWorkshop_EventScript_TryGiveItemAgain:: @ 826F16F + msgbox Route113_GlassWorkshop_Text_IveFinishedGlassItem, MSGBOX_DEFAULT compare VAR_0x8009, 0 - call_if_eq Route113_GlassWorkshop_EventScript_26F047 + call_if_eq Route113_GlassWorkshop_EventScript_GiveGlassFlute compare VAR_0x8009, 1 - call_if_eq Route113_GlassWorkshop_EventScript_26F05F + call_if_eq Route113_GlassWorkshop_EventScript_GiveGlassDecor setvar VAR_GLASS_WORKSHOP_STATE, 2 release end -Route113_GlassWorkshop_EventScript_26F194:: @ 826F194 - msgbox Route113_GlassWorkshop_Text_26F7EC, MSGBOX_NPC +Route113_GlassWorkshop_EventScript_NinjaBoy:: @ 826F194 + msgbox Route113_GlassWorkshop_Text_FunToBlowGlassFlute, MSGBOX_NPC end -Route113_GlassWorkshop_Text_26F19D: @ 826F19D +Route113_GlassWorkshop_Text_GoCollectAshWithThis: @ 826F19D .string "This area is covered in volcanic ash,\n" .string "huff-puff!\p" .string "I'm specially gifted, huff-puff.\p" @@ -316,7 +325,7 @@ Route113_GlassWorkshop_Text_26F19D: @ 826F19D .string "and make items, huff-puff.\p" .string "Go collect ashes with this, huff-puff.$" -Route113_GlassWorkshop_Text_26F252: @ 826F252 +Route113_GlassWorkshop_Text_ExplainSootSack: @ 826F252 .string "Just take that SOOT SACK and walk\n" .string "through piles of ash, huff-puff.\p" .string "And it will fill up with the volcanic ash,\n" @@ -324,11 +333,11 @@ Route113_GlassWorkshop_Text_26F252: @ 826F252 .string "Once you think you've collected a good\n" .string "amount, come see me, huff-puff.$" -Route113_GlassWorkshop_Text_26F312: @ 826F312 +Route113_GlassWorkshop_Text_LetsSeeCollectedAshes: @ 826F312 .string "Have you collected ashes, huff-puff?\n" .string "Let me see, huff-puff.$" -Route113_GlassWorkshop_Text_26F34E: @ 826F34E +Route113_GlassWorkshop_Text_NotEnoughAshNeedX: @ 826F34E .string "Hmmm…\n" .string "There's not enough ash here, huff-puff.\l" .string "I can't make glass with this, huff-puff.\p" @@ -336,25 +345,25 @@ Route113_GlassWorkshop_Text_26F34E: @ 826F34E .string "you'll need to walk for me to make you\l" .string "a BLUE FLUTE, huff-puff.$" -Route113_GlassWorkshop_Text_26F40A: @ 826F40A +Route113_GlassWorkshop_Text_WhichGlassItemWoudYouLike: @ 826F40A .string "Oh!\n" .string "You've got a lot of ashes, huff-puff!\p" .string "I'll make you a glass item, huff-puff!\n" .string "Which one would you like, huff-puff?$" -Route113_GlassWorkshop_Text_26F480: @ 826F480 +Route113_GlassWorkshop_Text_IsThatTheItemForYou: @ 826F480 .string "A {STR_VAR_1}, huff-puff?\n" .string "Is that the one for you, huff-puff?$" -Route113_GlassWorkshop_Text_26F4B5: @ 826F4B5 +Route113_GlassWorkshop_Text_WhichWouldYouLike: @ 826F4B5 .string "Which one would you like, huff-puff?$" -Route113_GlassWorkshop_Text_26F4DA: @ 826F4DA +Route113_GlassWorkshop_Text_IllMakeItemForYou: @ 826F4DA .string "A {STR_VAR_1} it is, then, huff-puff!\p" .string "Okay! I'll make it for you, huff-puff.\n" .string "Just wait a little while, huff-puff.$" -Route113_GlassWorkshop_Text_26F543: @ 826F543 +Route113_GlassWorkshop_Text_NotEnoughAshToMakeItem: @ 826F543 .string "A {STR_VAR_1}, huff-puff?\p" .string "There's not enough ash here to make\n" .string "that, though, huff-puff.\p" @@ -364,33 +373,33 @@ Route113_GlassWorkshop_Text_26F543: @ 826F543 .string "Which item would you rather have me\n" .string "make instead, huff-puff?$" -Route113_GlassWorkshop_Text_26F641: @ 826F641 +Route113_GlassWorkshop_Text_AllThatAshButDontWantAnything: @ 826F641 .string "You've collected all that ash, but you\n" .string "don't want anything, huff-puff?$" -Route113_GlassWorkshop_Text_26F688: @ 826F688 +Route113_GlassWorkshop_Text_IveFinishedGlassItem: @ 826F688 .string "Ah, I've finished your {STR_VAR_1}.\n" .string "Take it, huff-puff.$" -Route113_GlassWorkshop_Text_26F6B7: @ 826F6B7 +Route113_GlassWorkshop_Text_NoRoomInBag: @ 826F6B7 .string "Oh?\n" .string "You've no room in your BAG, huff-puff.\p" .string "I'll hold on to it, so come back later,\n" .string "huff-puff.$" -Route113_GlassWorkshop_Text_26F715: @ 826F715 +Route113_GlassWorkshop_Text_NoRoomInPC: @ 826F715 .string "Oh?\n" .string "You've no room in your PC, huff-puff?\p" .string "I'll hold on to it, so come back later,\n" .string "huff-puff.$" -Route113_GlassWorkshop_Text_26F772: @ 826F772 +Route113_GlassWorkshop_Text_HaventGotYourSootSack: @ 826F772 .string "Hah? You haven't got your SOOT SACK\n" .string "with you, huff-puff.\p" .string "You have to keep it with you to collect\n" .string "volcanic ash, huff-puff.$" -Route113_GlassWorkshop_Text_26F7EC: @ 826F7EC +Route113_GlassWorkshop_Text_FunToBlowGlassFlute: @ 826F7EC .string "It's fun to blow a glass flute while\n" .string "my boss is talking.\p" .string "Huff-huff! Puff-puff!$" From d0198088d982c8aff0f9d7fac2a5b257cafba58c Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 6 Nov 2019 11:30:50 -0500 Subject: [PATCH 10/40] Document Lanettes, Winstrates, Old Ladys, and Wingull houses --- data/event_scripts.s | 4 +- .../scripts.inc | 2 +- data/maps/MauvilleCity_GameCorner/scripts.inc | 4 +- data/maps/Route110_TrickHouseEnd/scripts.inc | 2 +- .../Route110_TrickHouseEntrance/scripts.inc | 2 +- data/maps/Route111_OldLadysRestStop/map.json | 2 +- .../Route111_OldLadysRestStop/scripts.inc | 30 +++++----- .../Route111_WinstrateFamilysHouse/map.json | 8 +-- .../scripts.inc | 56 +++++++++---------- data/maps/Route113_GlassWorkshop/scripts.inc | 2 +- data/maps/Route114_LanettesHouse/map.json | 8 +-- data/maps/Route114_LanettesHouse/scripts.inc | 50 ++++++++--------- data/maps/Route119_House/map.json | 14 ++--- data/maps/Route119_House/scripts.inc | 12 ++-- 14 files changed, 98 insertions(+), 98 deletions(-) diff --git a/data/event_scripts.s b/data/event_scripts.s index 532e87d36..b1e637bf0 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -825,12 +825,12 @@ Common_EventScript_BagIsFull:: @ 827205E msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT return -Route114_LanettesHouse_EventScript_272067:: @ 8272067 +Common_EventScript_ShowNoRoomForDecor:: @ 8272067 msgbox gText_NoRoomLeftForAnother, MSGBOX_DEFAULT release end -Common_EventScript_NoRoomLeftForAnother:: @ 8272071 +Common_EventScript_NoRoomForDecor:: @ 8272071 msgbox gText_NoRoomLeftForAnother, MSGBOX_DEFAULT return diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc index 71aead3e4..190c2b677 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc @@ -127,7 +127,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_2198EA:: @ 82198EA end LilycoveCity_LilycoveMuseum_2F_EventScript_219911:: @ 8219911 - call Common_EventScript_NoRoomLeftForAnother + call Common_EventScript_NoRoomForDecor msgbox LilycoveCity_LilycoveMuseum_2F_Text_219EED, MSGBOX_DEFAULT closemessage releaseall diff --git a/data/maps/MauvilleCity_GameCorner/scripts.inc b/data/maps/MauvilleCity_GameCorner/scripts.inc index 98f4a2a77..7e4180b92 100644 --- a/data/maps/MauvilleCity_GameCorner/scripts.inc +++ b/data/maps/MauvilleCity_GameCorner/scripts.inc @@ -213,7 +213,7 @@ MauvilleCity_GameCorner_EventScript_20FE79:: @ 820FE79 end MauvilleCity_GameCorner_EventScript_20FE87:: @ 820FE87 - call Common_EventScript_NoRoomLeftForAnother + call Common_EventScript_NoRoomForDecor goto MauvilleCity_GameCorner_EventScript_20FD20 end @@ -446,7 +446,7 @@ MauvilleCity_GameCorner_EventScript_2101D0:: @ 82101D0 end MauvilleCity_GameCorner_EventScript_2101FA:: @ 82101FA - call Common_EventScript_NoRoomLeftForAnother + call Common_EventScript_NoRoomForDecor msgbox MauvilleCity_GameCorner_Text_2107A9, MSGBOX_DEFAULT release end diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc index 46c4c316e..db5d2b5f2 100644 --- a/data/maps/Route110_TrickHouseEnd/scripts.inc +++ b/data/maps/Route110_TrickHouseEnd/scripts.inc @@ -206,7 +206,7 @@ Route110_TrickHouseEnd_EventScript_26AFEF:: @ 826AFEF return Route110_TrickHouseEnd_EventScript_26B002:: @ 826B002 - call Common_EventScript_NoRoomLeftForAnother + call Common_EventScript_NoRoomForDecor msgbox Route110_TrickHouseEnd_Text_26B615, MSGBOX_DEFAULT setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 1 return diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc index ab3ef25aa..8c8dae533 100644 --- a/data/maps/Route110_TrickHouseEntrance/scripts.inc +++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc @@ -445,7 +445,7 @@ Route110_TrickHouseEntrance_EventScript_26A039:: @ 826A039 compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A09A compare VAR_RESULT, 0 - call_if_eq Common_EventScript_NoRoomLeftForAnother + call_if_eq Common_EventScript_NoRoomForDecor msgbox Route110_TrickHouseEntrance_Text_26ABBD, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/Route111_OldLadysRestStop/map.json b/data/maps/Route111_OldLadysRestStop/map.json index c915bfb95..71afc39f8 100644 --- a/data/maps/Route111_OldLadysRestStop/map.json +++ b/data/maps/Route111_OldLadysRestStop/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route111_OldLadysRestStop_EventScript_22A920", + "script": "Route111_OldLadysRestStop_EventScript_OldLady", "flag": "0" } ], diff --git a/data/maps/Route111_OldLadysRestStop/scripts.inc b/data/maps/Route111_OldLadysRestStop/scripts.inc index 63b373fbf..0df1e6b6e 100644 --- a/data/maps/Route111_OldLadysRestStop/scripts.inc +++ b/data/maps/Route111_OldLadysRestStop/scripts.inc @@ -6,49 +6,49 @@ Route111_OldLadysRestStop_OnTransition: @ 822A91C setflag FLAG_LANDMARK_OLD_LADY_REST_SHOP end -Route111_OldLadysRestStop_EventScript_22A920:: @ 822A920 +Route111_OldLadysRestStop_EventScript_OldLady:: @ 822A920 lock faceplayer - msgbox Route111_OldLadysRestStop_Text_22A978, MSGBOX_YESNO + msgbox Route111_OldLadysRestStop_Text_RestUpHere, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq Route111_OldLadysRestStop_EventScript_22A941 + goto_if_eq Route111_OldLadysRestStop_EventScript_Rest compare VAR_RESULT, NO - goto_if_eq Route111_OldLadysRestStop_EventScript_22A96E + goto_if_eq Route111_OldLadysRestStop_EventScript_DeclineRest end -Route111_OldLadysRestStop_EventScript_22A941:: @ 822A941 - msgbox Route111_OldLadysRestStop_Text_22A9EC, MSGBOX_DEFAULT +Route111_OldLadysRestStop_EventScript_Rest:: @ 822A941 + msgbox Route111_OldLadysRestStop_Text_TakeYourTimeRestUp, MSGBOX_DEFAULT closemessage call Common_EventScript_OutOfCenterPartyHeal - msgbox Route111_OldLadysRestStop_Text_22AA16, MSGBOX_YESNO + msgbox Route111_OldLadysRestStop_Text_StillTiredTakeAnotherRest, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq Route111_OldLadysRestStop_EventScript_22A941 + goto_if_eq Route111_OldLadysRestStop_EventScript_Rest compare VAR_RESULT, NO - goto_if_eq Route111_OldLadysRestStop_EventScript_22A96E + goto_if_eq Route111_OldLadysRestStop_EventScript_DeclineRest end -Route111_OldLadysRestStop_EventScript_22A96E:: @ 822A96E - msgbox Route111_OldLadysRestStop_Text_22AA8F, MSGBOX_DEFAULT +Route111_OldLadysRestStop_EventScript_DeclineRest:: @ 822A96E + msgbox Route111_OldLadysRestStop_Text_DontNeedToBeShy, MSGBOX_DEFAULT release end -Route111_OldLadysRestStop_Text_22A978: @ 822A978 +Route111_OldLadysRestStop_Text_RestUpHere: @ 822A978 .string "Oh, dear, dear.\n" .string "Aren't your POKéMON exhausted?\p" .string "If you'd like, rest up here.\n" .string "That's a fine idea! You should do that.$" -Route111_OldLadysRestStop_Text_22A9EC: @ 822A9EC +Route111_OldLadysRestStop_Text_TakeYourTimeRestUp: @ 822A9EC .string "That's right.\n" .string "Take your time and rest up!$" -Route111_OldLadysRestStop_Text_22AA16: @ 822AA16 +Route111_OldLadysRestStop_Text_StillTiredTakeAnotherRest: @ 822AA16 .string "Oh, dear, dear.\n" .string "Are your POKéMON still tired?\p" .string "You should take another rest here.\n" .string "That's a fine idea. You should do that.$" -Route111_OldLadysRestStop_Text_22AA8F: @ 822AA8F +Route111_OldLadysRestStop_Text_DontNeedToBeShy: @ 822AA8F .string "Is that so?\n" .string "You don't need to be shy about it.$" diff --git a/data/maps/Route111_WinstrateFamilysHouse/map.json b/data/maps/Route111_WinstrateFamilysHouse/map.json index fed3dab3f..640de23cb 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/map.json +++ b/data/maps/Route111_WinstrateFamilysHouse/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route111_WinstrateFamilysHouse_EventScript_22A4E8", + "script": "Route111_WinstrateFamilysHouse_EventScript_Vivi", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route111_WinstrateFamilysHouse_EventScript_22A48D", + "script": "Route111_WinstrateFamilysHouse_EventScript_Victor", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route111_WinstrateFamilysHouse_EventScript_22A4A2", + "script": "Route111_WinstrateFamilysHouse_EventScript_Victoria", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route111_WinstrateFamilysHouse_EventScript_22A4FD", + "script": "Route111_WinstrateFamilysHouse_EventScript_Vicky", "flag": "0" } ], diff --git a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc index 312bf739f..387b8f630 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc +++ b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc @@ -1,63 +1,63 @@ Route111_WinstrateFamilysHouse_MapScripts:: @ 822A48C .byte 0 -Route111_WinstrateFamilysHouse_EventScript_22A48D:: @ 822A48D +Route111_WinstrateFamilysHouse_EventScript_Victor:: @ 822A48D lock faceplayer setvar VAR_0x8008, 2 - msgbox Route111_WinstrateFamilysHouse_Text_22A539, MSGBOX_DEFAULT - goto Route111_WinstrateFamilysHouse_EventScript_22A52C + msgbox Route111_WinstrateFamilysHouse_Text_MySonIsStrongerThanYou, MSGBOX_DEFAULT + goto Route111_WinstrateFamilysHouse_EventScript_FaceOriginalDirection end -Route111_WinstrateFamilysHouse_EventScript_22A4A2:: @ 822A4A2 +Route111_WinstrateFamilysHouse_EventScript_Victoria:: @ 822A4A2 lock faceplayer setvar VAR_0x8008, 3 - goto_if_set FLAG_RECEIVED_MACHO_BRACE, Route111_WinstrateFamilysHouse_EventScript_22A4DA - msgbox Route111_WinstrateFamilysHouse_Text_22A5F4, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_MACHO_BRACE, Route111_WinstrateFamilysHouse_EventScript_ReceivedMachoBrace + msgbox Route111_WinstrateFamilysHouse_Text_LikeYouToHaveMachoBrace, MSGBOX_DEFAULT giveitem_std ITEM_MACHO_BRACE - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_MACHO_BRACE - goto Route111_WinstrateFamilysHouse_EventScript_22A52C + goto Route111_WinstrateFamilysHouse_EventScript_FaceOriginalDirection end -Route111_WinstrateFamilysHouse_EventScript_22A4DA:: @ 822A4DA - msgbox Route111_WinstrateFamilysHouse_Text_22A6B4, MSGBOX_DEFAULT - goto Route111_WinstrateFamilysHouse_EventScript_22A52C +Route111_WinstrateFamilysHouse_EventScript_ReceivedMachoBrace:: @ 822A4DA + msgbox Route111_WinstrateFamilysHouse_Text_PassionateAboutBattles, MSGBOX_DEFAULT + goto Route111_WinstrateFamilysHouse_EventScript_FaceOriginalDirection end -Route111_WinstrateFamilysHouse_EventScript_22A4E8:: @ 822A4E8 +Route111_WinstrateFamilysHouse_EventScript_Vivi:: @ 822A4E8 lock faceplayer setvar VAR_0x8008, 1 - msgbox Route111_WinstrateFamilysHouse_Text_22A6F7, MSGBOX_DEFAULT - goto Route111_WinstrateFamilysHouse_EventScript_22A52C + msgbox Route111_WinstrateFamilysHouse_Text_StrongerFamilyMembers, MSGBOX_DEFAULT + goto Route111_WinstrateFamilysHouse_EventScript_FaceOriginalDirection end -Route111_WinstrateFamilysHouse_EventScript_22A4FD:: @ 822A4FD +Route111_WinstrateFamilysHouse_EventScript_Vicky:: @ 822A4FD lock faceplayer setvar VAR_0x8008, 4 - goto_if_set FLAG_TEMP_4, Route111_WinstrateFamilysHouse_EventScript_22A51E - msgbox Route111_WinstrateFamilysHouse_Text_22A780, MSGBOX_DEFAULT + goto_if_set FLAG_TEMP_4, Route111_WinstrateFamilysHouse_EventScript_AlreadySpokenTo + msgbox Route111_WinstrateFamilysHouse_Text_GrandsonStrong, MSGBOX_DEFAULT setflag FLAG_TEMP_4 - goto Route111_WinstrateFamilysHouse_EventScript_22A52C + goto Route111_WinstrateFamilysHouse_EventScript_FaceOriginalDirection end -Route111_WinstrateFamilysHouse_EventScript_22A51E:: @ 822A51E - msgbox Route111_WinstrateFamilysHouse_Text_22A89B, MSGBOX_DEFAULT - goto Route111_WinstrateFamilysHouse_EventScript_22A52C +Route111_WinstrateFamilysHouse_EventScript_AlreadySpokenTo:: @ 822A51E + msgbox Route111_WinstrateFamilysHouse_Text_GrandsonStrongShort, MSGBOX_DEFAULT + goto Route111_WinstrateFamilysHouse_EventScript_FaceOriginalDirection end -Route111_WinstrateFamilysHouse_EventScript_22A52C:: @ 822A52C +Route111_WinstrateFamilysHouse_EventScript_FaceOriginalDirection:: @ 822A52C closemessage applymovement VAR_0x8008, Common_Movement_FaceOriginalDirection waitmovement 0 release end -Route111_WinstrateFamilysHouse_Text_22A539: @ 822A539 +Route111_WinstrateFamilysHouse_Text_MySonIsStrongerThanYou: @ 822A539 .string "You're the first TRAINER I've seen who\n" .string "deploys POKéMON so masterfully.\p" .string "But, I should tell you--my son is\n" @@ -65,7 +65,7 @@ Route111_WinstrateFamilysHouse_Text_22A539: @ 822A539 .string "He even took the POKéMON LEAGUE\n" .string "challenge, I'll have you know.$" -Route111_WinstrateFamilysHouse_Text_22A5F4: @ 822A5F4 +Route111_WinstrateFamilysHouse_Text_LikeYouToHaveMachoBrace: @ 822A5F4 .string "We use this MACHO BRACE to more\n" .string "effectively strengthen our POKéMON\l" .string "in training.\p" @@ -73,18 +73,18 @@ Route111_WinstrateFamilysHouse_Text_22A5F4: @ 822A5F4 .string "I don't know if you need it, but we\l" .string "would like you to have our MACHO BRACE.$" -Route111_WinstrateFamilysHouse_Text_22A6B4: @ 822A6B4 +Route111_WinstrateFamilysHouse_Text_PassionateAboutBattles: @ 822A6B4 .string "When it comes to POKéMON battles,\n" .string "we tend to be pretty passionate.$" -Route111_WinstrateFamilysHouse_Text_22A6F7: @ 822A6F7 +Route111_WinstrateFamilysHouse_Text_StrongerFamilyMembers: @ 822A6F7 .string "Mommy is stronger than Daddy.\p" .string "I'm stronger than Mommy.\p" .string "And Grandma's stronger than me!\p" .string "But my big brother is even stronger\n" .string "than Grandma.$" -Route111_WinstrateFamilysHouse_Text_22A780: @ 822A780 +Route111_WinstrateFamilysHouse_Text_GrandsonStrong: @ 822A780 .string "There's no question that you're strong.\p" .string "But if you were to battle my grandson,\n" .string "you'd end up crying in frustration.\p" @@ -95,7 +95,7 @@ Route111_WinstrateFamilysHouse_Text_22A780: @ 822A780 .string "Knowing my grandson, he could be the\n" .string "CHAMPION already!$" -Route111_WinstrateFamilysHouse_Text_22A89B: @ 822A89B +Route111_WinstrateFamilysHouse_Text_GrandsonStrongShort: @ 822A89B .string "My grandson must be challenging the\n" .string "POKéMON LEAGUE CHAMPION by now.\p" .string "Knowing my grandson, he could be the\n" diff --git a/data/maps/Route113_GlassWorkshop/scripts.inc b/data/maps/Route113_GlassWorkshop/scripts.inc index b959cf523..30d453abd 100644 --- a/data/maps/Route113_GlassWorkshop/scripts.inc +++ b/data/maps/Route113_GlassWorkshop/scripts.inc @@ -238,7 +238,7 @@ Route113_GlassWorkshop_EventScript_NoRoomForFlute:: @ 826F072 end Route113_GlassWorkshop_EventScript_NoRoomForDecor:: @ 826F081 - call Common_EventScript_NoRoomLeftForAnother + call Common_EventScript_NoRoomForDecor msgbox Route113_GlassWorkshop_Text_NoRoomInPC, MSGBOX_DEFAULT release end diff --git a/data/maps/Route114_LanettesHouse/map.json b/data/maps/Route114_LanettesHouse/map.json index b4b1b412b..6709d055e 100644 --- a/data/maps/Route114_LanettesHouse/map.json +++ b/data/maps/Route114_LanettesHouse/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route114_LanettesHouse_EventScript_22B2D2", + "script": "Route114_LanettesHouse_EventScript_Lanette", "flag": "FLAG_HIDE_LANETTES_HOUSE_LANETTE" } ], @@ -52,7 +52,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route114_LanettesHouse_EventScript_22B309" + "script": "Route114_LanettesHouse_EventScript_Notebook" }, { "type": "sign", @@ -60,7 +60,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route114_LanettesHouse_EventScript_22B345" + "script": "Route114_LanettesHouse_EventScript_PC" }, { "type": "sign", @@ -68,7 +68,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route114_LanettesHouse_EventScript_22B345" + "script": "Route114_LanettesHouse_EventScript_PC" } ] } \ No newline at end of file diff --git a/data/maps/Route114_LanettesHouse/scripts.inc b/data/maps/Route114_LanettesHouse/scripts.inc index 59d82ffe1..b772228e4 100644 --- a/data/maps/Route114_LanettesHouse/scripts.inc +++ b/data/maps/Route114_LanettesHouse/scripts.inc @@ -6,49 +6,49 @@ Route114_LanettesHouse_OnTransition: @ 822B2CE setflag FLAG_LANDMARK_LANETTES_HOUSE end -Route114_LanettesHouse_EventScript_22B2D2:: @ 822B2D2 +Route114_LanettesHouse_EventScript_Lanette:: @ 822B2D2 lock faceplayer - goto_if_set FLAG_RECEIVED_DOLL_LANETTE, Route114_LanettesHouse_EventScript_22B2FF + goto_if_set FLAG_RECEIVED_DOLL_LANETTE, Route114_LanettesHouse_EventScript_OfferAdvice setflag FLAG_SYS_PC_LANETTE - msgbox Route114_LanettesHouse_Text_22B34E, MSGBOX_DEFAULT + msgbox Route114_LanettesHouse_Text_EverythingClutteredKeepThis, MSGBOX_DEFAULT givedecoration_std DECOR_LOTAD_DOLL - compare VAR_RESULT, 0 - goto_if_eq Route114_LanettesHouse_EventScript_272067 + compare VAR_RESULT, FALSE + goto_if_eq Common_EventScript_ShowNoRoomForDecor setflag FLAG_RECEIVED_DOLL_LANETTE release end -Route114_LanettesHouse_EventScript_22B2FF:: @ 822B2FF - msgbox Route114_LanettesHouse_Text_22B407, MSGBOX_DEFAULT +Route114_LanettesHouse_EventScript_OfferAdvice:: @ 822B2FF + msgbox Route114_LanettesHouse_Text_OrganizeYourBoxes, MSGBOX_DEFAULT release end -Route114_LanettesHouse_EventScript_22B309:: @ 822B309 +Route114_LanettesHouse_EventScript_Notebook:: @ 822B309 lockall - msgbox Route114_LanettesHouse_Text_22B485, MSGBOX_YESNO + msgbox Route114_LanettesHouse_Text_ResearchNotesPage1, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq Route114_LanettesHouse_EventScript_22B327 - msgbox Route114_LanettesHouse_Text_22B6E4, MSGBOX_DEFAULT + goto_if_eq Route114_LanettesHouse_EventScript_NotebookPage2 + msgbox Route114_LanettesHouse_Text_ClosedTheNotebook, MSGBOX_DEFAULT releaseall end -Route114_LanettesHouse_EventScript_22B327:: @ 822B327 - msgbox Route114_LanettesHouse_Text_22B53C, MSGBOX_YESNO +Route114_LanettesHouse_EventScript_NotebookPage2:: @ 822B327 + msgbox Route114_LanettesHouse_Text_ResearchNotesPage2, MSGBOX_YESNO compare VAR_RESULT, YES - call_if_eq Route114_LanettesHouse_EventScript_22B33C + call_if_eq Route114_LanettesHouse_EventScript_NotebookPage3 releaseall end -Route114_LanettesHouse_EventScript_22B33C:: @ 822B33C - msgbox Route114_LanettesHouse_Text_22B5EF, MSGBOX_DEFAULT +Route114_LanettesHouse_EventScript_NotebookPage3:: @ 822B33C + msgbox Route114_LanettesHouse_Text_ResearchNotesPage3, MSGBOX_DEFAULT return -Route114_LanettesHouse_EventScript_22B345:: @ 822B345 - msgbox Route114_LanettesHouse_Text_22B6FC, MSGBOX_SIGN +Route114_LanettesHouse_EventScript_PC:: @ 822B345 + msgbox Route114_LanettesHouse_Text_EmailFromBill, MSGBOX_SIGN end -Route114_LanettesHouse_Text_22B34E: @ 822B34E +Route114_LanettesHouse_Text_EverythingClutteredKeepThis: @ 822B34E .string "LANETTE: Oh! {PLAYER}{KUN}!\p" .string "I'm sorry everything is so cluttered…\n" .string "When I get engrossed in research,\l" @@ -56,13 +56,13 @@ Route114_LanettesHouse_Text_22B34E: @ 822B34E .string "This is embarrassing… Please keep\n" .string "this a secret in exchange for this.$" -Route114_LanettesHouse_Text_22B407: @ 822B407 +Route114_LanettesHouse_Text_OrganizeYourBoxes: @ 822B407 .string "May I offer advice about my POKéMON\n" .string "Storage System?\p" .string "You should organize your BOXES so you\n" .string "can tell which POKéMON are in them.$" -Route114_LanettesHouse_Text_22B485: @ 822B485 +Route114_LanettesHouse_Text_ResearchNotesPage1: @ 822B485 .string "It's LANETTE's research notes.\n" .string "There's information about BOXES.\p" .string "Design BOXES to hold 30 POKéMON each.\p" @@ -70,7 +70,7 @@ Route114_LanettesHouse_Text_22B485: @ 822B485 .string "420 POKéMON on the PC system.\p" .string "Keep reading?$" -Route114_LanettesHouse_Text_22B53C: @ 822B53C +Route114_LanettesHouse_Text_ResearchNotesPage2: @ 822B53C .string "A marking system should be added to\n" .string "make POKéMON easier to organize.\p" .string "The name and wallpaper design of each\n" @@ -78,7 +78,7 @@ Route114_LanettesHouse_Text_22B53C: @ 822B53C .string "the stored POKéMON.\p" .string "Keep reading?$" -Route114_LanettesHouse_Text_22B5EF: @ 822B5EF +Route114_LanettesHouse_Text_ResearchNotesPage3: @ 822B5EF .string "When storing a POKéMON, it should be\n" .string "sent to the BOX inspected last.\p" .string "If that BOX is full, the received\n" @@ -87,10 +87,10 @@ Route114_LanettesHouse_Text_22B5EF: @ 822B5EF .string "it is automatically selected as the BOX\l" .string "to which POKéMON are sent.$" -Route114_LanettesHouse_Text_22B6E4: @ 822B6E4 +Route114_LanettesHouse_Text_ClosedTheNotebook: @ 822B6E4 .string "{PLAYER} closed the notebook.$" -Route114_LanettesHouse_Text_22B6FC: @ 822B6FC +Route114_LanettesHouse_Text_EmailFromBill: @ 822B6FC .string "There's an e-mail from someone on\n" .string "the PC.\p" .string "“… … … … … … …\p" diff --git a/data/maps/Route119_House/map.json b/data/maps/Route119_House/map.json index 31d84664f..f07156653 100644 --- a/data/maps/Route119_House/map.json +++ b/data/maps/Route119_House/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route119_House_EventScript_270966", + "script": "Route119_House_EventScript_Woman", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 2, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route119_House_EventScript_27096F", + "script": "Route119_House_EventScript_Wingull", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route119_House_EventScript_27096F", + "script": "Route119_House_EventScript_Wingull", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route119_House_EventScript_27096F", + "script": "Route119_House_EventScript_Wingull", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 2, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route119_House_EventScript_27096F", + "script": "Route119_House_EventScript_Wingull", "flag": "0" }, { @@ -89,7 +89,7 @@ "movement_range_y": 2, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route119_House_EventScript_27096F", + "script": "Route119_House_EventScript_Wingull", "flag": "0" }, { @@ -102,7 +102,7 @@ "movement_range_y": 3, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route119_House_EventScript_27096F", + "script": "Route119_House_EventScript_Wingull", "flag": "0" } ], diff --git a/data/maps/Route119_House/scripts.inc b/data/maps/Route119_House/scripts.inc index 4d4826bdf..b6915aaa3 100644 --- a/data/maps/Route119_House/scripts.inc +++ b/data/maps/Route119_House/scripts.inc @@ -1,27 +1,27 @@ Route119_House_MapScripts:: @ 8270965 .byte 0 -Route119_House_EventScript_270966:: @ 8270966 - msgbox Route119_House_Text_270982, MSGBOX_NPC +Route119_House_EventScript_Woman:: @ 8270966 + msgbox Route119_House_Text_RumorAboutCaveOfOrigin, MSGBOX_NPC end -Route119_House_EventScript_27096F:: @ 827096F +Route119_House_EventScript_Wingull:: @ 827096F lock faceplayer waitse playmoncry SPECIES_WINGULL, 0 - msgbox Route119_House_Text_270A17, MSGBOX_DEFAULT + msgbox Route119_House_Text_Wingull, MSGBOX_DEFAULT waitmoncry release end -Route119_House_Text_270982: @ 8270982 +Route119_House_Text_RumorAboutCaveOfOrigin: @ 8270982 .string "I heard about a cave called the CAVE\n" .string "OF ORIGIN.\p" .string "People rumor that the spirits of\n" .string "POKéMON are revived there. Could\l" .string "something like that really happen?$" -Route119_House_Text_270A17: @ 8270A17 +Route119_House_Text_Wingull: @ 8270A17 .string "WINGULL: Pihyoh!$" From 7d5d12877ef14d693602f0dec543b4c262677808 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 6 Nov 2019 12:49:14 -0500 Subject: [PATCH 11/40] Document cycling, cable car, and tunneler route houses --- .../map.json | 6 +-- .../scripts.inc | 22 ++++---- .../map.json | 6 +-- .../scripts.inc | 32 ++++++------ data/maps/Route112_CableCarStation/map.json | 2 +- .../maps/Route112_CableCarStation/scripts.inc | 50 +++++++++---------- .../maps/Route116_TunnelersRestHouse/map.json | 6 +-- .../Route116_TunnelersRestHouse/scripts.inc | 26 +++++----- 8 files changed, 75 insertions(+), 75 deletions(-) diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json index b692426fd..f0aea1aec 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA78", + "script": "Route110_SeasideCyclingRoadNorthEntrance_EventScript_Clerk", "flag": "0" } ], @@ -66,7 +66,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA84" + "script": "Route110_SeasideCyclingRoadNorthEntrance_EventScript_BikeCheck" }, { "type": "trigger", @@ -75,7 +75,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "1", - "script": "Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EAB6" + "script": "Route110_SeasideCyclingRoadNorthEntrance_EventScript_ClearCyclingRoad" } ], "bg_events": [] diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc index 687fff9a7..ba5dfd9f0 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc @@ -1,49 +1,49 @@ Route110_SeasideCyclingRoadNorthEntrance_MapScripts:: @ 826EA77 .byte 0 -Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA78:: @ 826EA78 +Route110_SeasideCyclingRoadNorthEntrance_EventScript_Clerk:: @ 826EA78 lock faceplayer - msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_26EAC1, MSGBOX_DEFAULT + msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_GoAllOutOnCyclingRoad, MSGBOX_DEFAULT release end -Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA84:: @ 826EA84 +Route110_SeasideCyclingRoadNorthEntrance_EventScript_BikeCheck:: @ 826EA84 lockall specialvar VAR_RESULT, GetPlayerAvatarBike compare VAR_RESULT, 0 - goto_if_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA9F + goto_if_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_NoBike setflag FLAG_SYS_CYCLING_ROAD setvar VAR_TEMP_1, 1 releaseall end -Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA9F:: @ 826EA9F - msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_26EB48, MSGBOX_DEFAULT +Route110_SeasideCyclingRoadNorthEntrance_EventScript_NoBike:: @ 826EA9F + msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_TooDangerousToWalk, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, Route110_SeasideCyclingRoadNorthEntrance_Movement_26EAB4 + applymovement EVENT_OBJ_ID_PLAYER, Route110_SeasideCyclingRoadNorthEntrance_Movement_PushPlayerBackFromCounter waitmovement 0 releaseall end -Route110_SeasideCyclingRoadNorthEntrance_Movement_26EAB4: @ 826EAB4 +Route110_SeasideCyclingRoadNorthEntrance_Movement_PushPlayerBackFromCounter: @ 826EAB4 walk_left step_end -Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EAB6:: @ 826EAB6 +Route110_SeasideCyclingRoadNorthEntrance_EventScript_ClearCyclingRoad:: @ 826EAB6 lockall clearflag FLAG_SYS_CYCLING_ROAD setvar VAR_TEMP_1, 0 releaseall end -Route110_SeasideCyclingRoadNorthEntrance_Text_26EAC1: @ 826EAC1 +Route110_SeasideCyclingRoadNorthEntrance_Text_GoAllOutOnCyclingRoad: @ 826EAC1 .string "On CYCLING ROAD, you can go all out\n" .string "and cycle as fast as you'd like.\p" .string "It feels great to go that fast, but try\n" .string "not to crash into anyone!$" -Route110_SeasideCyclingRoadNorthEntrance_Text_26EB48: @ 826EB48 +Route110_SeasideCyclingRoadNorthEntrance_Text_TooDangerousToWalk: @ 826EB48 .string "Sorry, you can't walk on CYCLING\n" .string "ROAD. It's too dangerous.\p" .string "Please come back with a BIKE.$" diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json index dcc9029e5..6077876f7 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBC4", + "script": "Route110_SeasideCyclingRoadSouthEntrance_EventScript_Clerk", "flag": "0" } ], @@ -66,7 +66,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBD0" + "script": "Route110_SeasideCyclingRoadSouthEntrance_EventScript_BikeCheck" }, { "type": "trigger", @@ -75,7 +75,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "1", - "script": "Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EC13" + "script": "Route110_SeasideCyclingRoadSouthEntrance_EventScript_ClearCyclingRoad" } ], "bg_events": [] diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc index 1d0ca55bb..4f839d72b 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc @@ -4,51 +4,51 @@ Route110_SeasideCyclingRoadSouthEntrance_MapScripts:: @ 826EBA1 Route110_SeasideCyclingRoadSouthEntrance_OnTransition: @ 826EBA7 compare VAR_CYCLING_CHALLENGE_STATE, 3 - call_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBBE + call_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_RestartChallenge compare VAR_CYCLING_CHALLENGE_STATE, 2 - call_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBBE + call_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_RestartChallenge end -Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBBE:: @ 826EBBE +Route110_SeasideCyclingRoadSouthEntrance_EventScript_RestartChallenge:: @ 826EBBE setvar VAR_CYCLING_CHALLENGE_STATE, 1 return -Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBC4:: @ 826EBC4 +Route110_SeasideCyclingRoadSouthEntrance_EventScript_Clerk:: @ 826EBC4 lock faceplayer - msgbox Route110_SeasideCyclingRoadSouthEntrance_Text_26EC23, MSGBOX_DEFAULT + msgbox Route110_SeasideCyclingRoadSouthEntrance_Text_GoAllOutOnCyclingRoad, MSGBOX_DEFAULT release end -Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBD0:: @ 826EBD0 +Route110_SeasideCyclingRoadSouthEntrance_EventScript_BikeCheck:: @ 826EBD0 lockall specialvar VAR_RESULT, GetPlayerAvatarBike compare VAR_RESULT, 2 - call_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBF6 + call_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_OnMachBike compare VAR_RESULT, 0 - goto_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBFC + goto_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_NoBike setflag FLAG_SYS_CYCLING_ROAD setvar VAR_TEMP_1, 1 releaseall end -Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBF6:: @ 826EBF6 +Route110_SeasideCyclingRoadSouthEntrance_EventScript_OnMachBike:: @ 826EBF6 setvar VAR_CYCLING_CHALLENGE_STATE, 1 return -Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBFC:: @ 826EBFC - msgbox Route110_SeasideCyclingRoadSouthEntrance_Text_26ECAA, MSGBOX_DEFAULT +Route110_SeasideCyclingRoadSouthEntrance_EventScript_NoBike:: @ 826EBFC + msgbox Route110_SeasideCyclingRoadSouthEntrance_Text_TooDangerousToWalk, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, Route110_SeasideCyclingRoadSouthEntrance_Movement_26EC11 + applymovement EVENT_OBJ_ID_PLAYER, Route110_SeasideCyclingRoadSouthEntrance_Movement_PushPlayerBackFromCounter waitmovement 0 releaseall end -Route110_SeasideCyclingRoadSouthEntrance_Movement_26EC11: @ 826EC11 +Route110_SeasideCyclingRoadSouthEntrance_Movement_PushPlayerBackFromCounter: @ 826EC11 walk_left step_end -Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EC13:: @ 826EC13 +Route110_SeasideCyclingRoadSouthEntrance_EventScript_ClearCyclingRoad:: @ 826EC13 lockall setvar VAR_CYCLING_CHALLENGE_STATE, 0 clearflag FLAG_SYS_CYCLING_ROAD @@ -56,13 +56,13 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EC13:: @ 826EC13 releaseall end -Route110_SeasideCyclingRoadSouthEntrance_Text_26EC23: @ 826EC23 +Route110_SeasideCyclingRoadSouthEntrance_Text_GoAllOutOnCyclingRoad: @ 826EC23 .string "On CYCLING ROAD, you can go all out\n" .string "and cycle as fast as you'd like.\p" .string "It feels great to go that fast, but try\n" .string "not to crash into anyone!$" -Route110_SeasideCyclingRoadSouthEntrance_Text_26ECAA: @ 826ECAA +Route110_SeasideCyclingRoadSouthEntrance_Text_TooDangerousToWalk: @ 826ECAA .string "Sorry, you can't walk on CYCLING\n" .string "ROAD. It's too dangerous.\p" .string "Please come back with a BIKE.$" diff --git a/data/maps/Route112_CableCarStation/map.json b/data/maps/Route112_CableCarStation/map.json index 52958a4ee..5ed7fc4a7 100644 --- a/data/maps/Route112_CableCarStation/map.json +++ b/data/maps/Route112_CableCarStation/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route112_CableCarStation_EventScript_22AB17", + "script": "Route112_CableCarStation_EventScript_Attendant", "flag": "0" }, { diff --git a/data/maps/Route112_CableCarStation/scripts.inc b/data/maps/Route112_CableCarStation/scripts.inc index f319e0a28..0b0ad3dc9 100644 --- a/data/maps/Route112_CableCarStation/scripts.inc +++ b/data/maps/Route112_CableCarStation/scripts.inc @@ -1,27 +1,27 @@ Route112_CableCarStation_MapScripts:: @ 822AABE map_script MAP_SCRIPT_ON_TRANSITION, Route112_CableCarStation_OnTransition - map_script MAP_SCRIPT_ON_FRAME_TABLE, Route112_CableCarStation_MapScript2_22AAE9 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route112_CableCarStation_OnFrame .byte 0 Route112_CableCarStation_OnTransition: @ 822AAC9 setescapewarp MAP_ROUTE112, 255, 28, 28 compare VAR_CABLE_CAR_STATION_STATE, 2 - call_if_eq Route112_CableCarStation_EventScript_22AADD + call_if_eq Route112_CableCarStation_EventScript_MoveAttendantAside end -Route112_CableCarStation_EventScript_22AADD:: @ 822AADD +Route112_CableCarStation_EventScript_MoveAttendantAside:: @ 822AADD setobjectxyperm 1, 7, 4 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_LEFT return -Route112_CableCarStation_MapScript2_22AAE9: @ 822AAE9 - map_script_2 VAR_CABLE_CAR_STATION_STATE, 2, Route112_CableCarStation_EventScript_22AAF3 +Route112_CableCarStation_OnFrame: @ 822AAE9 + map_script_2 VAR_CABLE_CAR_STATION_STATE, 2, Route112_CableCarStation_EventScript_ExitCableCar .2byte 0 -Route112_CableCarStation_EventScript_22AAF3:: @ 822AAF3 +Route112_CableCarStation_EventScript_ExitCableCar:: @ 822AAF3 lockall - applymovement EVENT_OBJ_ID_PLAYER, Route112_CableCarStation_Movement_22AB80 - applymovement 1, Route112_CableCarStation_Movement_22AB76 + applymovement EVENT_OBJ_ID_PLAYER, Route112_CableCarStation_Movement_ExitCableCar + applymovement 1, Route112_CableCarStation_Movement_FollowPlayerOutFromCableCar waitmovement 0 setvar VAR_CABLE_CAR_STATION_STATE, 0 setobjectxyperm 1, 6, 7 @@ -29,21 +29,21 @@ Route112_CableCarStation_EventScript_22AAF3:: @ 822AAF3 releaseall end -Route112_CableCarStation_EventScript_22AB17:: @ 822AB17 +Route112_CableCarStation_EventScript_Attendant:: @ 822AB17 lock faceplayer - msgbox Route112_CableCarStation_Text_22AB85, MSGBOX_YESNO + msgbox Route112_CableCarStation_Text_CableCarReadyGetOn, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq Route112_CableCarStation_EventScript_22AB38 + goto_if_eq Route112_CableCarStation_EventScript_RideCableCar compare VAR_RESULT, NO - goto_if_eq Route112_CableCarStation_EventScript_22AB67 + goto_if_eq Route112_CableCarStation_EventScript_DeclineRide end -Route112_CableCarStation_EventScript_22AB38:: @ 822AB38 - msgbox Route112_CableCarStation_Text_22ABC2, MSGBOX_DEFAULT +Route112_CableCarStation_EventScript_RideCableCar:: @ 822AB38 + msgbox Route112_CableCarStation_Text_StepThisWay, MSGBOX_DEFAULT closemessage - applymovement 1, Route112_CableCarStation_Movement_22AB71 - applymovement EVENT_OBJ_ID_PLAYER, Route112_CableCarStation_Movement_22AB7B + applymovement 1, Route112_CableCarStation_Movement_LeadPlayerToCableCar + applymovement EVENT_OBJ_ID_PLAYER, Route112_CableCarStation_Movement_BoardCableCar waitmovement 0 setvar VAR_0x8004, 0 setvar VAR_CABLE_CAR_STATION_STATE, 1 @@ -54,46 +54,46 @@ Route112_CableCarStation_EventScript_22AB38:: @ 822AB38 release end -Route112_CableCarStation_EventScript_22AB67:: @ 822AB67 - msgbox Route112_CableCarStation_Text_22ABD8, MSGBOX_DEFAULT +Route112_CableCarStation_EventScript_DeclineRide:: @ 822AB67 + msgbox Route112_CableCarStation_Text_RideAnotherTime, MSGBOX_DEFAULT release end -Route112_CableCarStation_Movement_22AB71: @ 822AB71 +Route112_CableCarStation_Movement_LeadPlayerToCableCar: @ 822AB71 walk_up walk_up walk_right walk_in_place_fastest_left step_end -Route112_CableCarStation_Movement_22AB76: @ 822AB76 +Route112_CableCarStation_Movement_FollowPlayerOutFromCableCar: @ 822AB76 delay_16 walk_left walk_down walk_down step_end -Route112_CableCarStation_Movement_22AB7B: @ 822AB7B +Route112_CableCarStation_Movement_BoardCableCar: @ 822AB7B walk_up walk_up walk_up delay_16 step_end -Route112_CableCarStation_Movement_22AB80: @ 822AB80 +Route112_CableCarStation_Movement_ExitCableCar: @ 822AB80 walk_down walk_down walk_down delay_16 step_end -Route112_CableCarStation_Text_22AB85: @ 822AB85 +Route112_CableCarStation_Text_CableCarReadyGetOn: @ 822AB85 .string "The CABLE CAR is ready to go up.\n" .string "Would you like to be on it?$" -Route112_CableCarStation_Text_22ABC2: @ 822ABC2 +Route112_CableCarStation_Text_StepThisWay: @ 822ABC2 .string "Please step this way.$" -Route112_CableCarStation_Text_22ABD8: @ 822ABD8 +Route112_CableCarStation_Text_RideAnotherTime: @ 822ABD8 .string "Please ride with us another time.$" diff --git a/data/maps/Route116_TunnelersRestHouse/map.json b/data/maps/Route116_TunnelersRestHouse/map.json index f9dfb484c..470ccadfe 100644 --- a/data/maps/Route116_TunnelersRestHouse/map.json +++ b/data/maps/Route116_TunnelersRestHouse/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route116_TunnelersRestHouse_EventScript_22B85A", + "script": "Route116_TunnelersRestHouse_EventScript_Tunneler1", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route116_TunnelersRestHouse_EventScript_22B86C", + "script": "Route116_TunnelersRestHouse_EventScript_Tunneler3", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route116_TunnelersRestHouse_EventScript_22B863", + "script": "Route116_TunnelersRestHouse_EventScript_Tunneler2", "flag": "0" } ], diff --git a/data/maps/Route116_TunnelersRestHouse/scripts.inc b/data/maps/Route116_TunnelersRestHouse/scripts.inc index e4e943e61..42a80fc78 100644 --- a/data/maps/Route116_TunnelersRestHouse/scripts.inc +++ b/data/maps/Route116_TunnelersRestHouse/scripts.inc @@ -6,28 +6,28 @@ Route116_TunnelersRestHouse_OnTransition: @ 822B856 setflag FLAG_LANDMARK_TUNNELERS_REST_HOUSE end -Route116_TunnelersRestHouse_EventScript_22B85A:: @ 822B85A - msgbox Route116_TunnelersRestHouse_Text_22B88B, MSGBOX_NPC +Route116_TunnelersRestHouse_EventScript_Tunneler1:: @ 822B85A + msgbox Route116_TunnelersRestHouse_Text_WeHadToStopBoring, MSGBOX_NPC end -Route116_TunnelersRestHouse_EventScript_22B863:: @ 822B863 - msgbox Route116_TunnelersRestHouse_Text_22B99F, MSGBOX_NPC +Route116_TunnelersRestHouse_EventScript_Tunneler2:: @ 822B863 + msgbox Route116_TunnelersRestHouse_Text_ManDiggingHisWayToVerdanturf, MSGBOX_NPC end -Route116_TunnelersRestHouse_EventScript_22B86C:: @ 822B86C +Route116_TunnelersRestHouse_EventScript_Tunneler3:: @ 822B86C lock faceplayer - goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, Route116_TunnelersRestHouse_EventScript_22B881 - msgbox Route116_TunnelersRestHouse_Text_22BAAF, MSGBOX_DEFAULT + goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, Route116_TunnelersRestHouse_EventScript_TunnelOpened + msgbox Route116_TunnelersRestHouse_Text_GetToVerdanturfWithoutTunnel, MSGBOX_DEFAULT release end -Route116_TunnelersRestHouse_EventScript_22B881:: @ 822B881 - msgbox Route116_TunnelersRestHouse_Text_22BB3B, MSGBOX_DEFAULT +Route116_TunnelersRestHouse_EventScript_TunnelOpened:: @ 822B881 + msgbox Route116_TunnelersRestHouse_Text_TunnelHasGoneThrough, MSGBOX_DEFAULT release end -Route116_TunnelersRestHouse_Text_22B88B: @ 822B88B +Route116_TunnelersRestHouse_Text_WeHadToStopBoring: @ 822B88B .string "That RUSTURF TUNNEL there…\p" .string "At first, we had a huge work crew boring\n" .string "through rock with the latest machinery.\l" @@ -38,7 +38,7 @@ Route116_TunnelersRestHouse_Text_22B88B: @ 822B88B .string "So, we've got nothing to do but loll\n" .string "around here doing nothing.$" -Route116_TunnelersRestHouse_Text_22B99F: @ 822B99F +Route116_TunnelersRestHouse_Text_ManDiggingHisWayToVerdanturf: @ 822B99F .string "There's a man digging his way to\n" .string "VERDANTURF all by his lonesome.\l" .string "He's desperate to get through.\p" @@ -48,13 +48,13 @@ Route116_TunnelersRestHouse_Text_22B99F: @ 822B99F .string "harming the natural environment.\p" .string "I wonder if he made it through yet.$" -Route116_TunnelersRestHouse_Text_22BAAF: @ 822BAAF +Route116_TunnelersRestHouse_Text_GetToVerdanturfWithoutTunnel: @ 822BAAF .string "To get to VERDANTURF without using\n" .string "this TUNNEL, you'd have to cross the\l" .string "sea to DEWFORD, sail on to SLATEPORT,\l" .string "then travel through MAUVILLE.$" -Route116_TunnelersRestHouse_Text_22BB3B: @ 822BB3B +Route116_TunnelersRestHouse_Text_TunnelHasGoneThrough: @ 822BB3B .string "Did you hear? The TUNNEL to VERDANTURF\n" .string "has gone through!\p" .string "Sometimes, if you hope strongly enough,\n" From fbc3eee1f2a432d497e1213aef3b6b7b369ec871 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 6 Nov 2019 14:06:06 -0500 Subject: [PATCH 12/40] Document Fossil Maniac and Berry Master route houses --- data/maps/DesertUnderpass/map.json | 2 +- data/maps/DesertUnderpass/scripts.inc | 16 +- data/maps/MirageTower_4F/scripts.inc | 4 +- data/maps/Route111/scripts.inc | 2 +- .../maps/Route114_FossilManiacsHouse/map.json | 10 +- .../Route114_FossilManiacsHouse/scripts.inc | 28 ++-- .../Route114_FossilManiacsTunnel/map.json | 6 +- .../Route114_FossilManiacsTunnel/scripts.inc | 46 +++--- data/maps/Route123_BerryMastersHouse/map.json | 4 +- .../Route123_BerryMastersHouse/scripts.inc | 140 +++++++++--------- data/text/berries.inc | 18 +-- include/constants/easy_chat.h | 8 + include/constants/flags.h | 4 +- include/constants/items.h | 13 +- src/easy_chat.c | 10 +- 15 files changed, 165 insertions(+), 146 deletions(-) diff --git a/data/maps/DesertUnderpass/map.json b/data/maps/DesertUnderpass/map.json index ca4b894d4..a3a80d41e 100644 --- a/data/maps/DesertUnderpass/map.json +++ b/data/maps/DesertUnderpass/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DesertUnderpass_EventScript_23AF41", + "script": "DesertUnderpass_EventScript_Fossil", "flag": "FLAG_HIDE_DESERT_UNDERPASS_FOSSIL" } ], diff --git a/data/maps/DesertUnderpass/scripts.inc b/data/maps/DesertUnderpass/scripts.inc index 8e89075e5..437f5de4b 100644 --- a/data/maps/DesertUnderpass/scripts.inc +++ b/data/maps/DesertUnderpass/scripts.inc @@ -6,29 +6,31 @@ DesertUnderpass_OnTransition: @ 823AF3D setflag FLAG_LANDMARK_DESERT_UNDERPASS end -DesertUnderpass_EventScript_23AF41:: @ 823AF41 +DesertUnderpass_EventScript_Fossil:: @ 823AF41 lock faceplayer - goto_if_set FLAG_CHOSE_CLAW_FOSSIL, DesertUnderpass_EventScript_23AF57 - goto_if_set FLAG_CHOSE_ROOT_FOSSIL, DesertUnderpass_EventScript_23AF68 + goto_if_set FLAG_CHOSE_ROOT_FOSSIL, DesertUnderpass_EventScript_GiveClawFossil + goto_if_set FLAG_CHOSE_CLAW_FOSSIL, DesertUnderpass_EventScript_GiveRootFossil release end -DesertUnderpass_EventScript_23AF57:: @ 823AF57 +DesertUnderpass_EventScript_GiveClawFossil:: @ 823AF57 giveitem_std ITEM_CLAW_FOSSIL removeobject 1 release end -DesertUnderpass_EventScript_23AF68:: @ 823AF68 +DesertUnderpass_EventScript_GiveRootFossil:: @ 823AF68 giveitem_std ITEM_ROOT_FOSSIL removeobject 1 release end -DesertUnderpass_Text_23AF79:: @ 823AF79 +@ Unused +DesertUnderpass_Text_FoundRootFossil:: @ 823AF79 .string "{PLAYER} found the ROOT FOSSIL.$" -DesertUnderpass_Text_23AF93:: @ 823AF93 +@ Unused +DesertUnderpass_Text_FoundClawFossil:: @ 823AF93 .string "{PLAYER} found the CLAW FOSSIL.$" diff --git a/data/maps/MirageTower_4F/scripts.inc b/data/maps/MirageTower_4F/scripts.inc index 3c2c59355..ac3afdce6 100644 --- a/data/maps/MirageTower_4F/scripts.inc +++ b/data/maps/MirageTower_4F/scripts.inc @@ -13,7 +13,7 @@ MirageTower_4F_EventScript_23AD48:: @ 823AD48 setflag FLAG_HIDE_MIRAGE_TOWER_CLAW_FOSSIL removeobject 1 delay 30 - setflag FLAG_CHOSE_CLAW_FOSSIL + setflag FLAG_CHOSE_ROOT_FOSSIL goto MirageTower_4F_EventScript_23ADCA end @@ -34,7 +34,7 @@ MirageTower_4F_EventScript_23AD89:: @ 823AD89 setflag FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL removeobject 2 delay 30 - setflag FLAG_CHOSE_ROOT_FOSSIL + setflag FLAG_CHOSE_CLAW_FOSSIL goto MirageTower_4F_EventScript_23ADCA end diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index 037ddb18c..91d13e88c 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -136,7 +136,7 @@ Route111_EventScript_1F0E60:: @ 81F0E60 waitstate setvar VAR_MIRAGE_TOWER_STATE, 2 clearflag FLAG_HIDE_DESERT_UNDERPASS_FOSSIL - goto_if_set FLAG_CHOSE_ROOT_FOSSIL, Route111_EventScript_1F0EA7 + goto_if_set FLAG_CHOSE_CLAW_FOSSIL, Route111_EventScript_1F0EA7 msgbox Route111_Text_1F1C74, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/Route114_FossilManiacsHouse/map.json b/data/maps/Route114_FossilManiacsHouse/map.json index 0c5c5ea77..7a629f44a 100644 --- a/data/maps/Route114_FossilManiacsHouse/map.json +++ b/data/maps/Route114_FossilManiacsHouse/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route114_FossilManiacsHouse_EventScript_22AD3A", + "script": "Route114_FossilManiacsHouse_EventScript_FossilManiacsBrother", "flag": "0" } ], @@ -59,7 +59,7 @@ "y": 3, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "Route114_FossilManiacsHouse_EventScript_22AD73" + "script": "Route114_FossilManiacsHouse_EventScript_RockDisplay" }, { "type": "sign", @@ -67,7 +67,7 @@ "y": 3, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "Route114_FossilManiacsHouse_EventScript_22AD73" + "script": "Route114_FossilManiacsHouse_EventScript_RockDisplay" }, { "type": "sign", @@ -75,7 +75,7 @@ "y": 2, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "Route114_FossilManiacsHouse_EventScript_22AD7C" + "script": "Route114_FossilManiacsHouse_EventScript_Bookshelf" }, { "type": "sign", @@ -83,7 +83,7 @@ "y": 2, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "Route114_FossilManiacsHouse_EventScript_22AD7C" + "script": "Route114_FossilManiacsHouse_EventScript_Bookshelf" } ] } \ No newline at end of file diff --git a/data/maps/Route114_FossilManiacsHouse/scripts.inc b/data/maps/Route114_FossilManiacsHouse/scripts.inc index 83fade3e6..5313f8705 100644 --- a/data/maps/Route114_FossilManiacsHouse/scripts.inc +++ b/data/maps/Route114_FossilManiacsHouse/scripts.inc @@ -6,32 +6,32 @@ Route114_FossilManiacsHouse_OnTransition: @ 822AD36 setflag FLAG_LANDMARK_FOSSIL_MANIACS_HOUSE end -Route114_FossilManiacsHouse_EventScript_22AD3A:: @ 822AD3A +Route114_FossilManiacsHouse_EventScript_FossilManiacsBrother:: @ 822AD3A lock faceplayer - goto_if_set FLAG_RECEIVED_TM28, Route114_FossilManiacsHouse_EventScript_22AD69 - msgbox Route114_FossilManiacsHouse_Text_22AD85, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_TM28, Route114_FossilManiacsHouse_EventScript_ReceivedDig + msgbox Route114_FossilManiacsHouse_Text_HaveThisToDigLikeMyBrother, MSGBOX_DEFAULT giveitem_std ITEM_TM28 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM28 release end -Route114_FossilManiacsHouse_EventScript_22AD69:: @ 822AD69 - msgbox Route114_FossilManiacsHouse_Text_22AE48, MSGBOX_DEFAULT +Route114_FossilManiacsHouse_EventScript_ReceivedDig:: @ 822AD69 + msgbox Route114_FossilManiacsHouse_Text_DigReturnsYouToEntrance, MSGBOX_DEFAULT release end -Route114_FossilManiacsHouse_EventScript_22AD73:: @ 822AD73 - msgbox Route114_FossilManiacsHouse_Text_22AE92, MSGBOX_SIGN +Route114_FossilManiacsHouse_EventScript_RockDisplay:: @ 822AD73 + msgbox Route114_FossilManiacsHouse_Text_RocksFillDisplayCase, MSGBOX_SIGN end -Route114_FossilManiacsHouse_EventScript_22AD7C:: @ 822AD7C - msgbox Route114_FossilManiacsHouse_Text_22AEC2, MSGBOX_SIGN +Route114_FossilManiacsHouse_EventScript_Bookshelf:: @ 822AD7C + msgbox Route114_FossilManiacsHouse_Text_CrammedWithBooks, MSGBOX_SIGN end -Route114_FossilManiacsHouse_Text_22AD85: @ 822AD85 +Route114_FossilManiacsHouse_Text_HaveThisToDigLikeMyBrother: @ 822AD85 .string "My big brother's the FOSSIL MANIAC…\n" .string "He's a nice guy who loves FOSSILS…\p" .string "He loves digging holes, too…\n" @@ -39,15 +39,15 @@ Route114_FossilManiacsHouse_Text_22AD85: @ 822AD85 .string "You can have this, so you can DIG\n" .string "holes just like my big brother…$" -Route114_FossilManiacsHouse_Text_22AE48: @ 822AE48 +Route114_FossilManiacsHouse_Text_DigReturnsYouToEntrance: @ 822AE48 .string "If you make a POKéMON DIG inside a\n" .string "cave, you're returned to the entrance…$" -Route114_FossilManiacsHouse_Text_22AE92: @ 822AE92 +Route114_FossilManiacsHouse_Text_RocksFillDisplayCase: @ 822AE92 .string "Rocks in peculiar shapes fill\n" .string "the display case…$" -Route114_FossilManiacsHouse_Text_22AEC2: @ 822AEC2 +Route114_FossilManiacsHouse_Text_CrammedWithBooks: @ 822AEC2 .string "THE COMPOSITION OF STRATA…\n" .string "HOW RAIN SHAPES THE LAND…\l" .string "STONES, SOIL, AND ROCK…\p" diff --git a/data/maps/Route114_FossilManiacsTunnel/map.json b/data/maps/Route114_FossilManiacsTunnel/map.json index d0992f8fa..da3241ed1 100644 --- a/data/maps/Route114_FossilManiacsTunnel/map.json +++ b/data/maps/Route114_FossilManiacsTunnel/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route114_FossilManiacsTunnel_EventScript_22AF87", + "script": "Route114_FossilManiacsTunnel_EventScript_FossilManiac", "flag": "0" } ], @@ -59,7 +59,7 @@ "elevation": 3, "var": "VAR_FOSSIL_MANIAC_STATE", "var_value": "1", - "script": "Route114_FossilManiacsTunnel_EventScript_22AF66" + "script": "Route114_FossilManiacsTunnel_EventScript_ManiacMentionCaveIn" }, { "type": "trigger", @@ -68,7 +68,7 @@ "elevation": 3, "var": "VAR_FOSSIL_MANIAC_STATE", "var_value": "1", - "script": "Route114_FossilManiacsTunnel_EventScript_22AF66" + "script": "Route114_FossilManiacsTunnel_EventScript_ManiacMentionCaveIn" } ], "bg_events": [] diff --git a/data/maps/Route114_FossilManiacsTunnel/scripts.inc b/data/maps/Route114_FossilManiacsTunnel/scripts.inc index 8c5ec779d..3bea9a501 100644 --- a/data/maps/Route114_FossilManiacsTunnel/scripts.inc +++ b/data/maps/Route114_FossilManiacsTunnel/scripts.inc @@ -1,61 +1,61 @@ Route114_FossilManiacsTunnel_MapScripts:: @ 822AF28 map_script MAP_SCRIPT_ON_TRANSITION, Route114_FossilManiacsTunnel_OnTransition - map_script MAP_SCRIPT_ON_LOAD, Route114_FossilManiacsTunnel_MapScript1_22AF49 + map_script MAP_SCRIPT_ON_LOAD, Route114_FossilManiacsTunnel_OnLoad .byte 0 Route114_FossilManiacsTunnel_OnTransition: @ 822AF33 - call_if_set FLAG_SYS_GAME_CLEAR, Route114_FossilManiacsTunnel_EventScript_22AF3D + call_if_set FLAG_SYS_GAME_CLEAR, Route114_FossilManiacsTunnel_EventScript_MoveFossilManiac end -Route114_FossilManiacsTunnel_EventScript_22AF3D:: @ 822AF3D +Route114_FossilManiacsTunnel_EventScript_MoveFossilManiac:: @ 822AF3D setobjectxyperm 1, 6, 5 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN return -Route114_FossilManiacsTunnel_MapScript1_22AF49: @ 822AF49 - call_if_unset FLAG_SYS_GAME_CLEAR, Route114_FossilManiacsTunnel_EventScript_22AF53 +Route114_FossilManiacsTunnel_OnLoad: @ 822AF49 + call_if_unset FLAG_SYS_GAME_CLEAR, Route114_FossilManiacsTunnel_EventScript_CloseDesertUnderpass end -Route114_FossilManiacsTunnel_EventScript_22AF53:: @ 822AF53 +Route114_FossilManiacsTunnel_EventScript_CloseDesertUnderpass:: @ 822AF53 setmetatile 6, 1, METATILE_Fallarbor_RedRockWall, 1 setmetatile 6, 2, METATILE_Fallarbor_RedRockWall, 1 return -Route114_FossilManiacsTunnel_EventScript_22AF66:: @ 822AF66 +Route114_FossilManiacsTunnel_EventScript_ManiacMentionCaveIn:: @ 822AF66 lockall applymovement 1, Common_Movement_WalkInPlaceFastestUp applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 - msgbox Route114_FossilManiacsTunnel_Text_22B1F7, MSGBOX_DEFAULT + msgbox Route114_FossilManiacsTunnel_Text_NotSafeThatWay, MSGBOX_DEFAULT setvar VAR_FOSSIL_MANIAC_STATE, 2 releaseall end -Route114_FossilManiacsTunnel_EventScript_22AF87:: @ 822AF87 +Route114_FossilManiacsTunnel_EventScript_FossilManiac:: @ 822AF87 lock faceplayer - goto_if_set FLAG_RECEIVED_REVIVED_FOSSIL_MON, Route114_FossilManiacsTunnel_EventScript_22AFC6 + goto_if_set FLAG_RECEIVED_REVIVED_FOSSIL_MON, Route114_FossilManiacsTunnel_EventScript_PlayerRevivedFossil checkitem ITEM_ROOT_FOSSIL, 1 - compare VAR_RESULT, 1 - goto_if_eq Route114_FossilManiacsTunnel_EventScript_22AFBC + compare VAR_RESULT, TRUE + goto_if_eq Route114_FossilManiacsTunnel_EventScript_PlayerHasFossil checkitem ITEM_CLAW_FOSSIL, 1 - compare VAR_RESULT, 1 - goto_if_eq Route114_FossilManiacsTunnel_EventScript_22AFBC - msgbox Route114_FossilManiacsTunnel_Text_22AFD0, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route114_FossilManiacsTunnel_EventScript_PlayerHasFossil + msgbox Route114_FossilManiacsTunnel_Text_LookInDesertForFossils, MSGBOX_DEFAULT release end -Route114_FossilManiacsTunnel_EventScript_22AFBC:: @ 822AFBC - msgbox Route114_FossilManiacsTunnel_Text_22B0D6, MSGBOX_DEFAULT +Route114_FossilManiacsTunnel_EventScript_PlayerHasFossil:: @ 822AFBC + msgbox Route114_FossilManiacsTunnel_Text_DevonCorpRevivingFossils, MSGBOX_DEFAULT release end -Route114_FossilManiacsTunnel_EventScript_22AFC6:: @ 822AFC6 - msgbox Route114_FossilManiacsTunnel_Text_22B1CC, MSGBOX_DEFAULT +Route114_FossilManiacsTunnel_EventScript_PlayerRevivedFossil:: @ 822AFC6 + msgbox Route114_FossilManiacsTunnel_Text_FossilsAreWonderful, MSGBOX_DEFAULT release end -Route114_FossilManiacsTunnel_Text_22AFD0: @ 822AFD0 +Route114_FossilManiacsTunnel_Text_LookInDesertForFossils: @ 822AFD0 .string "I'm the FOSSIL MANIAC…\n" .string "I'm a nice guy who loves FOSSILS…\p" .string "Do you want a FOSSIL?\p" @@ -66,7 +66,7 @@ Route114_FossilManiacsTunnel_Text_22AFD0: @ 822AFD0 .string "are boulders and sand that may hide\l" .string "FOSSILS…$" -Route114_FossilManiacsTunnel_Text_22B0D6: @ 822B0D6 +Route114_FossilManiacsTunnel_Text_DevonCorpRevivingFossils: @ 822B0D6 .string "You found a FOSSIL, didn't you?\n" .string "That's so nice… It's so dreamy…\p" .string "What are you going to do with that\n" @@ -77,11 +77,11 @@ Route114_FossilManiacsTunnel_Text_22B0D6: @ 822B0D6 .string "I love my FOSSILS, so I would never\n" .string "do anything like that…$" -Route114_FossilManiacsTunnel_Text_22B1CC: @ 822B1CC +Route114_FossilManiacsTunnel_Text_FossilsAreWonderful: @ 822B1CC .string "FOSSILS are so… Wonderful…\n" .string "It's so dreamy…$" -Route114_FossilManiacsTunnel_Text_22B1F7: @ 822B1F7 +Route114_FossilManiacsTunnel_Text_NotSafeThatWay: @ 822B1F7 .string "Oh…\n" .string "It's not safe that way…\p" .string "I was digging away, you see…\n" diff --git a/data/maps/Route123_BerryMastersHouse/map.json b/data/maps/Route123_BerryMastersHouse/map.json index c87feb2bc..b7f2523af 100644 --- a/data/maps/Route123_BerryMastersHouse/map.json +++ b/data/maps/Route123_BerryMastersHouse/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route123_BerryMastersHouse_EventScript_26F845", + "script": "Route123_BerryMastersHouse_EventScript_BerryMaster", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route123_BerryMastersHouse_EventScript_26F8C0", + "script": "Route123_BerryMastersHouse_EventScript_BerryMastersWife", "flag": "0" } ], diff --git a/data/maps/Route123_BerryMastersHouse/scripts.inc b/data/maps/Route123_BerryMastersHouse/scripts.inc index 979509440..9e63dc608 100644 --- a/data/maps/Route123_BerryMastersHouse/scripts.inc +++ b/data/maps/Route123_BerryMastersHouse/scripts.inc @@ -6,141 +6,141 @@ Route123_BerryMastersHouse_OnTransition: @ 826F841 setflag FLAG_LANDMARK_BERRY_MASTERS_HOUSE end -Route123_BerryMastersHouse_EventScript_26F845:: @ 826F845 +Route123_BerryMastersHouse_EventScript_BerryMaster:: @ 826F845 lock faceplayer dotimebasedevents - goto_if_set FLAG_DAILY_BERRY_MASTER_RECEIVED_BERRY, Route123_BerryMastersHouse_EventScript_26F8B6 - msgbox Route123_BerryMastersHouse_Text_2A7386, MSGBOX_DEFAULT - random 10 - addvar VAR_RESULT, 20 + goto_if_set FLAG_DAILY_BERRY_MASTER_RECEIVED_BERRY, Route123_BerryMastersHouse_EventScript_ReceivedBerryToday + msgbox Route123_BerryMastersHouse_Text_YoureDeservingOfBerry, MSGBOX_DEFAULT + random NUM_BERRY_MASTER_BERRIES + addvar VAR_RESULT, NUM_BERRY_MASTER_BERRIES_SKIPPED addvar VAR_RESULT, FIRST_BERRY_INDEX giveitem_std VAR_RESULT - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_BERRY_MASTER_RECEIVED_BERRY - msgbox Route123_BerryMastersHouse_Text_2A7428, MSGBOX_DEFAULT - random 10 - addvar VAR_RESULT, 20 + msgbox Route123_BerryMastersHouse_Text_WhyBeStingyTakeAnother, MSGBOX_DEFAULT + random NUM_BERRY_MASTER_BERRIES + addvar VAR_RESULT, NUM_BERRY_MASTER_BERRIES_SKIPPED addvar VAR_RESULT, FIRST_BERRY_INDEX giveitem_std VAR_RESULT - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull - msgbox Route123_BerryMastersHouse_Text_2A7445, MSGBOX_DEFAULT + msgbox Route123_BerryMastersHouse_Text_VisitPrettyPetalFlowerShop, MSGBOX_DEFAULT release end -Route123_BerryMastersHouse_EventScript_26F8B6:: @ 826F8B6 - msgbox Route123_BerryMastersHouse_Text_2A749E, MSGBOX_DEFAULT +Route123_BerryMastersHouse_EventScript_ReceivedBerryToday:: @ 826F8B6 + msgbox Route123_BerryMastersHouse_Text_DoneForToday, MSGBOX_DEFAULT release end -Route123_BerryMastersHouse_EventScript_26F8C0:: @ 826F8C0 +Route123_BerryMastersHouse_EventScript_BerryMastersWife:: @ 826F8C0 lock faceplayer dotimebasedevents - goto_if_set FLAG_DAILY_BERRY_MASTERS_WIFE, Route123_BerryMastersHouse_EventScript_26FA6F - msgbox Route123_BerryMastersHouse_Text_2A74E6, MSGBOX_DEFAULT + goto_if_set FLAG_DAILY_BERRY_MASTERS_WIFE, Route123_BerryMastersHouse_EventScript_ReceivedWifeBerryToday + msgbox Route123_BerryMastersHouse_Text_HeardAGoodSayingLately, MSGBOX_DEFAULT setvar VAR_0x8004, EASY_CHAT_TYPE_GOOD_SAYING call Common_ShowEasyChatScreen lock faceplayer - compare VAR_RESULT, 1 - goto_if_eq Route123_BerryMastersHouse_EventScript_26F909 - compare VAR_RESULT, 0 - goto_if_eq Route123_BerryMastersHouse_EventScript_26F8F7 + compare VAR_RESULT, TRUE + goto_if_eq Route123_BerryMastersHouse_EventScript_GavePhrase + compare VAR_RESULT, FALSE + goto_if_eq Route123_BerryMastersHouse_EventScript_CancelPhrase end -Route123_BerryMastersHouse_EventScript_26F8F7:: @ 826F8F7 - msgbox Route123_BerryMastersHouse_Text_2A7682, MSGBOX_DEFAULT - msgbox Route123_BerryMastersHouse_Text_2A761B, MSGBOX_DEFAULT +Route123_BerryMastersHouse_EventScript_CancelPhrase:: @ 826F8F7 + msgbox Route123_BerryMastersHouse_Text_Ah, MSGBOX_DEFAULT + msgbox Route123_BerryMastersHouse_Text_JoyNeverGoesOutOfMyLife, MSGBOX_DEFAULT release end -Route123_BerryMastersHouse_EventScript_26F909:: @ 826F909 - compare VAR_0x8004, 0 - goto_if_eq Route123_BerryMastersHouse_EventScript_26F94C - compare VAR_0x8004, 1 - goto_if_eq Route123_BerryMastersHouse_EventScript_26F97A - compare VAR_0x8004, 2 - goto_if_eq Route123_BerryMastersHouse_EventScript_26F9AB - compare VAR_0x8004, 3 - goto_if_eq Route123_BerryMastersHouse_EventScript_26F9DC - compare VAR_0x8004, 4 - goto_if_eq Route123_BerryMastersHouse_EventScript_26FA0D - compare VAR_0x8004, 5 - goto_if_eq Route123_BerryMastersHouse_EventScript_26FA3E +Route123_BerryMastersHouse_EventScript_GavePhrase:: @ 826F909 + compare VAR_0x8004, NOT_SPECIAL_PHRASE + goto_if_eq Route123_BerryMastersHouse_EventScript_GiveNormalBerry + compare VAR_0x8004, PHRASE_GREAT_BATTLE + goto_if_eq Route123_BerryMastersHouse_EventScript_GiveSpelonBerry + compare VAR_0x8004, PHRASE_CHALLENGE_CONTEST + goto_if_eq Route123_BerryMastersHouse_EventScript_GivePamtreBerry + compare VAR_0x8004, PHRASE_OVERWHELMING_LATIAS + goto_if_eq Route123_BerryMastersHouse_EventScript_GiveWatmelBerry + compare VAR_0x8004, PHRASE_COOL_LATIOS + goto_if_eq Route123_BerryMastersHouse_EventScript_GiveDurinBerry + compare VAR_0x8004, PHRASE_SUPER_HUSTLE + goto_if_eq Route123_BerryMastersHouse_EventScript_GiveBelueBerry end -Route123_BerryMastersHouse_EventScript_26F94C:: @ 826F94C - msgbox Route123_BerryMastersHouse_Text_2A75D0, MSGBOX_DEFAULT - random 10 +Route123_BerryMastersHouse_EventScript_GiveNormalBerry:: @ 826F94C + msgbox Route123_BerryMastersHouse_Text_GoodSayingTakeThis, MSGBOX_DEFAULT + random NUM_BERRY_MASTER_WIFE_BERRIES addvar VAR_RESULT, FIRST_BERRY_INDEX giveitem_std VAR_RESULT - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull - goto Route123_BerryMastersHouse_EventScript_26FA79 + goto Route123_BerryMastersHouse_EventScript_GaveBerry release end -Route123_BerryMastersHouse_EventScript_26F97A:: @ 826F97A - goto_if_set FLAG_RECEIVED_SPELON_BERRY, Route123_BerryMastersHouse_EventScript_26F94C - msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT +Route123_BerryMastersHouse_EventScript_GiveSpelonBerry:: @ 826F97A + goto_if_set FLAG_RECEIVED_SPELON_BERRY, Route123_BerryMastersHouse_EventScript_GiveNormalBerry + msgbox Route123_BerryMastersHouse_Text_InspirationalTakeThis, MSGBOX_DEFAULT giveitem_std ITEM_SPELON_BERRY - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_SPELON_BERRY - goto Route123_BerryMastersHouse_EventScript_26FA79 + goto Route123_BerryMastersHouse_EventScript_GaveBerry end -Route123_BerryMastersHouse_EventScript_26F9AB:: @ 826F9AB - goto_if_set FLAG_RECEIVED_PAMTRE_BERRY, Route123_BerryMastersHouse_EventScript_26F94C - msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT +Route123_BerryMastersHouse_EventScript_GivePamtreBerry:: @ 826F9AB + goto_if_set FLAG_RECEIVED_PAMTRE_BERRY, Route123_BerryMastersHouse_EventScript_GiveNormalBerry + msgbox Route123_BerryMastersHouse_Text_InspirationalTakeThis, MSGBOX_DEFAULT giveitem_std ITEM_PAMTRE_BERRY - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_PAMTRE_BERRY - goto Route123_BerryMastersHouse_EventScript_26FA79 + goto Route123_BerryMastersHouse_EventScript_GaveBerry end -Route123_BerryMastersHouse_EventScript_26F9DC:: @ 826F9DC - goto_if_set FLAG_RECEIVED_WATMEL_BERRY, Route123_BerryMastersHouse_EventScript_26F94C - msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT +Route123_BerryMastersHouse_EventScript_GiveWatmelBerry:: @ 826F9DC + goto_if_set FLAG_RECEIVED_WATMEL_BERRY, Route123_BerryMastersHouse_EventScript_GiveNormalBerry + msgbox Route123_BerryMastersHouse_Text_InspirationalTakeThis, MSGBOX_DEFAULT giveitem_std ITEM_WATMEL_BERRY - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_WATMEL_BERRY - goto Route123_BerryMastersHouse_EventScript_26FA79 + goto Route123_BerryMastersHouse_EventScript_GaveBerry end -Route123_BerryMastersHouse_EventScript_26FA0D:: @ 826FA0D - goto_if_set FLAG_RECEIVED_DURIN_BERRY, Route123_BerryMastersHouse_EventScript_26F94C - msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT +Route123_BerryMastersHouse_EventScript_GiveDurinBerry:: @ 826FA0D + goto_if_set FLAG_RECEIVED_DURIN_BERRY, Route123_BerryMastersHouse_EventScript_GiveNormalBerry + msgbox Route123_BerryMastersHouse_Text_InspirationalTakeThis, MSGBOX_DEFAULT giveitem_std ITEM_DURIN_BERRY - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_DURIN_BERRY - goto Route123_BerryMastersHouse_EventScript_26FA79 + goto Route123_BerryMastersHouse_EventScript_GaveBerry end -Route123_BerryMastersHouse_EventScript_26FA3E:: @ 826FA3E - goto_if_set FLAG_RECEIVED_BELUE_BERRY, Route123_BerryMastersHouse_EventScript_26F94C - msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT +Route123_BerryMastersHouse_EventScript_GiveBelueBerry:: @ 826FA3E + goto_if_set FLAG_RECEIVED_BELUE_BERRY, Route123_BerryMastersHouse_EventScript_GiveNormalBerry + msgbox Route123_BerryMastersHouse_Text_InspirationalTakeThis, MSGBOX_DEFAULT giveitem_std ITEM_BELUE_BERRY - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_BELUE_BERRY - goto Route123_BerryMastersHouse_EventScript_26FA79 + goto Route123_BerryMastersHouse_EventScript_GaveBerry end -Route123_BerryMastersHouse_EventScript_26FA6F:: @ 826FA6F - msgbox Route123_BerryMastersHouse_Text_2A761B, MSGBOX_DEFAULT +Route123_BerryMastersHouse_EventScript_ReceivedWifeBerryToday:: @ 826FA6F + msgbox Route123_BerryMastersHouse_Text_JoyNeverGoesOutOfMyLife, MSGBOX_DEFAULT release end -Route123_BerryMastersHouse_EventScript_26FA79:: @ 826FA79 +Route123_BerryMastersHouse_EventScript_GaveBerry:: @ 826FA79 setflag FLAG_DAILY_BERRY_MASTERS_WIFE - msgbox Route123_BerryMastersHouse_Text_2A761B, MSGBOX_DEFAULT + msgbox Route123_BerryMastersHouse_Text_JoyNeverGoesOutOfMyLife, MSGBOX_DEFAULT release end diff --git a/data/text/berries.inc b/data/text/berries.inc index 390812e96..7eeba8e18 100644 --- a/data/text/berries.inc +++ b/data/text/berries.inc @@ -88,50 +88,50 @@ LilycoveCity_Text_2A7321: @ 82A7321 .string "The way dignified simplicity suits me,\n" .string "{POKEBLOCK}S perfectly suit POKéMON.$" -Route123_BerryMastersHouse_Text_2A7386: @ 82A7386 +Route123_BerryMastersHouse_Text_YoureDeservingOfBerry: @ 82A7386 .string "You may call me the BERRY MASTER.\p" .string "I dream of filling the world with\n" .string "beautiful flowers, so I raise BERRIES\l" .string "and hand them out to everyone.\p" .string "You're deserving of one!$" -Route123_BerryMastersHouse_Text_2A7428: @ 82A7428 +Route123_BerryMastersHouse_Text_WhyBeStingyTakeAnother: @ 82A7428 .string "Why be stingy?\n" .string "Take another!$" -Route123_BerryMastersHouse_Text_2A7445: @ 82A7445 +Route123_BerryMastersHouse_Text_VisitPrettyPetalFlowerShop: @ 82A7445 .string "Be sure to visit the PRETTY PETAL\n" .string "flower shop near RUSTBORO.\p" .string "Let flowers fill the world!$" -Route123_BerryMastersHouse_Text_2A749E: @ 82A749E +Route123_BerryMastersHouse_Text_DoneForToday: @ 82A749E .string "I'm done for today.\n" .string "Come again another day.\p" .string "Let flowers fill the world!$" -Route123_BerryMastersHouse_Text_2A74E6: @ 82A74E6 +Route123_BerryMastersHouse_Text_HeardAGoodSayingLately: @ 82A74E6 .string "The way my husband grows BERRIES,\n" .string "oh, he's the best in the world.\p" .string "He makes me proud, that he does.\p" .string "Incidentally, child, have you heard\n" .string "a good saying lately?$" -Route123_BerryMastersHouse_Text_2A7583: @ 82A7583 +Route123_BerryMastersHouse_Text_InspirationalTakeThis: @ 82A7583 .string "Ah! What a remarkable saying!\n" .string "Inspirational, it is!\p" .string "I want you to have this.$" -Route123_BerryMastersHouse_Text_2A75D0: @ 82A75D0 +Route123_BerryMastersHouse_Text_GoodSayingTakeThis: @ 82A75D0 .string "Oh! A good saying it is.\n" .string "You're quite remarkable.\p" .string "I want you to have this.$" -Route123_BerryMastersHouse_Text_2A761B: @ 82A761B +Route123_BerryMastersHouse_Text_JoyNeverGoesOutOfMyLife: @ 82A761B .string "Our four grandchildren should become\n" .string "more accomplished than my husband.\p" .string "Joy never goes out of my life!$" -Route123_BerryMastersHouse_Text_2A7682: @ 82A7682 +Route123_BerryMastersHouse_Text_Ah: @ 82A7682 .string "Ah…$" Route104_PrettyPetalFlowerShop_Text_ThisIsPrettyPetalFlowerShop: @ 82A7686 diff --git a/include/constants/easy_chat.h b/include/constants/easy_chat.h index b97c2aaf2..8e82cfef0 100644 --- a/include/constants/easy_chat.h +++ b/include/constants/easy_chat.h @@ -1097,6 +1097,14 @@ #define EC_WORD_UGLY (EC_GROUP_TRENDY_SAYING << 9) | 0x20 #define NUM_ADDITIONAL_PHRASES 33 +// Special Berry Masters Wife phrases +#define NOT_SPECIAL_PHRASE 0 +#define PHRASE_GREAT_BATTLE 1 +#define PHRASE_CHALLENGE_CONTEST 2 +#define PHRASE_OVERWHELMING_LATIAS 3 +#define PHRASE_COOL_LATIOS 4 +#define PHRASE_SUPER_HUSTLE 5 + #define EC_POKEMON(mon) ((EC_GROUP_POKEMON << 9) | SPECIES_##mon) #define EC_POKEMON2(mon) ((EC_GROUP_POKEMON_2 << 9) | SPECIES_##mon) #define EC_MOVE(move) ((EC_GROUP_MOVE_1 << 9) | MOVE_##move) diff --git a/include/constants/flags.h b/include/constants/flags.h index 368f4f287..e76a9d9d7 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -353,8 +353,8 @@ #define FLAG_UNUSED_MYSTERY_GIFT_0x14D 0x14D #define FLAG_MIRAGE_TOWER_VISIBLE 0x14E -#define FLAG_CHOSE_CLAW_FOSSIL 0x14F -#define FLAG_CHOSE_ROOT_FOSSIL 0x150 +#define FLAG_CHOSE_ROOT_FOSSIL 0x14F +#define FLAG_CHOSE_CLAW_FOSSIL 0x150 #define FLAG_RECEIVED_POWDER_JAR 0x151 #define FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER 0x152 diff --git a/include/constants/items.h b/include/constants/items.h index 3a894f8ff..3664f6dd2 100644 --- a/include/constants/items.h +++ b/include/constants/items.h @@ -465,8 +465,17 @@ #define ITEMS_COUNT 377 #define ITEM_FIELD_ARROW ITEMS_COUNT -#define FIRST_BERRY_INDEX ITEM_CHERI_BERRY -#define LAST_BERRY_INDEX ITEM_ENIGMA_BERRY +#define FIRST_BERRY_INDEX ITEM_CHERI_BERRY +#define LAST_BERRY_INDEX ITEM_ENIGMA_BERRY +#define FIRST_BERRY_MASTER_BERRY ITEM_POMEG_BERRY +#define LAST_BERRY_MASTER_BERRY ITEM_NOMEL_BERRY +#define FIRST_BERRY_MASTER_WIFE_BERRY ITEM_CHERI_BERRY +#define LAST_BERRY_MASTER_WIFE_BERRY ITEM_SITRUS_BERRY + +#define NUM_BERRY_MASTER_BERRIES LAST_BERRY_MASTER_BERRY - FIRST_BERRY_MASTER_BERRY + 1 +#define NUM_BERRY_MASTER_BERRIES_SKIPPED FIRST_BERRY_MASTER_BERRY - FIRST_BERRY_INDEX +#define NUM_BERRY_MASTER_WIFE_BERRIES LAST_BERRY_MASTER_WIFE_BERRY - FIRST_BERRY_MASTER_WIFE_BERRY + 1 + #define ITEM_TO_BERRY(itemId)(((itemId - FIRST_BERRY_INDEX) + 1)) #define NUM_TECHNICAL_MACHINES 50 diff --git a/src/easy_chat.c b/src/easy_chat.c index 05f51ed4e..ce5fe3c7a 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -532,11 +532,11 @@ static const u16 sMysteryGiftPhrase[] = { }; static const u16 sBerryMasterWifePhrases[][2] = { - {EC_WORD_GREAT, EC_WORD_BATTLE}, - {EC_WORD_CHALLENGE, EC_WORD_CONTEST}, - {EC_WORD_OVERWHELMING, EC_POKEMON(LATIAS)}, - {EC_WORD_COOL, EC_POKEMON(LATIOS)}, - {EC_WORD_SUPER, EC_WORD_HUSTLE}, + [PHRASE_GREAT_BATTLE - 1] = {EC_WORD_GREAT, EC_WORD_BATTLE}, + [PHRASE_CHALLENGE_CONTEST - 1] = {EC_WORD_CHALLENGE, EC_WORD_CONTEST}, + [PHRASE_OVERWHELMING_LATIAS - 1] = {EC_WORD_OVERWHELMING, EC_POKEMON(LATIAS)}, + [PHRASE_COOL_LATIOS - 1] = {EC_WORD_COOL, EC_POKEMON(LATIOS)}, + [PHRASE_SUPER_HUSTLE - 1] = {EC_WORD_SUPER, EC_WORD_HUSTLE}, }; static const u16 sEasyChatTriangleCursorPalette[] = INCBIN_U16("graphics/easy_chat/triangle_cursor.gbapal"); From 1475c4d8da2e27734aa5a738e2287222c1e21386 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 6 Nov 2019 14:21:17 -0500 Subject: [PATCH 13/40] Document other cable car station --- data/maps/MtChimney_CableCarStation/map.json | 2 +- .../MtChimney_CableCarStation/scripts.inc | 50 +++++++++---------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/data/maps/MtChimney_CableCarStation/map.json b/data/maps/MtChimney_CableCarStation/map.json index 1b0efd3d9..49d102878 100644 --- a/data/maps/MtChimney_CableCarStation/map.json +++ b/data/maps/MtChimney_CableCarStation/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MtChimney_CableCarStation_EventScript_22AC4B", + "script": "MtChimney_CableCarStation_EventScript_Attendant", "flag": "0" }, { diff --git a/data/maps/MtChimney_CableCarStation/scripts.inc b/data/maps/MtChimney_CableCarStation/scripts.inc index 588a4c3f4..32064ad04 100644 --- a/data/maps/MtChimney_CableCarStation/scripts.inc +++ b/data/maps/MtChimney_CableCarStation/scripts.inc @@ -1,26 +1,26 @@ MtChimney_CableCarStation_MapScripts:: @ 822ABFA map_script MAP_SCRIPT_ON_TRANSITION, MtChimney_CableCarStation_OnTransition - map_script MAP_SCRIPT_ON_FRAME_TABLE, MtChimney_CableCarStation_MapScript2_22AC1D + map_script MAP_SCRIPT_ON_FRAME_TABLE, MtChimney_CableCarStation_OnFrame .byte 0 MtChimney_CableCarStation_OnTransition: @ 822AC05 compare VAR_CABLE_CAR_STATION_STATE, 1 - call_if_eq MtChimney_CableCarStation_EventScript_22AC11 + call_if_eq MtChimney_CableCarStation_EventScript_MoveAttendantAside end -MtChimney_CableCarStation_EventScript_22AC11:: @ 822AC11 +MtChimney_CableCarStation_EventScript_MoveAttendantAside:: @ 822AC11 setobjectxyperm 1, 5, 4 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_RIGHT return -MtChimney_CableCarStation_MapScript2_22AC1D: @ 822AC1D - map_script_2 VAR_CABLE_CAR_STATION_STATE, 1, MtChimney_CableCarStation_EventScript_22AC27 +MtChimney_CableCarStation_OnFrame: @ 822AC1D + map_script_2 VAR_CABLE_CAR_STATION_STATE, 1, MtChimney_CableCarStation_EventScript_ExitCableCar .2byte 0 -MtChimney_CableCarStation_EventScript_22AC27:: @ 822AC27 +MtChimney_CableCarStation_EventScript_ExitCableCar:: @ 822AC27 lockall - applymovement EVENT_OBJ_ID_PLAYER, MtChimney_CableCarStation_Movement_22ACB4 - applymovement 1, MtChimney_CableCarStation_Movement_22ACAA + applymovement EVENT_OBJ_ID_PLAYER, MtChimney_CableCarStation_Movement_ExitCableCar + applymovement 1, MtChimney_CableCarStation_Movement_FollowPlayerOutFromCableCar waitmovement 0 setvar VAR_CABLE_CAR_STATION_STATE, 0 setobjectxyperm 1, 6, 7 @@ -28,21 +28,21 @@ MtChimney_CableCarStation_EventScript_22AC27:: @ 822AC27 releaseall end -MtChimney_CableCarStation_EventScript_22AC4B:: @ 822AC4B +MtChimney_CableCarStation_EventScript_Attendant:: @ 822AC4B lock faceplayer - msgbox MtChimney_CableCarStation_Text_22ACB9, MSGBOX_YESNO + msgbox MtChimney_CableCarStation_Text_CableCarReadyGetOn, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq MtChimney_CableCarStation_EventScript_22AC6C + goto_if_eq MtChimney_CableCarStation_EventScript_RideCableCar compare VAR_RESULT, NO - goto_if_eq MtChimney_CableCarStation_EventScript_22AC9B + goto_if_eq MtChimney_CableCarStation_EventScript_DeclineRide end -MtChimney_CableCarStation_EventScript_22AC6C:: @ 822AC6C - msgbox MtChimney_CableCarStation_Text_22ACF8, MSGBOX_DEFAULT +MtChimney_CableCarStation_EventScript_RideCableCar:: @ 822AC6C + msgbox MtChimney_CableCarStation_Text_StepThisWay, MSGBOX_DEFAULT closemessage - applymovement 1, MtChimney_CableCarStation_Movement_22ACA5 - applymovement EVENT_OBJ_ID_PLAYER, MtChimney_CableCarStation_Movement_22ACAF + applymovement 1, MtChimney_CableCarStation_Movement_LeadPlayerToCableCar + applymovement EVENT_OBJ_ID_PLAYER, MtChimney_CableCarStation_Movement_BoardCableCar waitmovement 0 setvar VAR_0x8004, 1 setvar VAR_CABLE_CAR_STATION_STATE, 2 @@ -53,46 +53,46 @@ MtChimney_CableCarStation_EventScript_22AC6C:: @ 822AC6C release end -MtChimney_CableCarStation_EventScript_22AC9B:: @ 822AC9B - msgbox MtChimney_CableCarStation_Text_22AD0E, MSGBOX_DEFAULT +MtChimney_CableCarStation_EventScript_DeclineRide:: @ 822AC9B + msgbox MtChimney_CableCarStation_Text_RideAnotherTime, MSGBOX_DEFAULT release end -MtChimney_CableCarStation_Movement_22ACA5: @ 822ACA5 +MtChimney_CableCarStation_Movement_LeadPlayerToCableCar: @ 822ACA5 walk_up walk_up walk_left walk_in_place_fastest_right step_end -MtChimney_CableCarStation_Movement_22ACAA: @ 822ACAA +MtChimney_CableCarStation_Movement_FollowPlayerOutFromCableCar: @ 822ACAA delay_16 walk_right walk_down walk_down step_end -MtChimney_CableCarStation_Movement_22ACAF: @ 822ACAF +MtChimney_CableCarStation_Movement_BoardCableCar: @ 822ACAF walk_up walk_up walk_up delay_16 step_end -MtChimney_CableCarStation_Movement_22ACB4: @ 822ACB4 +MtChimney_CableCarStation_Movement_ExitCableCar: @ 822ACB4 walk_down walk_down walk_down delay_16 step_end -MtChimney_CableCarStation_Text_22ACB9: @ 822ACB9 +MtChimney_CableCarStation_Text_CableCarReadyGetOn: @ 822ACB9 .string "The CABLE CAR is ready to go down.\n" .string "Would you like to be on it?$" -MtChimney_CableCarStation_Text_22ACF8: @ 822ACF8 +MtChimney_CableCarStation_Text_StepThisWay: @ 822ACF8 .string "Please step this way.$" -MtChimney_CableCarStation_Text_22AD0E: @ 822AD0E +MtChimney_CableCarStation_Text_RideAnotherTime: @ 822AD0E .string "Please ride with us another time.$" From 25d026aded10c9a9567d214e46bf41ff4153eb46 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 6 Nov 2019 17:57:45 -0500 Subject: [PATCH 14/40] Document Trick House scripts --- .../Route110_TrickHouseCorridor/scripts.inc | 2 +- data/maps/Route110_TrickHouseEnd/map.json | 4 +- data/maps/Route110_TrickHouseEnd/scripts.inc | 248 +++--- .../maps/Route110_TrickHouseEntrance/map.json | 20 +- .../Route110_TrickHouseEntrance/scripts.inc | 683 ++++++++-------- data/maps/Route110_TrickHousePuzzle1/map.json | 8 +- .../Route110_TrickHousePuzzle1/scripts.inc | 56 +- data/maps/Route110_TrickHousePuzzle2/map.json | 16 +- .../Route110_TrickHousePuzzle2/scripts.inc | 84 +- data/maps/Route110_TrickHousePuzzle3/map.json | 16 +- .../Route110_TrickHousePuzzle3/scripts.inc | 136 ++-- data/maps/Route110_TrickHousePuzzle4/map.json | 8 +- .../Route110_TrickHousePuzzle4/scripts.inc | 48 +- data/maps/Route110_TrickHousePuzzle5/map.json | 56 +- .../Route110_TrickHousePuzzle5/scripts.inc | 762 +++++++++--------- data/maps/Route110_TrickHousePuzzle6/map.json | 8 +- .../Route110_TrickHousePuzzle6/scripts.inc | 56 +- data/maps/Route110_TrickHousePuzzle7/map.json | 22 +- .../Route110_TrickHousePuzzle7/scripts.inc | 231 +++--- data/maps/Route110_TrickHousePuzzle8/map.json | 8 +- .../Route110_TrickHousePuzzle8/scripts.inc | 48 +- include/constants/flags.h | 10 +- include/constants/vars.h | 10 +- include/event_scripts.h | 2 +- src/field_control_avatar.c | 2 +- 25 files changed, 1275 insertions(+), 1269 deletions(-) diff --git a/data/maps/Route110_TrickHouseCorridor/scripts.inc b/data/maps/Route110_TrickHouseCorridor/scripts.inc index 80a6ac3dd..ad469bc48 100644 --- a/data/maps/Route110_TrickHouseCorridor/scripts.inc +++ b/data/maps/Route110_TrickHouseCorridor/scripts.inc @@ -3,6 +3,6 @@ Route110_TrickHouseCorridor_MapScripts:: @ 826B903 .byte 0 Route110_TrickHouseCorridor_OnTransition: @ 826B909 - setvar VAR_TRICK_HOUSE_STATE, 1 + setvar VAR_TRICK_HOUSE_ENTER_FROM_CORRIDOR, 1 end diff --git a/data/maps/Route110_TrickHouseEnd/map.json b/data/maps/Route110_TrickHouseEnd/map.json index 62548fe8b..84233313b 100644 --- a/data/maps/Route110_TrickHouseEnd/map.json +++ b/data/maps/Route110_TrickHouseEnd/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_TrickHouseEnd_EventScript_26AD17", + "script": "Route110_TrickHouseEnd_EventScript_TrickMaster", "flag": "FLAG_HIDE_TRICK_HOUSE_END_MAN" } ], @@ -52,7 +52,7 @@ "elevation": 3, "var": "VAR_TEMP_2", "var_value": "0", - "script": "Route110_TrickHouseEnd_EventScript_26B041" + "script": "Route110_TrickHouseEnd_EventScript_TrickMasterExitTrigger" } ], "bg_events": [ diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc index 46c4c316e..348fce566 100644 --- a/data/maps/Route110_TrickHouseEnd/scripts.inc +++ b/data/maps/Route110_TrickHouseEnd/scripts.inc @@ -1,13 +1,13 @@ Route110_TrickHouseEnd_MapScripts:: @ 826ACAF - map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHouseEnd_MapScript1_26ACC4 + map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHouseEnd_OnResume map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHouseEnd_OnTransition - map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_TrickHouseEnd_MapScript2_26ACF5 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route110_TrickHouseEnd_MapScript2_26ACDE + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_TrickHouseEnd_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route110_TrickHouseEnd_OnWarp .byte 0 -Route110_TrickHouseEnd_MapScript1_26ACC4: @ 826ACC4 +Route110_TrickHouseEnd_OnResume: @ 826ACC4 compare VAR_TEMP_1, 1 - call_if_eq Route110_TrickHouseEnd_EventScript_26AD0D + call_if_eq Route110_TrickHouseEnd_EventScript_SetDoorClosedMetatile end Route110_TrickHouseEnd_OnTransition: @ 826ACD0 @@ -16,306 +16,306 @@ Route110_TrickHouseEnd_OnTransition: @ 826ACD0 special SetTrickHouseEndRoomFlag end -Route110_TrickHouseEnd_MapScript2_26ACDE: @ 826ACDE - map_script_2 VAR_TEMP_2, 0, Route110_TrickHouseEnd_EventScript_26ACE8 +Route110_TrickHouseEnd_OnWarp: @ 826ACDE + map_script_2 VAR_TEMP_2, 0, Route110_TrickHouseEnd_EventScript_SetTrickMasterPos .2byte 0 -Route110_TrickHouseEnd_EventScript_26ACE8:: @ 826ACE8 +Route110_TrickHouseEnd_EventScript_SetTrickMasterPos:: @ 826ACE8 addobject 1 showobjectat 1, MAP_ROUTE110_TRICK_HOUSE_END turnobject 1, DIR_EAST end -Route110_TrickHouseEnd_MapScript2_26ACF5: @ 826ACF5 - map_script_2 VAR_TEMP_1, 0, Route110_TrickHouseEnd_EventScript_26ACFF +Route110_TrickHouseEnd_OnFrame: @ 826ACF5 + map_script_2 VAR_TEMP_1, 0, Route110_TrickHouseEnd_EventScript_CloseDoor .2byte 0 -Route110_TrickHouseEnd_EventScript_26ACFF:: @ 826ACFF +Route110_TrickHouseEnd_EventScript_CloseDoor:: @ 826ACFF setvar VAR_TEMP_1, 1 - call Route110_TrickHouseEnd_EventScript_26AD0D + call Route110_TrickHouseEnd_EventScript_SetDoorClosedMetatile special DrawWholeMapView end -Route110_TrickHouseEnd_EventScript_26AD0D:: @ 826AD0D +Route110_TrickHouseEnd_EventScript_SetDoorClosedMetatile:: @ 826AD0D setmetatile 10, 1, METATILE_GenericBuilding_TrickHouse_Door_Closed, 1 return -Route110_TrickHouseEnd_EventScript_26AD17:: @ 826AD17 +Route110_TrickHouseEnd_EventScript_TrickMaster:: @ 826AD17 lock faceplayer - msgbox Route110_TrickHouseEnd_Text_26B08D, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEnd_Text_YouveMadeItToMe, MSGBOX_DEFAULT setvar VAR_TEMP_2, 1 switch VAR_TRICK_HOUSE_LEVEL - case 0, Route110_TrickHouseEnd_EventScript_26AD84 - case 1, Route110_TrickHouseEnd_EventScript_26ADC0 - case 2, Route110_TrickHouseEnd_EventScript_26ADFC - case 3, Route110_TrickHouseEnd_EventScript_26AE38 - case 4, Route110_TrickHouseEnd_EventScript_26AE74 - case 5, Route110_TrickHouseEnd_EventScript_26AEB0 - case 6, Route110_TrickHouseEnd_EventScript_26AEEC - case 7, Route110_TrickHouseEnd_EventScript_26AF28 + case 0, Route110_TrickHouseEnd_EventScript_CompletedPuzzle1 + case 1, Route110_TrickHouseEnd_EventScript_CompletedPuzzle2 + case 2, Route110_TrickHouseEnd_EventScript_CompletedPuzzle3 + case 3, Route110_TrickHouseEnd_EventScript_CompletedPuzzle4 + case 4, Route110_TrickHouseEnd_EventScript_CompletedPuzzle5 + case 5, Route110_TrickHouseEnd_EventScript_CompletedPuzzle6 + case 6, Route110_TrickHouseEnd_EventScript_CompletedPuzzle7 + case 7, Route110_TrickHouseEnd_EventScript_CompletedPuzzle8 end -Route110_TrickHouseEnd_EventScript_26AD84:: @ 826AD84 - msgbox Route110_TrickHouseEnd_Text_26B0BC, MSGBOX_DEFAULT - msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT +Route110_TrickHouseEnd_EventScript_CompletedPuzzle1:: @ 826AD84 + msgbox Route110_TrickHouseEnd_Text_AllNightToPlantTrees, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward, MSGBOX_DEFAULT setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_RARE_CANDY - compare VAR_RESULT, 0 - call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF - msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + call_if_eq Route110_TrickHouseEnd_EventScript_BagFull + msgbox Route110_TrickHouseEnd_Text_MakeNewTricksToStumpYou, MSGBOX_DEFAULT closemessage - call Route110_TrickHouseEnd_EventScript_26AFCF + call Route110_TrickHouseEnd_EventScript_TrickMasterExit release end -Route110_TrickHouseEnd_EventScript_26ADC0:: @ 826ADC0 - msgbox Route110_TrickHouseEnd_Text_26B13B, MSGBOX_DEFAULT - msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT +Route110_TrickHouseEnd_EventScript_CompletedPuzzle2:: @ 826ADC0 + msgbox Route110_TrickHouseEnd_Text_AllNightToMakeMaze, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward, MSGBOX_DEFAULT setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_TIMER_BALL - compare VAR_RESULT, 0 - call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF - msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + call_if_eq Route110_TrickHouseEnd_EventScript_BagFull + msgbox Route110_TrickHouseEnd_Text_MakeNewTricksToStumpYou, MSGBOX_DEFAULT closemessage - call Route110_TrickHouseEnd_EventScript_26AFCF + call Route110_TrickHouseEnd_EventScript_TrickMasterExit release end -Route110_TrickHouseEnd_EventScript_26ADFC:: @ 826ADFC - msgbox Route110_TrickHouseEnd_Text_26B1AD, MSGBOX_DEFAULT - msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT +Route110_TrickHouseEnd_EventScript_CompletedPuzzle3:: @ 826ADFC + msgbox Route110_TrickHouseEnd_Text_AllNightToPreparePanels, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward, MSGBOX_DEFAULT setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_HARD_STONE - compare VAR_RESULT, 0 - call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF - msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + call_if_eq Route110_TrickHouseEnd_EventScript_BagFull + msgbox Route110_TrickHouseEnd_Text_MakeNewTricksToStumpYou, MSGBOX_DEFAULT closemessage - call Route110_TrickHouseEnd_EventScript_26AFCF + call Route110_TrickHouseEnd_EventScript_TrickMasterExit release end -Route110_TrickHouseEnd_EventScript_26AE38:: @ 826AE38 - msgbox Route110_TrickHouseEnd_Text_26B223, MSGBOX_DEFAULT - msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT +Route110_TrickHouseEnd_EventScript_CompletedPuzzle4:: @ 826AE38 + msgbox Route110_TrickHouseEnd_Text_AllNightToShoveBoulders, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward, MSGBOX_DEFAULT setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_SMOKE_BALL - compare VAR_RESULT, 0 - call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF - msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + call_if_eq Route110_TrickHouseEnd_EventScript_BagFull + msgbox Route110_TrickHouseEnd_Text_MakeNewTricksToStumpYou, MSGBOX_DEFAULT closemessage - call Route110_TrickHouseEnd_EventScript_26AFCF + call Route110_TrickHouseEnd_EventScript_TrickMasterExit release end -Route110_TrickHouseEnd_EventScript_26AE74:: @ 826AE74 - msgbox Route110_TrickHouseEnd_Text_26B293, MSGBOX_DEFAULT - msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT +Route110_TrickHouseEnd_EventScript_CompletedPuzzle5:: @ 826AE74 + msgbox Route110_TrickHouseEnd_Text_AllNightToMakeMechadolls, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward, MSGBOX_DEFAULT setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_TM12 - compare VAR_RESULT, 0 - call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF - msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + call_if_eq Route110_TrickHouseEnd_EventScript_BagFull + msgbox Route110_TrickHouseEnd_Text_MakeNewTricksToStumpYou, MSGBOX_DEFAULT closemessage - call Route110_TrickHouseEnd_EventScript_26AFCF + call Route110_TrickHouseEnd_EventScript_TrickMasterExit release end -Route110_TrickHouseEnd_EventScript_26AEB0:: @ 826AEB0 - msgbox Route110_TrickHouseEnd_Text_26B315, MSGBOX_DEFAULT - msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT +Route110_TrickHouseEnd_EventScript_CompletedPuzzle6:: @ 826AEB0 + msgbox Route110_TrickHouseEnd_Text_AllNightToInstallDoors, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward, MSGBOX_DEFAULT setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_MAGNET - compare VAR_RESULT, 0 - call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF - msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + call_if_eq Route110_TrickHouseEnd_EventScript_BagFull + msgbox Route110_TrickHouseEnd_Text_MakeNewTricksToStumpYou, MSGBOX_DEFAULT closemessage - call Route110_TrickHouseEnd_EventScript_26AFCF + call Route110_TrickHouseEnd_EventScript_TrickMasterExit release end -Route110_TrickHouseEnd_EventScript_26AEEC:: @ 826AEEC - msgbox Route110_TrickHouseEnd_Text_26B365, MSGBOX_DEFAULT - msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT +Route110_TrickHouseEnd_EventScript_CompletedPuzzle7:: @ 826AEEC + msgbox Route110_TrickHouseEnd_Text_AllNightSettingUpArrows, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward, MSGBOX_DEFAULT setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_PP_MAX - compare VAR_RESULT, 0 - call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF - msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + call_if_eq Route110_TrickHouseEnd_EventScript_BagFull + msgbox Route110_TrickHouseEnd_Text_MakeNewTricksToStumpYou, MSGBOX_DEFAULT closemessage - call Route110_TrickHouseEnd_EventScript_26AFCF + call Route110_TrickHouseEnd_EventScript_TrickMasterExit release end -Route110_TrickHouseEnd_EventScript_26AF28:: @ 826AF28 - msgbox Route110_TrickHouseEnd_Text_26B3AB, MSGBOX_DEFAULT +Route110_TrickHouseEnd_EventScript_CompletedPuzzle8:: @ 826AF28 + msgbox Route110_TrickHouseEnd_Text_AllNightPolishingFloors, MSGBOX_DEFAULT closemessage compare VAR_FACING, DIR_SOUTH - call_if_eq Route110_TrickHouseEnd_EventScript_26B015 + call_if_eq Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwaySouth compare VAR_FACING, DIR_NORTH - call_if_eq Route110_TrickHouseEnd_EventScript_26B020 + call_if_eq Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwayNorth compare VAR_FACING, DIR_WEST - call_if_eq Route110_TrickHouseEnd_EventScript_26B02B + call_if_eq Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwayWest compare VAR_FACING, DIR_EAST - call_if_eq Route110_TrickHouseEnd_EventScript_26B036 + call_if_eq Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwayEast delay 30 - msgbox Route110_TrickHouseEnd_Text_26B3FA, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEnd_Text_FountainOfIdeasRunDry, MSGBOX_DEFAULT closemessage applymovement 1, Common_Movement_FacePlayer waitmovement 0 delay 30 - msgbox Route110_TrickHouseEnd_Text_26B485, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEnd_Text_DefeatedMePreferWhichTent, MSGBOX_DEFAULT setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 - call Route110_TrickHouseEnd_EventScript_26AFA5 - compare VAR_RESULT, 0 - call_if_eq Route110_TrickHouseEnd_EventScript_26B002 - msgbox Route110_TrickHouseEnd_Text_26B69A, MSGBOX_DEFAULT - call Route110_TrickHouseEnd_EventScript_26AFCF + call Route110_TrickHouseEnd_EventScript_ChooseTent + compare VAR_RESULT, FALSE + call_if_eq Route110_TrickHouseEnd_EventScript_NoRoomForTent + msgbox Route110_TrickHouseEnd_Text_LeavingOnJourney, MSGBOX_DEFAULT + call Route110_TrickHouseEnd_EventScript_TrickMasterExit special ResetTrickHouseEndRoomFlag release end -Route110_TrickHouseEnd_EventScript_26AFA5:: @ 826AFA5 +Route110_TrickHouseEnd_EventScript_ChooseTent:: @ 826AFA5 multichoice 0, 0, MULTI_TENT, 1 switch VAR_RESULT - case 0, Route110_TrickHouseEnd_EventScript_26AFBF - goto Route110_TrickHouseEnd_EventScript_26AFC7 + case 0, Route110_TrickHouseEnd_EventScript_GiveRedTent + goto Route110_TrickHouseEnd_EventScript_GiveBlueTent -Route110_TrickHouseEnd_EventScript_26AFBF:: @ 826AFBF +Route110_TrickHouseEnd_EventScript_GiveRedTent:: @ 826AFBF givedecoration_std DECOR_RED_TENT return -Route110_TrickHouseEnd_EventScript_26AFC7:: @ 826AFC7 +Route110_TrickHouseEnd_EventScript_GiveBlueTent:: @ 826AFC7 givedecoration_std DECOR_BLUE_TENT return -Route110_TrickHouseEnd_EventScript_26AFCF:: @ 826AFCF - applymovement 1, Route110_TrickHouseEnd_Movement_269E36 +Route110_TrickHouseEnd_EventScript_TrickMasterExit:: @ 826AFCF + applymovement 1, Route110_TrickHouse_Movement_TrickMasterSpin waitmovement 0 playse SE_W153 - applymovement 1, Route110_TrickHouseEnd_Movement_269E3F + applymovement 1, Route110_TrickHouse_Movement_TrickMasterJumpAway waitmovement 0 removeobject 1 addvar VAR_TRICK_HOUSE_LEVEL, 1 return -Route110_TrickHouseEnd_EventScript_26AFEF:: @ 826AFEF +Route110_TrickHouseEnd_EventScript_BagFull:: @ 826AFEF call Common_EventScript_BagIsFull - msgbox Route110_TrickHouseEnd_Text_26B760, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEnd_Text_NoRoomForThis, MSGBOX_DEFAULT setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 1 return -Route110_TrickHouseEnd_EventScript_26B002:: @ 826B002 +Route110_TrickHouseEnd_EventScript_NoRoomForTent:: @ 826B002 call Common_EventScript_NoRoomLeftForAnother - msgbox Route110_TrickHouseEnd_Text_26B615, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEnd_Text_NoRoomInPC, MSGBOX_DEFAULT setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 1 return -Route110_TrickHouseEnd_EventScript_26B015:: @ 826B015 +Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwaySouth:: @ 826B015 applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return -Route110_TrickHouseEnd_EventScript_26B020:: @ 826B020 +Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwayNorth:: @ 826B020 applymovement 1, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return -Route110_TrickHouseEnd_EventScript_26B02B:: @ 826B02B +Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwayWest:: @ 826B02B applymovement 1, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return -Route110_TrickHouseEnd_EventScript_26B036:: @ 826B036 +Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwayEast:: @ 826B036 applymovement 1, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return -Route110_TrickHouseEnd_EventScript_26B041:: @ 826B041 +Route110_TrickHouseEnd_EventScript_TrickMasterExitTrigger:: @ 826B041 lockall turnobject 1, DIR_WEST playse SE_PIN applymovement 1, Common_Movement_ExclamationMark waitmovement 0 delay 20 - applymovement 1, Route110_TrickHouseEnd_Movement_26B08B + applymovement 1, Route110_TrickHouseEnd_Movement_TrickMasterSurprise waitmovement 0 playse SE_W153 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 - msgbox Route110_TrickHouseEnd_Text_26B8BD, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEnd_Text_YoureIgnoringMe, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEnd_Movement_26B089 + applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEnd_Movement_KeepPlayerInRoom waitmovement 0 delay 4 turnobject 1, DIR_EAST releaseall end -Route110_TrickHouseEnd_Movement_26B089: @ 826B089 +Route110_TrickHouseEnd_Movement_KeepPlayerInRoom: @ 826B089 walk_down step_end -Route110_TrickHouseEnd_Movement_26B08B: @ 826B08B +Route110_TrickHouseEnd_Movement_TrickMasterSurprise: @ 826B08B jump_in_place_left step_end -Route110_TrickHouseEnd_Text_26B08D: @ 826B08D +Route110_TrickHouseEnd_Text_YouveMadeItToMe: @ 826B08D .string "Aak!\n" .string "You've made it to me?\l" .string "Hmmm… You're sharp!$" -Route110_TrickHouseEnd_Text_26B0BC: @ 826B0BC +Route110_TrickHouseEnd_Text_AllNightToPlantTrees: @ 826B0BC .string "It took me all night to plant all those\n" .string "trees…\p" .string "You're almost my equal in greatness by\n" .string "one, two, three, four, five, six places!$" -Route110_TrickHouseEnd_Text_26B13B: @ 826B13B +Route110_TrickHouseEnd_Text_AllNightToMakeMaze: @ 826B13B .string "It took me all night to make the maze…\p" .string "You're almost my equal in greatness by\n" .string "one, two, three, four, five places!$" -Route110_TrickHouseEnd_Text_26B1AD: @ 826B1AD +Route110_TrickHouseEnd_Text_AllNightToPreparePanels: @ 826B1AD .string "It took me all night to prepare\n" .string "the wall panels…\p" .string "You're almost my equal in greatness by\n" .string "one, two, three, four places!$" -Route110_TrickHouseEnd_Text_26B223: @ 826B223 +Route110_TrickHouseEnd_Text_AllNightToShoveBoulders: @ 826B223 .string "It took me all night to shove in those\n" .string "boulders…\p" .string "You're almost my equal in greatness by\n" .string "one, two, three places!$" -Route110_TrickHouseEnd_Text_26B293: @ 826B293 +Route110_TrickHouseEnd_Text_AllNightToMakeMechadolls: @ 826B293 .string "It took me all night to make MECHADOLLS\n" .string "and another to think up the quiz…\p" .string "You're almost my equal in greatness by\n" .string "one, two places!$" -Route110_TrickHouseEnd_Text_26B315: @ 826B315 +Route110_TrickHouseEnd_Text_AllNightToInstallDoors: @ 826B315 .string "It took me all night to install\n" .string "the doors…\p" .string "You're almost my equal in greatness!$" -Route110_TrickHouseEnd_Text_26B365: @ 826B365 +Route110_TrickHouseEnd_Text_AllNightSettingUpArrows: @ 826B365 .string "It took me all night setting up arrows…\p" .string "You're my equal in greatness!$" -Route110_TrickHouseEnd_Text_26B3AB: @ 826B3AB +Route110_TrickHouseEnd_Text_AllNightPolishingFloors: @ 826B3AB .string "It took me all night polishing floors…\p" .string "You're above me in greatness!\n" .string "Possibly…$" -Route110_TrickHouseEnd_Text_26B3FA: @ 826B3FA +Route110_TrickHouseEnd_Text_FountainOfIdeasRunDry: @ 826B3FA .string "Wh-what should I do?\n" .string "My fountain of ideas for tricks has\l" .string "run dry…\p" .string "Perhaps it is time I toured the country\n" .string "on a quest to devise new tricks…$" -Route110_TrickHouseEnd_Text_26B485: @ 826B485 +Route110_TrickHouseEnd_Text_DefeatedMePreferWhichTent: @ 826B485 .string "I hate to admit defeat, but you have\n" .string "bested me!\p" .string "Still, you must have been reeled in by\n" @@ -331,13 +331,13 @@ Route110_TrickHouseEnd_Text_26B485: @ 826B485 .string "a RED TENT and a BLUE TENT.\l" .string "Which do you prefer?$" -Route110_TrickHouseEnd_Text_26B615: @ 826B615 +Route110_TrickHouseEnd_Text_NoRoomInPC: @ 826B615 .string "What? No room in your PC?\n" .string "What am I to make of that?\p" .string "I wish I could say that, but I am much\n" .string "too kind and caring, so come back later!$" -Route110_TrickHouseEnd_Text_26B69A: @ 826B69A +Route110_TrickHouseEnd_Text_LeavingOnJourney: @ 826B69A .string "… … … … … …\p" .string "I am leaving on a journey of discovery.\n" .string "A quest in search of new tricks.\p" @@ -345,17 +345,17 @@ Route110_TrickHouseEnd_Text_26B69A: @ 826B69A .string "entertain me again.\p" .string "And now, farewell!$" -Route110_TrickHouseEnd_Text_26B73D: @ 826B73D +Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward: @ 826B73D .string "Fine!\n" .string "You have earned this reward!$" -Route110_TrickHouseEnd_Text_26B760: @ 826B760 +Route110_TrickHouseEnd_Text_NoRoomForThis: @ 826B760 .string "What? Have you no room for this?\n" .string "What manner of items do you carry?\p" .string "But fine, since you've reached me,\n" .string "your reward will be with me till later.$" -Route110_TrickHouseEnd_Text_26B7EF: @ 826B7EF +Route110_TrickHouseEnd_Text_MakeNewTricksToStumpYou: @ 826B7EF .string "Scrub that smug smirk from your face!\n" .string "It's much too early to think you've won!\p" .string "I'll make new tricks to stump you, I will.\n" @@ -363,7 +363,7 @@ Route110_TrickHouseEnd_Text_26B7EF: @ 826B7EF .string "Come back for the next exciting\n" .string "installment!$" -Route110_TrickHouseEnd_Text_26B8BD: @ 826B8BD +Route110_TrickHouseEnd_Text_YoureIgnoringMe: @ 826B8BD .string "Now, now! You're ignoring me now?\n" .string "Now that, I consider heartbreaking!$" diff --git a/data/maps/Route110_TrickHouseEntrance/map.json b/data/maps/Route110_TrickHouseEntrance/map.json index ce188feec..58ba81aea 100644 --- a/data/maps/Route110_TrickHouseEntrance/map.json +++ b/data/maps/Route110_TrickHouseEntrance/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_TrickHouseEntrance_EventScript_269D3B", + "script": "Route110_TrickHouseEntrance_EventScript_TrickMaster", "flag": "FLAG_HIDE_TRICK_HOUSE_ENTRANCE_MAN" } ], @@ -57,36 +57,36 @@ "x": 4, "y": 7, "elevation": 3, - "var": "VAR_TRICK_HOUSE_ENTRANCE_STATE_1", + "var": "VAR_TRICK_HOUSE_BEING_WATCHED_STATE", "var_value": "0", - "script": "Route110_TrickHouseEntrance_EventScript_26A3F8" + "script": "Route110_TrickHouseEntrance_EventScript_TrickMasterHiding" }, { "type": "trigger", "x": 5, "y": 6, "elevation": 3, - "var": "VAR_TRICK_HOUSE_ENTRANCE_STATE_1", + "var": "VAR_TRICK_HOUSE_BEING_WATCHED_STATE", "var_value": "0", - "script": "Route110_TrickHouseEntrance_EventScript_26A3F8" + "script": "Route110_TrickHouseEntrance_EventScript_TrickMasterHiding" }, { "type": "trigger", "x": 6, "y": 6, "elevation": 3, - "var": "VAR_TRICK_HOUSE_ENTRANCE_STATE_1", + "var": "VAR_TRICK_HOUSE_BEING_WATCHED_STATE", "var_value": "0", - "script": "Route110_TrickHouseEntrance_EventScript_26A3F8" + "script": "Route110_TrickHouseEntrance_EventScript_TrickMasterHiding" }, { "type": "trigger", "x": 7, "y": 7, "elevation": 3, - "var": "VAR_TRICK_HOUSE_ENTRANCE_STATE_1", + "var": "VAR_TRICK_HOUSE_BEING_WATCHED_STATE", "var_value": "0", - "script": "Route110_TrickHouseEntrance_EventScript_26A3F8" + "script": "Route110_TrickHouseEntrance_EventScript_TrickMasterHiding" } ], "bg_events": [ @@ -96,7 +96,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "Route110_TrickHouseEntrance_EventScript_26A0D3" + "script": "Route110_TrickHouseEntrance_EventScript_Door" } ] } \ No newline at end of file diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc index ab3ef25aa..eaf3defd8 100644 --- a/data/maps/Route110_TrickHouseEntrance/scripts.inc +++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc @@ -1,302 +1,310 @@ Route110_TrickHouseEntrance_MapScripts:: @ 8269A50 map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHouseEntrance_OnTransition - map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_TrickHouseEntrance_MapScript2_269CEE - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route110_TrickHouseEntrance_MapScript2_269BD3 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_TrickHouseEntrance_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route110_TrickHouseEntrance_OnWarp .byte 0 + @ State descriptions for VAR_TRICK_HOUSE_ENTRANCE_STATE + @ 0: Trick Master is hiding + @ 1: Trick Master has left at start of challenge + @ 2: Trick Master ready to give normal reward from previous challenge (if bag was full) + @ 3: Trick Master still making next puzzle + @ 4: Finished final puzzle + @ 5: Completed previous challenge + @ 6: 'Trick Master' mechadoll ready to give Tent reward from final challenge (if bag was full) + Route110_TrickHouseEntrance_OnTransition: @ 8269A60 setflag FLAG_LANDMARK_TRICK_HOUSE - compare VAR_TRICK_HOUSE_STATE, 1 - goto_if_eq Route110_TrickHouseEntrance_EventScript_269AF3 + compare VAR_TRICK_HOUSE_ENTER_FROM_CORRIDOR, 1 + goto_if_eq Route110_TrickHouseEntrance_EventScript_EnterFromCorridor compare VAR_TRICK_HOUSE_PRIZE_PICKUP, 1 - goto_if_eq Route110_TrickHouseEntrance_EventScript_269AD7 - compare VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1 - goto_if_eq Route110_TrickHouseEntrance_EventScript_269BB3 - compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5 - call_if_eq Route110_TrickHouseEntrance_EventScript_269B03 - compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3 - call_if_eq Route110_TrickHouseEntrance_EventScript_269B03 - compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0 - call_if_eq Route110_TrickHouseEntrance_EventScript_269B03 - switch VAR_TRICK_HOUSE_ENTRANCE_STATE_3 - case 0, Route110_TrickHouseEntrance_EventScript_269BBB - case 1, Route110_TrickHouseEntrance_EventScript_269BC1 - case 3, Route110_TrickHouseEntrance_EventScript_269BC7 - case 4, Route110_TrickHouseEntrance_EventScript_269BCD + goto_if_eq Route110_TrickHouseEntrance_EventScript_SetReadyToGiveReward + compare VAR_TRICK_HOUSE_FOUND_TRICK_MASTER, 1 + goto_if_eq Route110_TrickHouseEntrance_EventScript_MoveTrickMasterToDoor + compare VAR_TRICK_HOUSE_ENTRANCE_STATE, 5 + call_if_eq Route110_TrickHouseEntrance_EventScript_CheckReadyForNextPuzzle + compare VAR_TRICK_HOUSE_ENTRANCE_STATE, 3 + call_if_eq Route110_TrickHouseEntrance_EventScript_CheckReadyForNextPuzzle + compare VAR_TRICK_HOUSE_ENTRANCE_STATE, 0 + call_if_eq Route110_TrickHouseEntrance_EventScript_CheckReadyForNextPuzzle + switch VAR_TRICK_HOUSE_ENTRANCE_STATE + case 0, Route110_TrickHouseEntrance_EventScript_ReadyBeingWatchedTrigger + case 1, Route110_TrickHouseEntrance_EventScript_SetNotBeingWatched1 + case 3, Route110_TrickHouseEntrance_EventScript_SetNotBeingWatched2 + case 4, Route110_TrickHouseEntrance_EventScript_SetNotBeingWatched3 end -Route110_TrickHouseEntrance_EventScript_269AD7:: @ 8269AD7 - setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1 +Route110_TrickHouseEntrance_EventScript_SetReadyToGiveReward:: @ 8269AD7 + setvar VAR_TRICK_HOUSE_BEING_WATCHED_STATE, 1 compare VAR_TRICK_HOUSE_LEVEL, 8 - goto_if_eq Route110_TrickHouseEntrance_EventScript_269AED - setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 2 + goto_if_eq Route110_TrickHouseEntrance_EventScript_ReadyToGiveTentReward + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 2 end -Route110_TrickHouseEntrance_EventScript_269AED:: @ 8269AED - setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 6 +Route110_TrickHouseEntrance_EventScript_ReadyToGiveTentReward:: @ 8269AED + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 6 end -Route110_TrickHouseEntrance_EventScript_269AF3:: @ 8269AF3 - setvar VAR_TRICK_HOUSE_STATE, 0 - setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5 - setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1 +Route110_TrickHouseEntrance_EventScript_EnterFromCorridor:: @ 8269AF3 + setvar VAR_TRICK_HOUSE_ENTER_FROM_CORRIDOR, 0 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 5 + setvar VAR_TRICK_HOUSE_BEING_WATCHED_STATE, 1 end -Route110_TrickHouseEntrance_EventScript_269B03:: @ 8269B03 - setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0 +Route110_TrickHouseEntrance_EventScript_CheckReadyForNextPuzzle:: @ 8269B03 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 0 compare VAR_TRICK_HOUSE_LEVEL, 1 - call_if_eq Route110_TrickHouseEntrance_EventScript_269B61 + call_if_eq Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle2 compare VAR_TRICK_HOUSE_LEVEL, 2 - call_if_eq Route110_TrickHouseEntrance_EventScript_269B6B + call_if_eq Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle3 compare VAR_TRICK_HOUSE_LEVEL, 3 - call_if_eq Route110_TrickHouseEntrance_EventScript_269B75 + call_if_eq Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle4 compare VAR_TRICK_HOUSE_LEVEL, 4 - call_if_eq Route110_TrickHouseEntrance_EventScript_269B7F + call_if_eq Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle5 compare VAR_TRICK_HOUSE_LEVEL, 5 - call_if_eq Route110_TrickHouseEntrance_EventScript_269B89 + call_if_eq Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle6 compare VAR_TRICK_HOUSE_LEVEL, 6 - call_if_eq Route110_TrickHouseEntrance_EventScript_269B93 + call_if_eq Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle7 compare VAR_TRICK_HOUSE_LEVEL, 7 - call_if_eq Route110_TrickHouseEntrance_EventScript_269B9D + call_if_eq Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle8 compare VAR_TRICK_HOUSE_LEVEL, 8 - call_if_eq Route110_TrickHouseEntrance_EventScript_269BA7 + call_if_eq Route110_TrickHouseEntrance_EventScript_FinishedPuzzles return -Route110_TrickHouseEntrance_EventScript_269B61:: @ 8269B61 - call_if_unset FLAG_BADGE03_GET, Route110_TrickHouseEntrance_EventScript_269BAD +Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle2:: @ 8269B61 + call_if_unset FLAG_BADGE03_GET, Route110_TrickHouseEntrance_EventScript_NotReadyForPuzzle return -Route110_TrickHouseEntrance_EventScript_269B6B:: @ 8269B6B - call_if_unset FLAG_BADGE04_GET, Route110_TrickHouseEntrance_EventScript_269BAD +Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle3:: @ 8269B6B + call_if_unset FLAG_BADGE04_GET, Route110_TrickHouseEntrance_EventScript_NotReadyForPuzzle return -Route110_TrickHouseEntrance_EventScript_269B75:: @ 8269B75 - call_if_unset FLAG_BADGE05_GET, Route110_TrickHouseEntrance_EventScript_269BAD +Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle4:: @ 8269B75 + call_if_unset FLAG_BADGE05_GET, Route110_TrickHouseEntrance_EventScript_NotReadyForPuzzle return -Route110_TrickHouseEntrance_EventScript_269B7F:: @ 8269B7F - call_if_unset FLAG_BADGE06_GET, Route110_TrickHouseEntrance_EventScript_269BAD +Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle5:: @ 8269B7F + call_if_unset FLAG_BADGE06_GET, Route110_TrickHouseEntrance_EventScript_NotReadyForPuzzle return -Route110_TrickHouseEntrance_EventScript_269B89:: @ 8269B89 - call_if_unset FLAG_BADGE07_GET, Route110_TrickHouseEntrance_EventScript_269BAD +Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle6:: @ 8269B89 + call_if_unset FLAG_BADGE07_GET, Route110_TrickHouseEntrance_EventScript_NotReadyForPuzzle return -Route110_TrickHouseEntrance_EventScript_269B93:: @ 8269B93 - call_if_unset FLAG_BADGE08_GET, Route110_TrickHouseEntrance_EventScript_269BAD +Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle7:: @ 8269B93 + call_if_unset FLAG_BADGE08_GET, Route110_TrickHouseEntrance_EventScript_NotReadyForPuzzle return -Route110_TrickHouseEntrance_EventScript_269B9D:: @ 8269B9D - call_if_unset FLAG_SYS_GAME_CLEAR, Route110_TrickHouseEntrance_EventScript_269BAD +Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle8:: @ 8269B9D + call_if_unset FLAG_SYS_GAME_CLEAR, Route110_TrickHouseEntrance_EventScript_NotReadyForPuzzle return -Route110_TrickHouseEntrance_EventScript_269BA7:: @ 8269BA7 - setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 4 +Route110_TrickHouseEntrance_EventScript_FinishedPuzzles:: @ 8269BA7 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 4 return -Route110_TrickHouseEntrance_EventScript_269BAD:: @ 8269BAD - setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3 +Route110_TrickHouseEntrance_EventScript_NotReadyForPuzzle:: @ 8269BAD + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 3 return -Route110_TrickHouseEntrance_EventScript_269BB3:: @ 8269BB3 +Route110_TrickHouseEntrance_EventScript_MoveTrickMasterToDoor:: @ 8269BB3 setobjectxyperm 1, 5, 2 end -Route110_TrickHouseEntrance_EventScript_269BBB:: @ 8269BBB - setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 0 +Route110_TrickHouseEntrance_EventScript_ReadyBeingWatchedTrigger:: @ 8269BBB + setvar VAR_TRICK_HOUSE_BEING_WATCHED_STATE, 0 end -Route110_TrickHouseEntrance_EventScript_269BC1:: @ 8269BC1 - setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1 +Route110_TrickHouseEntrance_EventScript_SetNotBeingWatched1:: @ 8269BC1 + setvar VAR_TRICK_HOUSE_BEING_WATCHED_STATE, 1 end -Route110_TrickHouseEntrance_EventScript_269BC7:: @ 8269BC7 - setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1 +Route110_TrickHouseEntrance_EventScript_SetNotBeingWatched2:: @ 8269BC7 + setvar VAR_TRICK_HOUSE_BEING_WATCHED_STATE, 1 end -Route110_TrickHouseEntrance_EventScript_269BCD:: @ 8269BCD - setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1 +Route110_TrickHouseEntrance_EventScript_SetNotBeingWatched3:: @ 8269BCD + setvar VAR_TRICK_HOUSE_BEING_WATCHED_STATE, 1 end -Route110_TrickHouseEntrance_MapScript2_269BD3: @ 8269BD3 - map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1, Route110_TrickHouseEntrance_EventScript_269C15 - map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0, Route110_TrickHouseEntrance_EventScript_269C26 - map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 1, Route110_TrickHouseEntrance_EventScript_269CCC - map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 2, Route110_TrickHouseEntrance_EventScript_269CD0 - map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3, Route110_TrickHouseEntrance_EventScript_269CD0 - map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 4, Route110_TrickHouseEntrance_EventScript_269CCC - map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5, Route110_TrickHouseEntrance_EventScript_269CCC - map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 6, Route110_TrickHouseEntrance_EventScript_269CDF +Route110_TrickHouseEntrance_OnWarp: @ 8269BD3 + map_script_2 VAR_TRICK_HOUSE_FOUND_TRICK_MASTER, 1, Route110_TrickHouseEntrance_EventScript_TrickMasterFound + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE, 0, Route110_TrickHouseEntrance_EventScript_SetTrickMasterHidingSpot + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE, 1, Route110_TrickHouseEntrance_EventScript_RemoveTrickMaster + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE, 2, Route110_TrickHouseEntrance_EventScript_SetTrickMasterFacingDoor + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE, 3, Route110_TrickHouseEntrance_EventScript_SetTrickMasterFacingDoor + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE, 4, Route110_TrickHouseEntrance_EventScript_RemoveTrickMaster + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE, 5, Route110_TrickHouseEntrance_EventScript_RemoveTrickMaster + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE, 6, Route110_TrickHouseEntrance_EventScript_SetTrickMasterInFrontOfDoor .2byte 0 -Route110_TrickHouseEntrance_EventScript_269C15:: @ 8269C15 +Route110_TrickHouseEntrance_EventScript_TrickMasterFound:: @ 8269C15 addobject 1 showobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE turnobject 1, DIR_EAST turnobject EVENT_OBJ_ID_PLAYER, DIR_WEST end -Route110_TrickHouseEntrance_EventScript_269C26:: @ 8269C26 +Route110_TrickHouseEntrance_EventScript_SetTrickMasterHidingSpot:: @ 8269C26 addobject 1 hideobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE switch VAR_TRICK_HOUSE_LEVEL - case 0, Route110_TrickHouseEntrance_EventScript_269C8C - case 1, Route110_TrickHouseEntrance_EventScript_269C94 - case 2, Route110_TrickHouseEntrance_EventScript_269C9C - case 3, Route110_TrickHouseEntrance_EventScript_269CA4 - case 4, Route110_TrickHouseEntrance_EventScript_269CAC - case 5, Route110_TrickHouseEntrance_EventScript_269CB4 - case 6, Route110_TrickHouseEntrance_EventScript_269CBC - case 7, Route110_TrickHouseEntrance_EventScript_269CC4 + case 0, Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle1 + case 1, Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle2 + case 2, Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle3 + case 3, Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle4 + case 4, Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle5 + case 5, Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle6 + case 6, Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle7 + case 7, Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle8 end -Route110_TrickHouseEntrance_EventScript_269C8C:: @ 8269C8C +Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle1:: @ 8269C8C setobjectxy 1, 6, 3 end -Route110_TrickHouseEntrance_EventScript_269C94:: @ 8269C94 +Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle2:: @ 8269C94 setobjectxy 1, 11, 5 end -Route110_TrickHouseEntrance_EventScript_269C9C:: @ 8269C9C +Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle3:: @ 8269C9C setobjectxy 1, 9, 1 end -Route110_TrickHouseEntrance_EventScript_269CA4:: @ 8269CA4 +Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle4:: @ 8269CA4 setobjectxy 1, 3, 1 end -Route110_TrickHouseEntrance_EventScript_269CAC:: @ 8269CAC +Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle5:: @ 8269CAC setobjectxy 1, 0, 5 end -Route110_TrickHouseEntrance_EventScript_269CB4:: @ 8269CB4 +Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle6:: @ 8269CB4 setobjectxy 1, 11, 1 end -Route110_TrickHouseEntrance_EventScript_269CBC:: @ 8269CBC +Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle7:: @ 8269CBC setobjectxy 1, 8, 1 end -Route110_TrickHouseEntrance_EventScript_269CC4:: @ 8269CC4 +Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle8:: @ 8269CC4 setobjectxy 1, 4, 4 end -Route110_TrickHouseEntrance_EventScript_269CCC:: @ 8269CCC +Route110_TrickHouseEntrance_EventScript_RemoveTrickMaster:: @ 8269CCC removeobject 1 end -Route110_TrickHouseEntrance_EventScript_269CD0:: @ 8269CD0 +Route110_TrickHouseEntrance_EventScript_SetTrickMasterFacingDoor:: @ 8269CD0 addobject 1 setobjectxy 1, 5, 2 turnobject 1, DIR_NORTH end -Route110_TrickHouseEntrance_EventScript_269CDF:: @ 8269CDF +Route110_TrickHouseEntrance_EventScript_SetTrickMasterInFrontOfDoor:: @ 8269CDF addobject 1 setobjectxy 1, 5, 2 turnobject 1, DIR_SOUTH end -Route110_TrickHouseEntrance_MapScript2_269CEE: @ 8269CEE - map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1, Route110_TrickHouseEntrance_EventScript_269CF8 +Route110_TrickHouseEntrance_OnFrame: @ 8269CEE + map_script_2 VAR_TRICK_HOUSE_FOUND_TRICK_MASTER, 1, Route110_TrickHouseEntrance_EventScript_BeginChallenge .2byte 0 -Route110_TrickHouseEntrance_EventScript_269CF8:: @ 8269CF8 +Route110_TrickHouseEntrance_EventScript_BeginChallenge:: @ 8269CF8 lockall delay 20 compare VAR_TRICK_HOUSE_LEVEL, 0 - call_if_eq Route110_TrickHouseEntrance_EventScript_269E48 - msgbox Route110_TrickHouseEntrance_Text_26A78C, MSGBOX_DEFAULT + call_if_eq Route110_TrickHouseEntrance_EventScript_MeetTrickMaster + msgbox Route110_TrickHouseEntrance_Text_ComeToChallengeTrickHouse, MSGBOX_DEFAULT closemessage delay 20 - applymovement 1, Route110_TrickHouseEntrance_Movement_269E36 + applymovement 1, Route110_TrickHouse_Movement_TrickMasterSpin waitmovement 0 playse SE_W153 - applymovement 1, Route110_TrickHouseEntrance_Movement_269E3F + applymovement 1, Route110_TrickHouse_Movement_TrickMasterJumpAway waitmovement 0 removeobject 1 - setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 1 - setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 0 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1 + setvar VAR_TRICK_HOUSE_FOUND_TRICK_MASTER, 0 releaseall end -Route110_TrickHouseEntrance_EventScript_269D39:: @ 8269D39 +Route110_TrickHouseEntrance_EventScript_UnusedRelease:: @ 8269D39 releaseall end -Route110_TrickHouseEntrance_EventScript_269D3B:: @ 8269D3B +Route110_TrickHouseEntrance_EventScript_TrickMaster:: @ 8269D3B lockall - switch VAR_TRICK_HOUSE_ENTRANCE_STATE_3 - case 0, Route110_TrickHouseEntrance_EventScript_269D6E - case 2, Route110_TrickHouseEntrance_EventScript_269E8F - case 3, Route110_TrickHouseEntrance_EventScript_269E51 - case 6, Route110_TrickHouseEntrance_EventScript_26A039 + switch VAR_TRICK_HOUSE_ENTRANCE_STATE + case 0, Route110_TrickHouseEntrance_EventScript_FoundTrickMaster + case 2, Route110_TrickHouseEntrance_EventScript_GiveReward + case 3, Route110_TrickHouseEntrance_EventScript_StillMakingPuzzle + case 6, Route110_TrickHouseEntrance_EventScript_MechadollReward end -Route110_TrickHouseEntrance_EventScript_269D6E:: @ 8269D6E +Route110_TrickHouseEntrance_EventScript_FoundTrickMaster:: @ 8269D6E playse SE_PIN applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_ExclamationMark waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_Delay48 waitmovement 0 compare VAR_TRICK_HOUSE_LEVEL, 0 - call_if_eq Route110_TrickHouseEntrance_EventScript_269DEE + call_if_eq Route110_TrickHouseEntrance_EventScript_FoundBeneathDesk compare VAR_TRICK_HOUSE_LEVEL, 1 - call_if_eq Route110_TrickHouseEntrance_EventScript_269DF7 + call_if_eq Route110_TrickHouseEntrance_EventScript_FoundBehindTree compare VAR_TRICK_HOUSE_LEVEL, 2 - call_if_eq Route110_TrickHouseEntrance_EventScript_269E00 + call_if_eq Route110_TrickHouseEntrance_EventScript_FoundInDresser compare VAR_TRICK_HOUSE_LEVEL, 3 - call_if_eq Route110_TrickHouseEntrance_EventScript_269E09 + call_if_eq Route110_TrickHouseEntrance_EventScript_FoundBeyondWindow compare VAR_TRICK_HOUSE_LEVEL, 4 - call_if_eq Route110_TrickHouseEntrance_EventScript_269E12 + call_if_eq Route110_TrickHouseEntrance_EventScript_FoundInPlanter compare VAR_TRICK_HOUSE_LEVEL, 5 - call_if_eq Route110_TrickHouseEntrance_EventScript_269E1B + call_if_eq Route110_TrickHouseEntrance_EventScript_FoundInCupboard compare VAR_TRICK_HOUSE_LEVEL, 6 - call_if_eq Route110_TrickHouseEntrance_EventScript_269E24 + call_if_eq Route110_TrickHouseEntrance_EventScript_FoundBehindWindow compare VAR_TRICK_HOUSE_LEVEL, 7 - call_if_eq Route110_TrickHouseEntrance_EventScript_269E2D + call_if_eq Route110_TrickHouseEntrance_EventScript_FoundBeneathCushion closemessage - setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1 + setvar VAR_TRICK_HOUSE_FOUND_TRICK_MASTER, 1 warpsilent MAP_ROUTE110_TRICK_HOUSE_ENTRANCE, 255, 6, 2 waitstate releaseall end -Route110_TrickHouseEntrance_EventScript_269DEE:: @ 8269DEE - msgbox Route110_TrickHouseEntrance_Text_26A48A, MSGBOX_DEFAULT +Route110_TrickHouseEntrance_EventScript_FoundBeneathDesk:: @ 8269DEE + msgbox Route110_TrickHouseEntrance_Text_ConcealedBeneathDesk, MSGBOX_DEFAULT return -Route110_TrickHouseEntrance_EventScript_269DF7:: @ 8269DF7 - msgbox Route110_TrickHouseEntrance_Text_26A4DA, MSGBOX_DEFAULT +Route110_TrickHouseEntrance_EventScript_FoundBehindTree:: @ 8269DF7 + msgbox Route110_TrickHouseEntrance_Text_ConcealedBehindTree, MSGBOX_DEFAULT return -Route110_TrickHouseEntrance_EventScript_269E00:: @ 8269E00 - msgbox Route110_TrickHouseEntrance_Text_26A529, MSGBOX_DEFAULT +Route110_TrickHouseEntrance_EventScript_FoundInDresser:: @ 8269E00 + msgbox Route110_TrickHouseEntrance_Text_ConcealedInDresser, MSGBOX_DEFAULT return -Route110_TrickHouseEntrance_EventScript_269E09:: @ 8269E09 - msgbox Route110_TrickHouseEntrance_Text_26A577, MSGBOX_DEFAULT +Route110_TrickHouseEntrance_EventScript_FoundBeyondWindow:: @ 8269E09 + msgbox Route110_TrickHouseEntrance_Text_ConealedBeyondWindow, MSGBOX_DEFAULT return -Route110_TrickHouseEntrance_EventScript_269E12:: @ 8269E12 - msgbox Route110_TrickHouseEntrance_Text_26A5C8, MSGBOX_DEFAULT +Route110_TrickHouseEntrance_EventScript_FoundInPlanter:: @ 8269E12 + msgbox Route110_TrickHouseEntrance_Text_ConcealedInPlanter, MSGBOX_DEFAULT return -Route110_TrickHouseEntrance_EventScript_269E1B:: @ 8269E1B - msgbox Route110_TrickHouseEntrance_Text_26A616, MSGBOX_DEFAULT +Route110_TrickHouseEntrance_EventScript_FoundInCupboard:: @ 8269E1B + msgbox Route110_TrickHouseEntrance_Text_ConcealedInCupboard, MSGBOX_DEFAULT return -Route110_TrickHouseEntrance_EventScript_269E24:: @ 8269E24 - msgbox Route110_TrickHouseEntrance_Text_26A665, MSGBOX_DEFAULT +Route110_TrickHouseEntrance_EventScript_FoundBehindWindow:: @ 8269E24 + msgbox Route110_TrickHouseEntrance_Text_ConcealedBehindWindow, MSGBOX_DEFAULT return -Route110_TrickHouseEntrance_EventScript_269E2D:: @ 8269E2D - msgbox Route110_TrickHouseEntrance_Text_26A6B6, MSGBOX_DEFAULT +Route110_TrickHouseEntrance_EventScript_FoundBeneathCushion:: @ 8269E2D + msgbox Route110_TrickHouseEntrance_Text_ConcealedBeneathCushion, MSGBOX_DEFAULT return -Route110_TrickHouseEnd_Movement_269E36: @ 8269E36 -Route110_TrickHouseEntrance_Movement_269E36: @ 8269E36 +Route110_TrickHouse_Movement_TrickMasterSpin: @ 8269E36 face_up delay_4 face_left @@ -307,8 +315,7 @@ Route110_TrickHouseEntrance_Movement_269E36: @ 8269E36 delay_4 step_end -Route110_TrickHouseEnd_Movement_269E3F: @ 8269E3F -Route110_TrickHouseEntrance_Movement_269E3F: @ 8269E3F +Route110_TrickHouse_Movement_TrickMasterJumpAway: @ 8269E3F face_up disable_anim slide_up @@ -319,12 +326,12 @@ Route110_TrickHouseEntrance_Movement_269E3F: @ 8269E3F slide_up step_end -Route110_TrickHouseEntrance_EventScript_269E48:: @ 8269E48 - msgbox Route110_TrickHouseEntrance_Text_26A709, MSGBOX_DEFAULT +Route110_TrickHouseEntrance_EventScript_MeetTrickMaster:: @ 8269E48 + msgbox Route110_TrickHouseEntrance_Text_TheyCallMeTrickMaster, MSGBOX_DEFAULT return -Route110_TrickHouseEntrance_EventScript_269E51:: @ 8269E51 - msgbox Route110_TrickHouseEntrance_Text_26A921, MSGBOX_DEFAULT +Route110_TrickHouseEntrance_EventScript_StillMakingPuzzle:: @ 8269E51 + msgbox Route110_TrickHouseEntrance_Text_NextTimeUseThisTrick, MSGBOX_DEFAULT closemessage applymovement 1, Common_Movement_FacePlayer waitmovement 0 @@ -333,280 +340,280 @@ Route110_TrickHouseEntrance_EventScript_269E51:: @ 8269E51 waitmovement 0 applymovement 1, Common_Movement_Delay48 waitmovement 0 - msgbox Route110_TrickHouseEntrance_Text_26A9AF, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEntrance_Text_InMidstOfDevisingNewChallenges, MSGBOX_DEFAULT applymovement 1, Common_Movement_WalkInPlaceFastestUp waitmovement 0 releaseall end -Route110_TrickHouseEntrance_EventScript_269E8F:: @ 8269E8F +Route110_TrickHouseEntrance_EventScript_GiveReward:: @ 8269E8F applymovement 1, Common_Movement_FacePlayer waitmovement 0 - msgbox Route110_TrickHouseEntrance_Text_26AA82, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEntrance_Text_YoureHereToAcceptReward, MSGBOX_DEFAULT compare VAR_TRICK_HOUSE_LEVEL, 1 - goto_if_eq Route110_TrickHouseEntrance_EventScript_269EEF + goto_if_eq Route110_TrickHouseEntrance_EventScript_GivePuzzle1Reward compare VAR_TRICK_HOUSE_LEVEL, 2 - goto_if_eq Route110_TrickHouseEntrance_EventScript_269F1B + goto_if_eq Route110_TrickHouseEntrance_EventScript_GivePuzzle2Reward compare VAR_TRICK_HOUSE_LEVEL, 3 - goto_if_eq Route110_TrickHouseEntrance_EventScript_269F47 + goto_if_eq Route110_TrickHouseEntrance_EventScript_GivePuzzle3Reward compare VAR_TRICK_HOUSE_LEVEL, 4 - goto_if_eq Route110_TrickHouseEntrance_EventScript_269F73 + goto_if_eq Route110_TrickHouseEntrance_EventScript_GivePuzzle4Reward compare VAR_TRICK_HOUSE_LEVEL, 5 - goto_if_eq Route110_TrickHouseEntrance_EventScript_269F9F + goto_if_eq Route110_TrickHouseEntrance_EventScript_GivePuzzle5Reward compare VAR_TRICK_HOUSE_LEVEL, 6 - goto_if_eq Route110_TrickHouseEntrance_EventScript_269FCB + goto_if_eq Route110_TrickHouseEntrance_EventScript_GivePuzzle6Reward compare VAR_TRICK_HOUSE_LEVEL, 7 - goto_if_eq Route110_TrickHouseEntrance_EventScript_269FF7 + goto_if_eq Route110_TrickHouseEntrance_EventScript_GivePuzzle7Reward end -Route110_TrickHouseEntrance_EventScript_269EEF:: @ 8269EEF +Route110_TrickHouseEntrance_EventScript_GivePuzzle1Reward:: @ 8269EEF giveitem_std ITEM_RARE_CANDY - compare VAR_RESULT, 1 - goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 - compare VAR_RESULT, 0 + compare VAR_RESULT, TRUE + goto_if_eq Route110_TrickHouseEntrance_EventScript_GotReward + compare VAR_RESULT, FALSE call_if_eq Common_EventScript_BagIsFull - msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEntrance_Text_DidYouNotComeToClaimReward, MSGBOX_DEFAULT releaseall end -Route110_TrickHouseEntrance_EventScript_269F1B:: @ 8269F1B +Route110_TrickHouseEntrance_EventScript_GivePuzzle2Reward:: @ 8269F1B giveitem_std ITEM_TIMER_BALL - compare VAR_RESULT, 1 - goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 - compare VAR_RESULT, 0 + compare VAR_RESULT, TRUE + goto_if_eq Route110_TrickHouseEntrance_EventScript_GotReward + compare VAR_RESULT, FALSE call_if_eq Common_EventScript_BagIsFull - msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEntrance_Text_DidYouNotComeToClaimReward, MSGBOX_DEFAULT releaseall end -Route110_TrickHouseEntrance_EventScript_269F47:: @ 8269F47 +Route110_TrickHouseEntrance_EventScript_GivePuzzle3Reward:: @ 8269F47 giveitem_std ITEM_HARD_STONE - compare VAR_RESULT, 1 - goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 - compare VAR_RESULT, 0 + compare VAR_RESULT, TRUE + goto_if_eq Route110_TrickHouseEntrance_EventScript_GotReward + compare VAR_RESULT, FALSE call_if_eq Common_EventScript_BagIsFull - msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEntrance_Text_DidYouNotComeToClaimReward, MSGBOX_DEFAULT releaseall end -Route110_TrickHouseEntrance_EventScript_269F73:: @ 8269F73 +Route110_TrickHouseEntrance_EventScript_GivePuzzle4Reward:: @ 8269F73 giveitem_std ITEM_SMOKE_BALL - compare VAR_RESULT, 1 - goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 - compare VAR_RESULT, 0 + compare VAR_RESULT, TRUE + goto_if_eq Route110_TrickHouseEntrance_EventScript_GotReward + compare VAR_RESULT, FALSE call_if_eq Common_EventScript_BagIsFull - msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEntrance_Text_DidYouNotComeToClaimReward, MSGBOX_DEFAULT releaseall end -Route110_TrickHouseEntrance_EventScript_269F9F:: @ 8269F9F +Route110_TrickHouseEntrance_EventScript_GivePuzzle5Reward:: @ 8269F9F giveitem_std ITEM_TM12 - compare VAR_RESULT, 1 - goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 - compare VAR_RESULT, 0 + compare VAR_RESULT, TRUE + goto_if_eq Route110_TrickHouseEntrance_EventScript_GotReward + compare VAR_RESULT, FALSE call_if_eq Common_EventScript_BagIsFull - msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEntrance_Text_DidYouNotComeToClaimReward, MSGBOX_DEFAULT releaseall end -Route110_TrickHouseEntrance_EventScript_269FCB:: @ 8269FCB +Route110_TrickHouseEntrance_EventScript_GivePuzzle6Reward:: @ 8269FCB giveitem_std ITEM_MAGNET - compare VAR_RESULT, 1 - goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 - compare VAR_RESULT, 0 + compare VAR_RESULT, TRUE + goto_if_eq Route110_TrickHouseEntrance_EventScript_GotReward + compare VAR_RESULT, FALSE call_if_eq Common_EventScript_BagIsFull - msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEntrance_Text_DidYouNotComeToClaimReward, MSGBOX_DEFAULT releaseall end -Route110_TrickHouseEntrance_EventScript_269FF7:: @ 8269FF7 +Route110_TrickHouseEntrance_EventScript_GivePuzzle7Reward:: @ 8269FF7 giveitem_std ITEM_PP_MAX - compare VAR_RESULT, 1 - goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 - compare VAR_RESULT, 0 + compare VAR_RESULT, TRUE + goto_if_eq Route110_TrickHouseEntrance_EventScript_GotReward + compare VAR_RESULT, FALSE call_if_eq Common_EventScript_BagIsFull - msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEntrance_Text_DidYouNotComeToClaimReward, MSGBOX_DEFAULT releaseall end -Route110_TrickHouseEntrance_EventScript_26A023:: @ 826A023 +Route110_TrickHouseEntrance_EventScript_GotReward:: @ 826A023 setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 - setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 3 applymovement 1, Common_Movement_WalkInPlaceFastestUp waitmovement 0 releaseall end -Route110_TrickHouseEntrance_EventScript_26A039:: @ 826A039 +Route110_TrickHouseEntrance_EventScript_MechadollReward:: @ 826A039 applymovement 1, Common_Movement_FacePlayer waitmovement 0 - msgbox Route110_TrickHouseEntrance_Text_26AB2C, MSGBOX_DEFAULT - call Route110_TrickHouseEntrance_EventScript_26A070 - compare VAR_RESULT, 1 - goto_if_eq Route110_TrickHouseEntrance_EventScript_26A09A - compare VAR_RESULT, 0 + msgbox Route110_TrickHouseEntrance_Text_MechadollWhichTent, MSGBOX_DEFAULT + call Route110_TrickHouseEntrance_EventScript_ChooseTent + compare VAR_RESULT, TRUE + goto_if_eq Route110_TrickHouseEntrance_EventScript_ReceivedTent + compare VAR_RESULT, FALSE call_if_eq Common_EventScript_NoRoomLeftForAnother - msgbox Route110_TrickHouseEntrance_Text_26ABBD, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEntrance_Text_PCFullAgain, MSGBOX_DEFAULT releaseall end -Route110_TrickHouseEntrance_EventScript_26A070:: @ 826A070 +Route110_TrickHouseEntrance_EventScript_ChooseTent:: @ 826A070 multichoice 0, 0, MULTI_TENT, 1 switch VAR_RESULT - case 0, Route110_TrickHouseEntrance_EventScript_26A08A - goto Route110_TrickHouseEntrance_EventScript_26A092 + case 0, Route110_TrickHouseEntrance_EventScript_GiveRedTent + goto Route110_TrickHouseEntrance_EventScript_GiveBlueTent -Route110_TrickHouseEntrance_EventScript_26A08A:: @ 826A08A +Route110_TrickHouseEntrance_EventScript_GiveRedTent:: @ 826A08A givedecoration_std DECOR_RED_TENT return -Route110_TrickHouseEntrance_EventScript_26A092:: @ 826A092 +Route110_TrickHouseEntrance_EventScript_GiveBlueTent:: @ 826A092 givedecoration_std DECOR_BLUE_TENT return -Route110_TrickHouseEntrance_EventScript_26A09A:: @ 826A09A - msgbox Route110_TrickHouseEntrance_Text_26ABAE, MSGBOX_DEFAULT +Route110_TrickHouseEntrance_EventScript_ReceivedTent:: @ 826A09A + msgbox Route110_TrickHouseEntrance_Text_ThenFarewell, MSGBOX_DEFAULT closemessage - applymovement 1, Route110_TrickHouseEntrance_Movement_26D632 + applymovement 1, Route110_TrickHousePuzzle5_Movement_MechadollShake waitmovement 0 - applymovement 1, Route110_TrickHouseEntrance_Movement_269E36 + applymovement 1, Route110_TrickHouse_Movement_TrickMasterSpin waitmovement 0 playse SE_W153 - applymovement 1, Route110_TrickHouseEntrance_Movement_269E3F + applymovement 1, Route110_TrickHouse_Movement_TrickMasterJumpAway waitmovement 0 removeobject 1 setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 - setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 5 releaseall end -Route110_TrickHouseEntrance_EventScript_26A0D3:: @ 826A0D3 +Route110_TrickHouseEntrance_EventScript_Door:: @ 826A0D3 lockall - switch VAR_TRICK_HOUSE_ENTRANCE_STATE_3 - case 0, Route110_TrickHouseEntrance_EventScript_26A106 - case 1, Route110_TrickHouseEntrance_EventScript_26A110 - case 4, Route110_TrickHouseEntrance_EventScript_26A201 - case 5, Route110_TrickHouseEntrance_EventScript_26A20B + switch VAR_TRICK_HOUSE_ENTRANCE_STATE + case 0, Route110_TrickHouseEntrance_EventScript_ItsAScroll + case 1, Route110_TrickHouseEntrance_EventScript_GoInHolePrompt + case 4, Route110_TrickHouseEntrance_EventScript_LeftOnJourneyNote + case 5, Route110_TrickHouseEntrance_EventScript_CheckLevelForMessage end -Route110_TrickHouseEntrance_EventScript_26A106:: @ 826A106 - msgbox Route110_TrickHouseEntrance_Text_26A878, MSGBOX_DEFAULT +Route110_TrickHouseEntrance_EventScript_ItsAScroll:: @ 826A106 + msgbox Route110_TrickHouseEntrance_Text_ItsAScroll, MSGBOX_DEFAULT releaseall end -Route110_TrickHouseEntrance_EventScript_26A110:: @ 826A110 - msgbox Route110_TrickHouseEntrance_Text_26A887, MSGBOX_YESNO +Route110_TrickHouseEntrance_EventScript_GoInHolePrompt:: @ 826A110 + msgbox Route110_TrickHouseEntrance_Text_GoInHoleBehindScroll, MSGBOX_YESNO closemessage compare VAR_RESULT, YES - goto_if_eq Route110_TrickHouseEntrance_EventScript_26A126 + goto_if_eq Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom releaseall end -Route110_TrickHouseEntrance_EventScript_26A126:: @ 826A126 +Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom:: @ 826A126 setmetatile 5, 1, METATILE_GenericBuilding_TrickHouse_Stairs_Down, 0 special DrawWholeMapView delay 20 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkUp waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEntrance_Movement_26A1A7 + applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEntrance_Movement_EnterRoom waitmovement 0 switch VAR_TRICK_HOUSE_LEVEL - case 0, Route110_TrickHouseEntrance_EventScript_26A1A9 - case 1, Route110_TrickHouseEntrance_EventScript_26A1B4 - case 2, Route110_TrickHouseEntrance_EventScript_26A1BF - case 3, Route110_TrickHouseEntrance_EventScript_26A1CA - case 4, Route110_TrickHouseEntrance_EventScript_26A1D5 - case 5, Route110_TrickHouseEntrance_EventScript_26A1E0 - case 6, Route110_TrickHouseEntrance_EventScript_26A1EB - case 7, Route110_TrickHouseEntrance_EventScript_26A1F6 + case 0, Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom1 + case 1, Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom2 + case 2, Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom3 + case 3, Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom4 + case 4, Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom5 + case 5, Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom6 + case 6, Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom7 + case 7, Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom8 end -Route110_TrickHouseEntrance_Movement_26A1A7: @ 826A1A7 +Route110_TrickHouseEntrance_Movement_EnterRoom: @ 826A1A7 set_invisible step_end -Route110_TrickHouseEntrance_EventScript_26A1A9:: @ 826A1A9 +Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom1:: @ 826A1A9 warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE1, 255, 0, 21 waitstate releaseall end -Route110_TrickHouseEntrance_EventScript_26A1B4:: @ 826A1B4 +Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom2:: @ 826A1B4 warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE2, 255, 0, 21 waitstate releaseall end -Route110_TrickHouseEntrance_EventScript_26A1BF:: @ 826A1BF +Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom3:: @ 826A1BF warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE3, 255, 0, 21 waitstate releaseall end -Route110_TrickHouseEntrance_EventScript_26A1CA:: @ 826A1CA +Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom4:: @ 826A1CA warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE4, 255, 0, 21 waitstate releaseall end -Route110_TrickHouseEntrance_EventScript_26A1D5:: @ 826A1D5 +Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom5:: @ 826A1D5 warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE5, 255, 0, 21 waitstate releaseall end -Route110_TrickHouseEntrance_EventScript_26A1E0:: @ 826A1E0 +Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom6:: @ 826A1E0 warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE6, 255, 0, 21 waitstate releaseall end -Route110_TrickHouseEntrance_EventScript_26A1EB:: @ 826A1EB +Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom7:: @ 826A1EB warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE7, 255, 0, 21 waitstate releaseall end -Route110_TrickHouseEntrance_EventScript_26A1F6:: @ 826A1F6 +Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom8:: @ 826A1F6 warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE8, 255, 0, 21 waitstate releaseall end -Route110_TrickHouseEntrance_EventScript_26A201:: @ 826A201 - msgbox Route110_TrickHouseEntrance_Text_26A8BD, MSGBOX_DEFAULT +Route110_TrickHouseEntrance_EventScript_LeftOnJourneyNote:: @ 826A201 + msgbox Route110_TrickHouseEntrance_Text_LeavingOnJourneyNote, MSGBOX_DEFAULT releaseall end -Route110_TrickHouseEntrance_EventScript_26A20B:: @ 826A20B +Route110_TrickHouseEntrance_EventScript_CheckLevelForMessage:: @ 826A20B compare VAR_TRICK_HOUSE_LEVEL, 8 - goto_if_eq Route110_TrickHouseEntrance_EventScript_26A220 - msgbox Route110_TrickHouseEntrance_Text_26A878, MSGBOX_DEFAULT + goto_if_eq Route110_TrickHouseEntrance_EventScript_LeftOnJourneyNote2 + msgbox Route110_TrickHouseEntrance_Text_ItsAScroll, MSGBOX_DEFAULT releaseall end -Route110_TrickHouseEntrance_EventScript_26A220:: @ 826A220 - msgbox Route110_TrickHouseEntrance_Text_26A8BD, MSGBOX_DEFAULT +Route110_TrickHouseEntrance_EventScript_LeftOnJourneyNote2:: @ 826A220 + msgbox Route110_TrickHouseEntrance_Text_LeavingOnJourneyNote, MSGBOX_DEFAULT releaseall end -Route110_TrickHouseEntrance_EventScript_26A22A:: @ 826A22A +Route110_TrickHousePuzzle_EventScript_Door:: @ 826A22A lockall switch VAR_TRICK_HOUSE_LEVEL - case 0, Route110_TrickHouseEntrance_EventScript_26A289 - case 1, Route110_TrickHouseEntrance_EventScript_26A2B2 - case 2, Route110_TrickHouseEntrance_EventScript_26A2DB - case 3, Route110_TrickHouseEntrance_EventScript_26A304 - case 4, Route110_TrickHouseEntrance_EventScript_26A32D - case 5, Route110_TrickHouseEntrance_EventScript_26A356 - case 6, Route110_TrickHouseEntrance_EventScript_26A37F - case 7, Route110_TrickHouseEntrance_EventScript_26A3A8 + case 0, Route110_TrickHousePuzzle1_EventScript_Door + case 1, Route110_TrickHousePuzzle2_EventScript_Door + case 2, Route110_TrickHousePuzzle3_EventScript_Door + case 3, Route110_TrickHousePuzzle4_EventScript_Door + case 4, Route110_TrickHousePuzzle5_EventScript_Door + case 5, Route110_TrickHousePuzzle6_EventScript_Door + case 6, Route110_TrickHousePuzzle7_EventScript_Door + case 7, Route110_TrickHousePuzzle8_EventScript_Door end -Route110_TrickHouseEntrance_EventScript_26A289:: @ 826A289 +Route110_TrickHousePuzzle1_EventScript_Door:: @ 826A289 compare VAR_TRICK_HOUSE_PUZZLE_1_STATE, 0 - goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1 - msgbox Route110_TrickHousePuzzle1_Text_26B98D, MSGBOX_DEFAULT + goto_if_eq Route110_TrickHousePuzzle_EventScript_DoorLocked + msgbox Route110_TrickHousePuzzle1_Text_WroteSecretCodeLockOpened, MSGBOX_DEFAULT playse SE_PIN setvar VAR_TRICK_HOUSE_PUZZLE_1_STATE, 2 setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0 @@ -614,10 +621,10 @@ Route110_TrickHouseEntrance_EventScript_26A289:: @ 826A289 releaseall end -Route110_TrickHouseEntrance_EventScript_26A2B2:: @ 826A2B2 +Route110_TrickHousePuzzle2_EventScript_Door:: @ 826A2B2 compare VAR_TRICK_HOUSE_PUZZLE_2_STATE, 0 - goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1 - msgbox Route110_TrickHousePuzzle2_Text_26BCBA, MSGBOX_DEFAULT + goto_if_eq Route110_TrickHousePuzzle_EventScript_DoorLocked + msgbox Route110_TrickHousePuzzle2_Text_WroteSecretCodeLockOpened, MSGBOX_DEFAULT playse SE_PIN setvar VAR_TRICK_HOUSE_PUZZLE_2_STATE, 2 setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0 @@ -625,10 +632,10 @@ Route110_TrickHouseEntrance_EventScript_26A2B2:: @ 826A2B2 releaseall end -Route110_TrickHouseEntrance_EventScript_26A2DB:: @ 826A2DB +Route110_TrickHousePuzzle3_EventScript_Door:: @ 826A2DB compare VAR_TRICK_HOUSE_PUZZLE_3_STATE, 0 - goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1 - msgbox Route110_TrickHousePuzzle3_Text_26C609, MSGBOX_DEFAULT + goto_if_eq Route110_TrickHousePuzzle_EventScript_DoorLocked + msgbox Route110_TrickHousePuzzle3_Text_WroteSecretCodeLockOpened, MSGBOX_DEFAULT playse SE_PIN setvar VAR_TRICK_HOUSE_PUZZLE_3_STATE, 2 setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0 @@ -636,10 +643,10 @@ Route110_TrickHouseEntrance_EventScript_26A2DB:: @ 826A2DB releaseall end -Route110_TrickHouseEntrance_EventScript_26A304:: @ 826A304 +Route110_TrickHousePuzzle4_EventScript_Door:: @ 826A304 compare VAR_TRICK_HOUSE_PUZZLE_4_STATE, 0 - goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1 - msgbox Route110_TrickHousePuzzle4_Text_26C8C3, MSGBOX_DEFAULT + goto_if_eq Route110_TrickHousePuzzle_EventScript_DoorLocked + msgbox Route110_TrickHousePuzzle4_Text_WroteSecretCodeLockOpened, MSGBOX_DEFAULT playse SE_PIN setvar VAR_TRICK_HOUSE_PUZZLE_4_STATE, 2 setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0 @@ -647,10 +654,10 @@ Route110_TrickHouseEntrance_EventScript_26A304:: @ 826A304 releaseall end -Route110_TrickHouseEntrance_EventScript_26A32D:: @ 826A32D +Route110_TrickHousePuzzle5_EventScript_Door:: @ 826A32D compare VAR_TRICK_HOUSE_PUZZLE_5_STATE, 0 - goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1 - msgbox Route110_TrickHousePuzzle5_Text_26D660, MSGBOX_DEFAULT + goto_if_eq Route110_TrickHousePuzzle_EventScript_DoorLocked + msgbox Route110_TrickHousePuzzle5_Text_WroteSecretCodeLockOpened, MSGBOX_DEFAULT playse SE_PIN setvar VAR_TRICK_HOUSE_PUZZLE_5_STATE, 2 setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0 @@ -658,10 +665,10 @@ Route110_TrickHouseEntrance_EventScript_26A32D:: @ 826A32D releaseall end -Route110_TrickHouseEntrance_EventScript_26A356:: @ 826A356 +Route110_TrickHousePuzzle6_EventScript_Door:: @ 826A356 compare VAR_TRICK_HOUSE_PUZZLE_6_STATE, 0 - goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1 - msgbox Route110_TrickHousePuzzle6_Text_26DE26, MSGBOX_DEFAULT + goto_if_eq Route110_TrickHousePuzzle_EventScript_DoorLocked + msgbox Route110_TrickHousePuzzle6_Text_WroteSecretCodeLockOpened, MSGBOX_DEFAULT playse SE_PIN setvar VAR_TRICK_HOUSE_PUZZLE_6_STATE, 2 setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0 @@ -669,10 +676,10 @@ Route110_TrickHouseEntrance_EventScript_26A356:: @ 826A356 releaseall end -Route110_TrickHouseEntrance_EventScript_26A37F:: @ 826A37F +Route110_TrickHousePuzzle7_EventScript_Door:: @ 826A37F compare VAR_TRICK_HOUSE_PUZZLE_7_STATE, 0 - goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1 - msgbox Route110_TrickHousePuzzle7_EventScript_26E413, MSGBOX_DEFAULT + goto_if_eq Route110_TrickHousePuzzle_EventScript_DoorLocked + msgbox Route110_TrickHousePuzzle7_EventScript_WroteSecretCodeLockOpened, MSGBOX_DEFAULT playse SE_PIN setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE, 2 setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0 @@ -680,10 +687,10 @@ Route110_TrickHouseEntrance_EventScript_26A37F:: @ 826A37F releaseall end -Route110_TrickHouseEntrance_EventScript_26A3A8:: @ 826A3A8 +Route110_TrickHousePuzzle8_EventScript_Door:: @ 826A3A8 compare VAR_TRICK_HOUSE_PUZZLE_8_STATE, 0 - goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1 - msgbox Route110_TrickHousePuzzle8_EventScript_26E864, MSGBOX_DEFAULT + goto_if_eq Route110_TrickHousePuzzle_EventScript_DoorLocked + msgbox Route110_TrickHousePuzzle8_EventScript_WroteSecretCodeLockOpened, MSGBOX_DEFAULT playse SE_PIN setvar VAR_TRICK_HOUSE_PUZZLE_8_STATE, 2 setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0 @@ -691,70 +698,56 @@ Route110_TrickHouseEntrance_EventScript_26A3A8:: @ 826A3A8 releaseall end -Route110_TrickHouseEntrance_EventScript_26A3D1:: @ 826A3D1 - msgbox Route110_TrickHouseEntrance_Text_26AC4F, MSGBOX_DEFAULT +Route110_TrickHousePuzzle_EventScript_DoorLocked:: @ 826A3D1 + msgbox Route110_TrickHouseEntrance_Text_DoorLockedWriteSecretCodeHere, MSGBOX_DEFAULT releaseall end -Route110_TrickHousePuzzle1_EventScript_26A3DB:: @ 826A3DB -Route110_TrickHousePuzzle2_EventScript_26A3DB:: @ 826A3DB -Route110_TrickHousePuzzle3_EventScript_26A3DB:: @ 826A3DB -Route110_TrickHousePuzzle4_EventScript_26A3DB:: @ 826A3DB -Route110_TrickHousePuzzle5_EventScript_26A3DB:: @ 826A3DB -Route110_TrickHousePuzzle6_EventScript_26A3DB:: @ 826A3DB -Route110_TrickHousePuzzle7_EventScript_26A3DB:: @ 826A3DB -Route110_TrickHousePuzzle8_EventScript_26A3DB:: @ 826A3DB - msgbox Route110_TrickHousePuzzle1_Text_26AC2F, MSGBOX_DEFAULT +Route110_TrickHousePuzzle_EventScript_ReadScrollAgain:: @ 826A3DB + msgbox Route110_TrickHousePuzzle_Text_SecretCodeWrittenOnIt, MSGBOX_DEFAULT releaseall end -Route110_TrickHousePuzzle1_EventScript_26A3E5:: @ 826A3E5 -Route110_TrickHousePuzzle2_EventScript_26A3E5:: @ 826A3E5 -Route110_TrickHousePuzzle3_EventScript_26A3E5:: @ 826A3E5 -Route110_TrickHousePuzzle4_EventScript_26A3E5:: @ 826A3E5 -Route110_TrickHousePuzzle5_EventScript_26A3E5:: @ 826A3E5 -Route110_TrickHousePuzzle6_EventScript_26A3E5:: @ 826A3E5 -Route110_TrickHousePuzzle7_EventScript_26A3E5:: @ 826A3E5 -Route110_TrickHousePuzzle8_EventScript_26A3E5:: @ 826A3E5 +Route110_TrickHousePuzzle_EventScript_FoundScroll:: @ 826A3E5 playfanfare MUS_FANFA4 - message Route110_TrickHousePuzzle1_Text_26ABE8 + message Route110_TrickHousePuzzle_Text_FoundAScroll waitfanfare - msgbox Route110_TrickHousePuzzle1_Text_26ABFB, MSGBOX_DEFAULT + msgbox Route110_TrickHousePuzzle_Text_MemorizedSecretCode, MSGBOX_DEFAULT releaseall end -Route110_TrickHouseEntrance_EventScript_26A3F8:: @ 826A3F8 +Route110_TrickHouseEntrance_EventScript_TrickMasterHiding:: @ 826A3F8 lockall - msgbox Route110_TrickHouseEntrance_Text_26A474, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEntrance_Text_YoureBeingWatched, MSGBOX_DEFAULT releaseall compare VAR_TRICK_HOUSE_LEVEL, 0 - call_if_eq Route110_TrickHouseEntrance_EventScript_26A429 + call_if_eq Route110_TrickHouseEntrance_EventScript_DoHidingSpotSparkle1 compare VAR_TRICK_HOUSE_LEVEL, 1 - call_if_eq Route110_TrickHouseEntrance_EventScript_26A439 + call_if_eq Route110_TrickHouseEntrance_EventScript_DoHidingSpotSparkle2 compare VAR_TRICK_HOUSE_LEVEL, 2 - call_if_eq Route110_TrickHouseEntrance_EventScript_26A449 - setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1 + call_if_eq Route110_TrickHouseEntrance_EventScript_DoHidingSpotSparkle3 + setvar VAR_TRICK_HOUSE_BEING_WATCHED_STATE, 1 end -Route110_TrickHouseEntrance_EventScript_26A429:: @ 826A429 - setvar VAR_0x8004, 6 - setvar VAR_0x8005, 3 - call Route110_TrickHouseEntrance_EventScript_26A459 +Route110_TrickHouseEntrance_EventScript_DoHidingSpotSparkle1:: @ 826A429 + setvar VAR_0x8004, 6 @ x + setvar VAR_0x8005, 3 @ y + call Route110_TrickHouseEntrance_EventScript_DoHidingSpotSparkle return -Route110_TrickHouseEntrance_EventScript_26A439:: @ 826A439 - setvar VAR_0x8004, 11 - setvar VAR_0x8005, 5 - call Route110_TrickHouseEntrance_EventScript_26A459 +Route110_TrickHouseEntrance_EventScript_DoHidingSpotSparkle2:: @ 826A439 + setvar VAR_0x8004, 11 @ x + setvar VAR_0x8005, 5 @ y + call Route110_TrickHouseEntrance_EventScript_DoHidingSpotSparkle return -Route110_TrickHouseEntrance_EventScript_26A449:: @ 826A449 - setvar VAR_0x8004, 9 - setvar VAR_0x8005, 2 - call Route110_TrickHouseEntrance_EventScript_26A459 +Route110_TrickHouseEntrance_EventScript_DoHidingSpotSparkle3:: @ 826A449 + setvar VAR_0x8004, 9 @ x + setvar VAR_0x8005, 2 @ y + call Route110_TrickHouseEntrance_EventScript_DoHidingSpotSparkle return -Route110_TrickHouseEntrance_EventScript_26A459:: @ 826A459 +Route110_TrickHouseEntrance_EventScript_DoHidingSpotSparkle:: @ 826A459 setvar VAR_0x8006, 0 setfieldeffectargument 0, VAR_0x8004 setfieldeffectargument 1, VAR_0x8005 @@ -764,50 +757,50 @@ Route110_TrickHouseEntrance_EventScript_26A459:: @ 826A459 delay 10 return -Route110_TrickHouseEntrance_Text_26A474: @ 826A474 +Route110_TrickHouseEntrance_Text_YoureBeingWatched: @ 826A474 .string "You're being watched…$" -Route110_TrickHouseEntrance_Text_26A48A: @ 826A48A +Route110_TrickHouseEntrance_Text_ConcealedBeneathDesk: @ 826A48A .string "Hah? Grrr…\p" .string "How did you know I concealed myself\n" .string "beneath this desk? You're sharp!$" -Route110_TrickHouseEntrance_Text_26A4DA: @ 826A4DA +Route110_TrickHouseEntrance_Text_ConcealedBehindTree: @ 826A4DA .string "Hah? Grrr…\p" .string "How did you know I concealed myself\n" .string "behind this tree? You're sharp!$" -Route110_TrickHouseEntrance_Text_26A529: @ 826A529 +Route110_TrickHouseEntrance_Text_ConcealedInDresser: @ 826A529 .string "Hah? Grrr…\p" .string "How did you know I concealed myself\n" .string "in this dresser? You're sharp!$" -Route110_TrickHouseEntrance_Text_26A577: @ 826A577 +Route110_TrickHouseEntrance_Text_ConealedBeyondWindow: @ 826A577 .string "Hah? Grrr…\p" .string "How did you know I concealed myself\n" .string "beyond this window? You're sharp!$" -Route110_TrickHouseEntrance_Text_26A5C8: @ 826A5C8 +Route110_TrickHouseEntrance_Text_ConcealedInPlanter: @ 826A5C8 .string "Hah? Grrr…\p" .string "How did you know I concealed myself\n" .string "in this planter? You're sharp!$" -Route110_TrickHouseEntrance_Text_26A616: @ 826A616 +Route110_TrickHouseEntrance_Text_ConcealedInCupboard: @ 826A616 .string "Hah? Grrr…\p" .string "How did you know I concealed myself\n" .string "in this cupboard? You're sharp!$" -Route110_TrickHouseEntrance_Text_26A665: @ 826A665 +Route110_TrickHouseEntrance_Text_ConcealedBehindWindow: @ 826A665 .string "Hah? Grrr…\p" .string "How did you know I concealed myself\n" .string "behind this window? You're sharp!$" -Route110_TrickHouseEntrance_Text_26A6B6: @ 826A6B6 +Route110_TrickHouseEntrance_Text_ConcealedBeneathCushion: @ 826A6B6 .string "Hah? Grrr…\p" .string "How did you know I concealed myself\n" .string "beneath this cushion? You're sharp!$" -Route110_TrickHouseEntrance_Text_26A709: @ 826A709 +Route110_TrickHouseEntrance_Text_TheyCallMeTrickMaster: @ 826A709 .string "Behold!\p" .string "For I am the greatest living mystery\n" .string "of a man in all of HOENN!\l" @@ -815,7 +808,7 @@ Route110_TrickHouseEntrance_Text_26A709: @ 826A709 .string "The TRICK MASTER!\n" .string "Wahahaha! Glad to meet you!$" -Route110_TrickHouseEntrance_Text_26A78C: @ 826A78C +Route110_TrickHouseEntrance_Text_ComeToChallengeTrickHouse: @ 826A78C .string "You, you've come to challenge\n" .string "my TRICK HOUSE, haven't you?\p" .string "That's why you're here, isn't it?\n" @@ -825,25 +818,25 @@ Route110_TrickHouseEntrance_Text_26A78C: @ 826A78C .string "and let your challenge commence!\p" .string "I shall be waiting in the back!$" -Route110_TrickHouseEntrance_Text_26A878: @ 826A878 +Route110_TrickHouseEntrance_Text_ItsAScroll: @ 826A878 .string "It's a scroll.$" -Route110_TrickHouseEntrance_Text_26A887: @ 826A887 +Route110_TrickHouseEntrance_Text_GoInHoleBehindScroll: @ 826A887 .string "There is a big hole behind the scroll!\p" .string "Want to go in?$" -Route110_TrickHouseEntrance_Text_26A8BD: @ 826A8BD +Route110_TrickHouseEntrance_Text_LeavingOnJourneyNote: @ 826A8BD .string "There is a note affixed to the scroll…\p" .string "“I am leaving on a journey.\n" .string "Don't look for me. TRICK MASTER”$" -Route110_TrickHouseEntrance_Text_26A921: @ 826A921 +Route110_TrickHouseEntrance_Text_NextTimeUseThisTrick: @ 826A921 .string "For the next time, I'll use this trick,\n" .string "and that scheme, and those ruses…\p" .string "Mufufufu… If I may say so, it's\n" .string "brilliantly difficult, even for me!$" -Route110_TrickHouseEntrance_Text_26A9AF: @ 826A9AF +Route110_TrickHouseEntrance_Text_InMidstOfDevisingNewChallenges: @ 826A9AF .string "Hah? What?!\n" .string "Oh, it's you!\p" .string "I'm in the midst of devising new tricky\n" @@ -853,42 +846,42 @@ Route110_TrickHouseEntrance_Text_26A9AF: @ 826A9AF .string "You wouldn't begrudge me that?\l" .string "Come back in a little while!$" -Route110_TrickHouseEntrance_Text_26AA82: @ 826AA82 +Route110_TrickHouseEntrance_Text_YoureHereToAcceptReward: @ 826AA82 .string "Ah, it's you! You're here to accept the\n" .string "reward from before, isn't that right?\l" .string "Yes, right I am!\p" .string "Here!\n" .string "I'll give it to you now!$" -Route110_TrickHouseEntrance_Text_26AB00: @ 826AB00 +Route110_TrickHouseEntrance_Text_DidYouNotComeToClaimReward: @ 826AB00 .string "Hah?\n" .string "Did you not come to claim your reward?$" -Route110_TrickHouseEntrance_Text_26AB2C: @ 826AB2C +Route110_TrickHouseEntrance_Text_MechadollWhichTent: @ 826AB2C .string "MECHADOLL 5 I AM!\n" .string "IF REWARD IS NOT TAKEN BY YOU,\l" .string "THEN TRICK MASTER YOU CANNOT FOLLOW.\p" .string "RED TENT OR BLUE TENT,\n" .string "WHICH DO YOU PREFER?$" -Route110_TrickHouseEntrance_Text_26ABAE: @ 826ABAE +Route110_TrickHouseEntrance_Text_ThenFarewell: @ 826ABAE .string "THEN FAREWELL.$" -Route110_TrickHouseEntrance_Text_26ABBD: @ 826ABBD +Route110_TrickHouseEntrance_Text_PCFullAgain: @ 826ABBD .string "YOUR PC STATUS: FULL AGAIN.\n" .string "MEAN, YOU ARE.$" -Route110_TrickHousePuzzle1_Text_26ABE8: @ 826ABE8 +Route110_TrickHousePuzzle_Text_FoundAScroll: @ 826ABE8 .string "{PLAYER} found a scroll.$" -Route110_TrickHousePuzzle1_Text_26ABFB: @ 826ABFB +Route110_TrickHousePuzzle_Text_MemorizedSecretCode: @ 826ABFB .string "{PLAYER} memorized the secret code\n" .string "written on the scroll.$" -Route110_TrickHousePuzzle1_Text_26AC2F: @ 826AC2F +Route110_TrickHousePuzzle_Text_SecretCodeWrittenOnIt: @ 826AC2F .string "A secret code is written on it.$" -Route110_TrickHouseEntrance_Text_26AC4F: @ 826AC4F +Route110_TrickHouseEntrance_Text_DoorLockedWriteSecretCodeHere: @ 826AC4F .string "The door is locked.\p" .string "…On closer inspection, this is written\n" .string "on it: “Write the secret code here.”$" diff --git a/data/maps/Route110_TrickHousePuzzle1/map.json b/data/maps/Route110_TrickHousePuzzle1/map.json index 18dc10027..f656b0a48 100644 --- a/data/maps/Route110_TrickHousePuzzle1/map.json +++ b/data/maps/Route110_TrickHousePuzzle1/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "6", - "script": "Route110_TrickHousePuzzle1_EventScript_26B948", + "script": "Route110_TrickHousePuzzle1_EventScript_Sally", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route110_TrickHousePuzzle1_EventScript_26B95F", + "script": "Route110_TrickHousePuzzle1_EventScript_Eddie", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route110_TrickHousePuzzle1_EventScript_26B976", + "script": "Route110_TrickHousePuzzle1_EventScript_Robin", "flag": "0" }, { @@ -241,7 +241,7 @@ "y": 16, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route110_TrickHousePuzzle1_EventScript_26B92B" + "script": "Route110_TrickHousePuzzle1_EventScript_Scroll" } ] } \ No newline at end of file diff --git a/data/maps/Route110_TrickHousePuzzle1/scripts.inc b/data/maps/Route110_TrickHousePuzzle1/scripts.inc index ef81b03cf..3797ec29d 100644 --- a/data/maps/Route110_TrickHousePuzzle1/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle1/scripts.inc @@ -1,79 +1,79 @@ Route110_TrickHousePuzzle1_MapScripts:: @ 826B90F - map_script MAP_SCRIPT_ON_LOAD, Route110_TrickHousePuzzle1_MapScript1_26B915 + map_script MAP_SCRIPT_ON_LOAD, Route110_TrickHousePuzzle1_OnLoad .byte 0 -Route110_TrickHousePuzzle1_MapScript1_26B915: @ 826B915 +Route110_TrickHousePuzzle1_OnLoad: @ 826B915 compare VAR_TRICK_HOUSE_PUZZLE_1_STATE, 2 - goto_if_eq Route110_TrickHousePuzzle1_EventScript_26B921 + goto_if_eq Route110_TrickHousePuzzle1_EventScript_OpenDoor end -Route110_TrickHousePuzzle1_EventScript_26B921:: @ 826B921 +Route110_TrickHousePuzzle1_EventScript_OpenDoor:: @ 826B921 setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0 end -Route110_TrickHousePuzzle1_EventScript_26B92B:: @ 826B92B +Route110_TrickHousePuzzle1_EventScript_Scroll:: @ 826B92B lockall compare VAR_TRICK_HOUSE_PUZZLE_1_STATE, 0 - goto_if_eq Route110_TrickHousePuzzle1_EventScript_26B93D - goto Route110_TrickHousePuzzle1_EventScript_26A3DB + goto_if_eq Route110_TrickHousePuzzle1_EventScript_FoundScroll + goto Route110_TrickHousePuzzle_EventScript_ReadScrollAgain end -Route110_TrickHousePuzzle1_EventScript_26B93D:: @ 826B93D +Route110_TrickHousePuzzle1_EventScript_FoundScroll:: @ 826B93D setvar VAR_TRICK_HOUSE_PUZZLE_1_STATE, 1 - goto Route110_TrickHousePuzzle1_EventScript_26A3E5 + goto Route110_TrickHousePuzzle_EventScript_FoundScroll end -Route110_TrickHousePuzzle1_EventScript_26B948:: @ 826B948 - trainerbattle_single TRAINER_SALLY, Route110_TrickHousePuzzle1_Text_26B9FB, Route110_TrickHousePuzzle1_Text_26BA3F - msgbox Route110_TrickHousePuzzle1_Text_26BA57, MSGBOX_AUTOCLOSE +Route110_TrickHousePuzzle1_EventScript_Sally:: @ 826B948 + trainerbattle_single TRAINER_SALLY, Route110_TrickHousePuzzle1_Text_SallyIntro, Route110_TrickHousePuzzle1_Text_SallyDefeat + msgbox Route110_TrickHousePuzzle1_Text_SallyPostBattle, MSGBOX_AUTOCLOSE end -Route110_TrickHousePuzzle1_EventScript_26B95F:: @ 826B95F - trainerbattle_single TRAINER_EDDIE, Route110_TrickHousePuzzle1_Text_26BA82, Route110_TrickHousePuzzle1_Text_26BAB0 - msgbox Route110_TrickHousePuzzle1_Text_26BAC3, MSGBOX_AUTOCLOSE +Route110_TrickHousePuzzle1_EventScript_Eddie:: @ 826B95F + trainerbattle_single TRAINER_EDDIE, Route110_TrickHousePuzzle1_Text_EddieIntro, Route110_TrickHousePuzzle1_Text_EddieDefeat + msgbox Route110_TrickHousePuzzle1_Text_EddiePostBattle, MSGBOX_AUTOCLOSE end -Route110_TrickHousePuzzle1_EventScript_26B976:: @ 826B976 - trainerbattle_single TRAINER_ROBIN, Route110_TrickHousePuzzle1_Text_26BB10, Route110_TrickHousePuzzle1_Text_26BB2E - msgbox Route110_TrickHousePuzzle1_Text_26BB52, MSGBOX_AUTOCLOSE +Route110_TrickHousePuzzle1_EventScript_Robin:: @ 826B976 + trainerbattle_single TRAINER_ROBIN, Route110_TrickHousePuzzle1_Text_RobinIntro, Route110_TrickHousePuzzle1_Text_RobinDefeat + msgbox Route110_TrickHousePuzzle1_Text_RobinPostBattle, MSGBOX_AUTOCLOSE end -Route110_TrickHousePuzzle1_Text_26B98D:: @ 826B98D +Route110_TrickHousePuzzle1_Text_WroteSecretCodeLockOpened:: @ 826B98D .string "{PLAYER} wrote down the secret code\n" .string "on the door.\p" .string "“TRICK MASTER is fabulous.”\n" .string "… … … … … … … …\p" .string "The lock clicked open!$" -Route110_TrickHousePuzzle1_Text_26B9FB: @ 826B9FB +Route110_TrickHousePuzzle1_Text_SallyIntro: @ 826B9FB .string "I'll hack and slash my way to victory\n" .string "with the CUT we just learned!$" -Route110_TrickHousePuzzle1_Text_26BA3F: @ 826BA3F +Route110_TrickHousePuzzle1_Text_SallyDefeat: @ 826BA3F .string "Why are you so serious?$" -Route110_TrickHousePuzzle1_Text_26BA57: @ 826BA57 +Route110_TrickHousePuzzle1_Text_SallyPostBattle: @ 826BA57 .string "I never get tired of hacking\n" .string "and slashing!$" -Route110_TrickHousePuzzle1_Text_26BA82: @ 826BA82 +Route110_TrickHousePuzzle1_Text_EddieIntro: @ 826BA82 .string "I wandered into this weird house\n" .string "by accident…$" -Route110_TrickHousePuzzle1_Text_26BAB0: @ 826BAB0 +Route110_TrickHousePuzzle1_Text_EddieDefeat: @ 826BAB0 .string "And now I've lost…$" -Route110_TrickHousePuzzle1_Text_26BAC3: @ 826BAC3 +Route110_TrickHousePuzzle1_Text_EddiePostBattle: @ 826BAC3 .string "I lost my way, I lost a battle, and I'm\n" .string "now even more lost… I can't get out…$" -Route110_TrickHousePuzzle1_Text_26BB10: @ 826BB10 +Route110_TrickHousePuzzle1_Text_RobinIntro: @ 826BB10 .string "Just who is the TRICK MASTER?$" -Route110_TrickHousePuzzle1_Text_26BB2E: @ 826BB2E +Route110_TrickHousePuzzle1_Text_RobinDefeat: @ 826BB2E .string "I lost while I was lost in thought!$" -Route110_TrickHousePuzzle1_Text_26BB52: @ 826BB52 +Route110_TrickHousePuzzle1_Text_RobinPostBattle: @ 826BB52 .string "You're strong!\n" .string "Just who are you?$" diff --git a/data/maps/Route110_TrickHousePuzzle2/map.json b/data/maps/Route110_TrickHousePuzzle2/map.json index 3a9ed637d..71b3f8916 100644 --- a/data/maps/Route110_TrickHousePuzzle2/map.json +++ b/data/maps/Route110_TrickHousePuzzle2/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route110_TrickHousePuzzle2_EventScript_26BC75", + "script": "Route110_TrickHousePuzzle2_EventScript_Ted", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route110_TrickHousePuzzle2_EventScript_26BC8C", + "script": "Route110_TrickHousePuzzle2_EventScript_Paul", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route110_TrickHousePuzzle2_EventScript_26BCA3", + "script": "Route110_TrickHousePuzzle2_EventScript_Georgia", "flag": "0" }, { @@ -111,7 +111,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "Route110_TrickHousePuzzle2_EventScript_26BBDD" + "script": "Route110_TrickHousePuzzle2_EventScript_Button1" }, { "type": "trigger", @@ -120,7 +120,7 @@ "elevation": 0, "var": "VAR_TEMP_2", "var_value": "0", - "script": "Route110_TrickHousePuzzle2_EventScript_26BBF0" + "script": "Route110_TrickHousePuzzle2_EventScript_Button2" }, { "type": "trigger", @@ -129,7 +129,7 @@ "elevation": 3, "var": "VAR_TEMP_3", "var_value": "0", - "script": "Route110_TrickHousePuzzle2_EventScript_26BC03" + "script": "Route110_TrickHousePuzzle2_EventScript_Button3" }, { "type": "trigger", @@ -138,7 +138,7 @@ "elevation": 3, "var": "VAR_TEMP_4", "var_value": "0", - "script": "Route110_TrickHousePuzzle2_EventScript_26BC16" + "script": "Route110_TrickHousePuzzle2_EventScript_Button4" } ], "bg_events": [ @@ -148,7 +148,7 @@ "y": 14, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route110_TrickHousePuzzle2_EventScript_26BBC0" + "script": "Route110_TrickHousePuzzle2_EventScript_Scroll" } ] } \ No newline at end of file diff --git a/data/maps/Route110_TrickHousePuzzle2/scripts.inc b/data/maps/Route110_TrickHousePuzzle2/scripts.inc index 334637624..2b65ca95c 100644 --- a/data/maps/Route110_TrickHousePuzzle2/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle2/scripts.inc @@ -1,17 +1,17 @@ Route110_TrickHousePuzzle2_MapScripts:: @ 826BB73 - map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHousePuzzle2_MapScript1_26BB7E + map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHousePuzzle2_OnResume map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle2_OnTransition .byte 0 -Route110_TrickHousePuzzle2_MapScript1_26BB7E: @ 826BB7E +Route110_TrickHousePuzzle2_OnResume: @ 826BB7E compare VAR_TEMP_1, 1 - call_if_eq Route110_TrickHousePuzzle2_EventScript_26BC29 + call_if_eq Route110_TrickHousePuzzle2_EventScript_PressButton1 compare VAR_TEMP_2, 1 - call_if_eq Route110_TrickHousePuzzle2_EventScript_26BC3C + call_if_eq Route110_TrickHousePuzzle2_EventScript_PressButton2 compare VAR_TEMP_3, 1 - call_if_eq Route110_TrickHousePuzzle2_EventScript_26BC4F + call_if_eq Route110_TrickHousePuzzle2_EventScript_PressButton3 compare VAR_TEMP_4, 1 - call_if_eq Route110_TrickHousePuzzle2_EventScript_26BC62 + call_if_eq Route110_TrickHousePuzzle2_EventScript_PressButton4 end Route110_TrickHousePuzzle2_OnTransition: @ 826BBAB @@ -21,126 +21,126 @@ Route110_TrickHousePuzzle2_OnTransition: @ 826BBAB setvar VAR_TEMP_4, 0 end -Route110_TrickHousePuzzle2_EventScript_26BBC0:: @ 826BBC0 +Route110_TrickHousePuzzle2_EventScript_Scroll:: @ 826BBC0 lockall compare VAR_TRICK_HOUSE_PUZZLE_2_STATE, 0 - goto_if_eq Route110_TrickHousePuzzle2_EventScript_26BBD2 - goto Route110_TrickHousePuzzle2_EventScript_26A3DB + goto_if_eq Route110_TrickHousePuzzle2_EventScript_FoundScroll + goto Route110_TrickHousePuzzle_EventScript_ReadScrollAgain end -Route110_TrickHousePuzzle2_EventScript_26BBD2:: @ 826BBD2 +Route110_TrickHousePuzzle2_EventScript_FoundScroll:: @ 826BBD2 setvar VAR_TRICK_HOUSE_PUZZLE_2_STATE, 1 - goto Route110_TrickHousePuzzle2_EventScript_26A3E5 + goto Route110_TrickHousePuzzle_EventScript_FoundScroll end -Route110_TrickHousePuzzle2_EventScript_26BBDD:: @ 826BBDD +Route110_TrickHousePuzzle2_EventScript_Button1:: @ 826BBDD lockall setvar VAR_TEMP_1, 1 playse SE_PIN - call Route110_TrickHousePuzzle2_EventScript_26BC29 + call Route110_TrickHousePuzzle2_EventScript_PressButton1 special DrawWholeMapView releaseall end -Route110_TrickHousePuzzle2_EventScript_26BBF0:: @ 826BBF0 +Route110_TrickHousePuzzle2_EventScript_Button2:: @ 826BBF0 lockall setvar VAR_TEMP_2, 1 playse SE_PIN - call Route110_TrickHousePuzzle2_EventScript_26BC3C + call Route110_TrickHousePuzzle2_EventScript_PressButton2 special DrawWholeMapView releaseall end -Route110_TrickHousePuzzle2_EventScript_26BC03:: @ 826BC03 +Route110_TrickHousePuzzle2_EventScript_Button3:: @ 826BC03 lockall setvar VAR_TEMP_3, 1 playse SE_PIN - call Route110_TrickHousePuzzle2_EventScript_26BC4F + call Route110_TrickHousePuzzle2_EventScript_PressButton3 special DrawWholeMapView releaseall end -Route110_TrickHousePuzzle2_EventScript_26BC16:: @ 826BC16 +Route110_TrickHousePuzzle2_EventScript_Button4:: @ 826BC16 lockall setvar VAR_TEMP_4, 1 playse SE_PIN - call Route110_TrickHousePuzzle2_EventScript_26BC62 + call Route110_TrickHousePuzzle2_EventScript_PressButton4 special DrawWholeMapView releaseall end -Route110_TrickHousePuzzle2_EventScript_26BC29:: @ 826BC29 +Route110_TrickHousePuzzle2_EventScript_PressButton1:: @ 826BC29 setmetatile 11, 12, METATILE_TrickHousePuzzle_Button_Pressed, 0 setmetatile 1, 13, METATILE_TrickHousePuzzle_Door_Shuttered, 0 return -Route110_TrickHousePuzzle2_EventScript_26BC3C:: @ 826BC3C +Route110_TrickHousePuzzle2_EventScript_PressButton2:: @ 826BC3C setmetatile 0, 4, METATILE_TrickHousePuzzle_Button_Pressed, 0 setmetatile 5, 6, METATILE_TrickHousePuzzle_Door_Shuttered, 0 return -Route110_TrickHousePuzzle2_EventScript_26BC4F:: @ 826BC4F +Route110_TrickHousePuzzle2_EventScript_PressButton3:: @ 826BC4F setmetatile 14, 5, METATILE_TrickHousePuzzle_Button_Pressed, 0 setmetatile 7, 15, METATILE_TrickHousePuzzle_Door_Shuttered, 0 return -Route110_TrickHousePuzzle2_EventScript_26BC62:: @ 826BC62 +Route110_TrickHousePuzzle2_EventScript_PressButton4:: @ 826BC62 setmetatile 7, 11, METATILE_TrickHousePuzzle_Button_Pressed, 0 setmetatile 14, 12, METATILE_TrickHousePuzzle_Door_Shuttered, 0 return -Route110_TrickHousePuzzle2_EventScript_26BC75:: @ 826BC75 - trainerbattle_single TRAINER_TED, Route110_TrickHousePuzzle2_Text_26BD25, Route110_TrickHousePuzzle2_Text_26BD45 - msgbox Route110_TrickHousePuzzle2_Text_26BD70, MSGBOX_AUTOCLOSE +Route110_TrickHousePuzzle2_EventScript_Ted:: @ 826BC75 + trainerbattle_single TRAINER_TED, Route110_TrickHousePuzzle2_Text_TedIntro, Route110_TrickHousePuzzle2_Text_TedDefeat + msgbox Route110_TrickHousePuzzle2_Text_TedPostBattle, MSGBOX_AUTOCLOSE end -Route110_TrickHousePuzzle2_EventScript_26BC8C:: @ 826BC8C - trainerbattle_single TRAINER_PAUL, Route110_TrickHousePuzzle2_Text_26BD9E, Route110_TrickHousePuzzle2_Text_26BDCF - msgbox Route110_TrickHousePuzzle2_Text_26BDEC, MSGBOX_AUTOCLOSE +Route110_TrickHousePuzzle2_EventScript_Paul:: @ 826BC8C + trainerbattle_single TRAINER_PAUL, Route110_TrickHousePuzzle2_Text_PaulIntro, Route110_TrickHousePuzzle2_Text_PaulDefeat + msgbox Route110_TrickHousePuzzle2_Text_PaulPostBattle, MSGBOX_AUTOCLOSE end -Route110_TrickHousePuzzle2_EventScript_26BCA3:: @ 826BCA3 - trainerbattle_single TRAINER_GEORGIA, Route110_TrickHousePuzzle2_Text_26BE31, Route110_TrickHousePuzzle2_Text_26BE77 - msgbox Route110_TrickHousePuzzle2_Text_26BE97, MSGBOX_AUTOCLOSE +Route110_TrickHousePuzzle2_EventScript_Georgia:: @ 826BCA3 + trainerbattle_single TRAINER_GEORGIA, Route110_TrickHousePuzzle2_Text_GeorgiaIntro, Route110_TrickHousePuzzle2_Text_GeorgiaDefeat + msgbox Route110_TrickHousePuzzle2_Text_GeorgiaPostBattle, MSGBOX_AUTOCLOSE end -Route110_TrickHousePuzzle2_Text_26BCBA: @ 826BCBA +Route110_TrickHousePuzzle2_Text_WroteSecretCodeLockOpened: @ 826BCBA .string "{PLAYER} wrote down the secret code\n" .string "on the door.\p" .string "“TRICK MASTER is smart.”\n" .string "… … … … … … … …\p" .string "The lock clicked open!$" -Route110_TrickHousePuzzle2_Text_26BD25: @ 826BD25 +Route110_TrickHousePuzzle2_Text_TedIntro: @ 826BD25 .string "Which switch closes which hole?$" -Route110_TrickHousePuzzle2_Text_26BD45: @ 826BD45 +Route110_TrickHousePuzzle2_Text_TedDefeat: @ 826BD45 .string "After that battle, I'm even more\n" .string "confused!$" -Route110_TrickHousePuzzle2_Text_26BD70: @ 826BD70 +Route110_TrickHousePuzzle2_Text_TedPostBattle: @ 826BD70 .string "Can I get you to push all the buttons\n" .string "for me?$" -Route110_TrickHousePuzzle2_Text_26BD9E: @ 826BD9E +Route110_TrickHousePuzzle2_Text_PaulIntro: @ 826BD9E .string "Oh! You're on your second TRICK HOUSE\n" .string "challenge!$" -Route110_TrickHousePuzzle2_Text_26BDCF: @ 826BDCF +Route110_TrickHousePuzzle2_Text_PaulDefeat: @ 826BDCF .string "You're good at battling too?$" -Route110_TrickHousePuzzle2_Text_26BDEC: @ 826BDEC +Route110_TrickHousePuzzle2_Text_PaulPostBattle: @ 826BDEC .string "The TRICK MASTER rigged all the tricks\n" .string "in this house all by himself.$" -Route110_TrickHousePuzzle2_Text_26BE31: @ 826BE31 +Route110_TrickHousePuzzle2_Text_GeorgiaIntro: @ 826BE31 .string "I want to make my own GYM one day.\n" .string "So, I'm studying how to set traps.$" -Route110_TrickHousePuzzle2_Text_26BE77: @ 826BE77 +Route110_TrickHousePuzzle2_Text_GeorgiaDefeat: @ 826BE77 .string "I didn't study battling enough!$" -Route110_TrickHousePuzzle2_Text_26BE97: @ 826BE97 +Route110_TrickHousePuzzle2_Text_GeorgiaPostBattle: @ 826BE97 .string "You're strong, aren't you?\n" .string "Maybe even enough to be a GYM LEADER!$" diff --git a/data/maps/Route110_TrickHousePuzzle3/map.json b/data/maps/Route110_TrickHousePuzzle3/map.json index a37498fd2..612edc6bf 100644 --- a/data/maps/Route110_TrickHousePuzzle3/map.json +++ b/data/maps/Route110_TrickHousePuzzle3/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route110_TrickHousePuzzle3_EventScript_26C5C4", + "script": "Route110_TrickHousePuzzle3_EventScript_Justin", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route110_TrickHousePuzzle3_EventScript_26C5DB", + "script": "Route110_TrickHousePuzzle3_EventScript_Martha", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route110_TrickHousePuzzle3_EventScript_26C5F2", + "script": "Route110_TrickHousePuzzle3_EventScript_Alan", "flag": "0" }, { @@ -137,7 +137,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "Route110_TrickHousePuzzle3_EventScript_26C4CD" + "script": "Route110_TrickHousePuzzle3_EventScript_Button1" }, { "type": "trigger", @@ -146,7 +146,7 @@ "elevation": 3, "var": "VAR_TEMP_2", "var_value": "0", - "script": "Route110_TrickHousePuzzle3_EventScript_26C4D9" + "script": "Route110_TrickHousePuzzle3_EventScript_Button2" }, { "type": "trigger", @@ -155,7 +155,7 @@ "elevation": 3, "var": "VAR_TEMP_3", "var_value": "0", - "script": "Route110_TrickHousePuzzle3_EventScript_26C4E5" + "script": "Route110_TrickHousePuzzle3_EventScript_Button3" }, { "type": "trigger", @@ -164,7 +164,7 @@ "elevation": 3, "var": "VAR_TEMP_4", "var_value": "0", - "script": "Route110_TrickHousePuzzle3_EventScript_26C4F1" + "script": "Route110_TrickHousePuzzle3_EventScript_Button4" } ], "bg_events": [ @@ -174,7 +174,7 @@ "y": 14, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route110_TrickHousePuzzle3_EventScript_26C5A7" + "script": "Route110_TrickHousePuzzle3_EventScript_Scroll" } ] } \ No newline at end of file diff --git a/data/maps/Route110_TrickHousePuzzle3/scripts.inc b/data/maps/Route110_TrickHousePuzzle3/scripts.inc index dfae2d359..ddad0d549 100644 --- a/data/maps/Route110_TrickHousePuzzle3/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle3/scripts.inc @@ -1,14 +1,14 @@ Route110_TrickHousePuzzle3_MapScripts:: @ 826BED8 - map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHousePuzzle3_MapScript1_26BEE3 + map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHousePuzzle3_OnResume map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle3_OnTransition .byte 0 -Route110_TrickHousePuzzle3_MapScript1_26BEE3: @ 826BEE3 - call Route110_TrickHousePuzzle3_EventScript_26BF1E +Route110_TrickHousePuzzle3_OnResume: @ 826BEE3 + call Route110_TrickHousePuzzle3_EventScript_UpdateButtonMetatiles compare VAR_TEMP_9, 0 - call_if_eq Route110_TrickHousePuzzle3_EventScript_26BF97 + call_if_eq Route110_TrickHousePuzzle3_EventScript_SetDoorsState0 compare VAR_TEMP_9, 1 - call_if_eq Route110_TrickHousePuzzle3_EventScript_26C232 + call_if_eq Route110_TrickHousePuzzle3_EventScript_SetDoorsState1 end Route110_TrickHousePuzzle3_OnTransition: @ 826BEFF @@ -20,38 +20,38 @@ Route110_TrickHousePuzzle3_OnTransition: @ 826BEFF setvar VAR_TEMP_9, 0 end -Route110_TrickHousePuzzle3_EventScript_26BF1E:: @ 826BF1E +Route110_TrickHousePuzzle3_EventScript_UpdateButtonMetatiles:: @ 826BF1E setmetatile 4, 14, METATILE_TrickHousePuzzle_Button_Up, 0 setmetatile 3, 11, METATILE_TrickHousePuzzle_Button_Up, 0 setmetatile 12, 5, METATILE_TrickHousePuzzle_Button_Up, 0 setmetatile 8, 2, METATILE_TrickHousePuzzle_Button_Up, 0 compare VAR_TEMP_8, 1 - call_if_eq Route110_TrickHousePuzzle3_EventScript_26BF6F + call_if_eq Route110_TrickHousePuzzle3_EventScript_PressedButton1Metatile compare VAR_TEMP_8, 2 - call_if_eq Route110_TrickHousePuzzle3_EventScript_26BF79 + call_if_eq Route110_TrickHousePuzzle3_EventScript_PressedButton2Metatile compare VAR_TEMP_8, 3 - call_if_eq Route110_TrickHousePuzzle3_EventScript_26BF83 + call_if_eq Route110_TrickHousePuzzle3_EventScript_PressedButton3Metatile compare VAR_TEMP_8, 4 - call_if_eq Route110_TrickHousePuzzle3_EventScript_26BF8D + call_if_eq Route110_TrickHousePuzzle3_EventScript_PressedButton4Metatile return -Route110_TrickHousePuzzle3_EventScript_26BF6F:: @ 826BF6F +Route110_TrickHousePuzzle3_EventScript_PressedButton1Metatile:: @ 826BF6F setmetatile 4, 14, METATILE_TrickHousePuzzle_Button_Pressed, 0 return -Route110_TrickHousePuzzle3_EventScript_26BF79:: @ 826BF79 +Route110_TrickHousePuzzle3_EventScript_PressedButton2Metatile:: @ 826BF79 setmetatile 3, 11, METATILE_TrickHousePuzzle_Button_Pressed, 0 return -Route110_TrickHousePuzzle3_EventScript_26BF83:: @ 826BF83 +Route110_TrickHousePuzzle3_EventScript_PressedButton3Metatile:: @ 826BF83 setmetatile 12, 5, METATILE_TrickHousePuzzle_Button_Pressed, 0 return -Route110_TrickHousePuzzle3_EventScript_26BF8D:: @ 826BF8D +Route110_TrickHousePuzzle3_EventScript_PressedButton4Metatile:: @ 826BF8D setmetatile 8, 2, METATILE_TrickHousePuzzle_Button_Pressed, 0 return -Route110_TrickHousePuzzle3_EventScript_26BF97:: @ 826BF97 +Route110_TrickHousePuzzle3_EventScript_SetDoorsState0:: @ 826BF97 setmetatile 1, 6, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile0, 0 setmetatile 2, 6, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile1, 0 setmetatile 1, 7, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile2, 0 @@ -128,7 +128,7 @@ Route110_TrickHousePuzzle3_EventScript_26BF97:: @ 826BF97 setmetatile 9, 5, METATILE_TrickHousePuzzle_RedDoorV_Open1, 1 return -Route110_TrickHousePuzzle3_EventScript_26C232:: @ 826C232 +Route110_TrickHousePuzzle3_EventScript_SetDoorsState1:: @ 826C232 setmetatile 1, 6, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile0, 0 setmetatile 2, 6, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile1, 0 setmetatile 1, 7, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile2, 1 @@ -205,155 +205,155 @@ Route110_TrickHousePuzzle3_EventScript_26C232:: @ 826C232 setmetatile 9, 5, METATILE_TrickHousePuzzle_Floor_ShadowTop_Alt, 0 return -Route110_TrickHousePuzzle3_EventScript_26C4CD:: @ 826C4CD +Route110_TrickHousePuzzle3_EventScript_Button1:: @ 826C4CD lockall setvar VAR_TEMP_8, 1 - goto Route110_TrickHousePuzzle3_EventScript_26C4FD + goto Route110_TrickHousePuzzle3_EventScript_PressButton end -Route110_TrickHousePuzzle3_EventScript_26C4D9:: @ 826C4D9 +Route110_TrickHousePuzzle3_EventScript_Button2:: @ 826C4D9 lockall setvar VAR_TEMP_8, 2 - goto Route110_TrickHousePuzzle3_EventScript_26C4FD + goto Route110_TrickHousePuzzle3_EventScript_PressButton end -Route110_TrickHousePuzzle3_EventScript_26C4E5:: @ 826C4E5 +Route110_TrickHousePuzzle3_EventScript_Button3:: @ 826C4E5 lockall setvar VAR_TEMP_8, 3 - goto Route110_TrickHousePuzzle3_EventScript_26C4FD + goto Route110_TrickHousePuzzle3_EventScript_PressButton end -Route110_TrickHousePuzzle3_EventScript_26C4F1:: @ 826C4F1 +Route110_TrickHousePuzzle3_EventScript_Button4:: @ 826C4F1 lockall setvar VAR_TEMP_8, 4 - goto Route110_TrickHousePuzzle3_EventScript_26C4FD + goto Route110_TrickHousePuzzle3_EventScript_PressButton end -Route110_TrickHousePuzzle3_EventScript_26C4FD:: @ 826C4FD - call Route110_TrickHousePuzzle3_EventScript_26C510 +Route110_TrickHousePuzzle3_EventScript_PressButton:: @ 826C4FD + call Route110_TrickHousePuzzle3_EventScript_SetButton playse SE_PIN - call Route110_TrickHousePuzzle3_EventScript_26BF1E - goto Route110_TrickHousePuzzle3_EventScript_26C569 + call Route110_TrickHousePuzzle3_EventScript_UpdateButtonMetatiles + goto Route110_TrickHousePuzzle3_EventScript_AlternateDoors end -Route110_TrickHousePuzzle3_EventScript_26C510:: @ 826C510 +Route110_TrickHousePuzzle3_EventScript_SetButton:: @ 826C510 setvar VAR_TEMP_1, 0 setvar VAR_TEMP_2, 0 setvar VAR_TEMP_3, 0 setvar VAR_TEMP_4, 0 compare VAR_TEMP_8, 1 - call_if_eq Route110_TrickHousePuzzle3_EventScript_26C551 + call_if_eq Route110_TrickHousePuzzle3_EventScript_SetButton1 compare VAR_TEMP_8, 2 - call_if_eq Route110_TrickHousePuzzle3_EventScript_26C557 + call_if_eq Route110_TrickHousePuzzle3_EventScript_SetButton2 compare VAR_TEMP_8, 3 - call_if_eq Route110_TrickHousePuzzle3_EventScript_26C55D + call_if_eq Route110_TrickHousePuzzle3_EventScript_SetButton3 compare VAR_TEMP_8, 4 - call_if_eq Route110_TrickHousePuzzle3_EventScript_26C563 + call_if_eq Route110_TrickHousePuzzle3_EventScript_SetButton4 return -Route110_TrickHousePuzzle3_EventScript_26C551:: @ 826C551 +Route110_TrickHousePuzzle3_EventScript_SetButton1:: @ 826C551 setvar VAR_TEMP_1, 1 return -Route110_TrickHousePuzzle3_EventScript_26C557:: @ 826C557 +Route110_TrickHousePuzzle3_EventScript_SetButton2:: @ 826C557 setvar VAR_TEMP_2, 1 return -Route110_TrickHousePuzzle3_EventScript_26C55D:: @ 826C55D +Route110_TrickHousePuzzle3_EventScript_SetButton3:: @ 826C55D setvar VAR_TEMP_3, 1 return -Route110_TrickHousePuzzle3_EventScript_26C563:: @ 826C563 +Route110_TrickHousePuzzle3_EventScript_SetButton4:: @ 826C563 setvar VAR_TEMP_4, 1 return -Route110_TrickHousePuzzle3_EventScript_26C569:: @ 826C569 +Route110_TrickHousePuzzle3_EventScript_AlternateDoors:: @ 826C569 compare VAR_TEMP_9, 1 - call_if_eq Route110_TrickHousePuzzle3_EventScript_26BF97 + call_if_eq Route110_TrickHousePuzzle3_EventScript_SetDoorsState0 compare VAR_TEMP_9, 0 - call_if_eq Route110_TrickHousePuzzle3_EventScript_26C232 + call_if_eq Route110_TrickHousePuzzle3_EventScript_SetDoorsState1 special DrawWholeMapView compare VAR_TEMP_9, 1 - goto_if_eq Route110_TrickHousePuzzle3_EventScript_26C599 + goto_if_eq Route110_TrickHousePuzzle3_EventScript_ClearAltDoorState compare VAR_TEMP_9, 0 - goto_if_eq Route110_TrickHousePuzzle3_EventScript_26C5A0 + goto_if_eq Route110_TrickHousePuzzle3_EventScript_SetAltDoorState end -Route110_TrickHousePuzzle3_EventScript_26C599:: @ 826C599 +Route110_TrickHousePuzzle3_EventScript_ClearAltDoorState:: @ 826C599 setvar VAR_TEMP_9, 0 releaseall end -Route110_TrickHousePuzzle3_EventScript_26C5A0:: @ 826C5A0 +Route110_TrickHousePuzzle3_EventScript_SetAltDoorState:: @ 826C5A0 setvar VAR_TEMP_9, 1 releaseall end -Route110_TrickHousePuzzle3_EventScript_26C5A7:: @ 826C5A7 +Route110_TrickHousePuzzle3_EventScript_Scroll:: @ 826C5A7 lockall compare VAR_TRICK_HOUSE_PUZZLE_3_STATE, 0 - goto_if_eq Route110_TrickHousePuzzle3_EventScript_26C5B9 - goto Route110_TrickHousePuzzle3_EventScript_26A3DB + goto_if_eq Route110_TrickHousePuzzle3_EventScript_FoundScroll + goto Route110_TrickHousePuzzle_EventScript_ReadScrollAgain end -Route110_TrickHousePuzzle3_EventScript_26C5B9:: @ 826C5B9 +Route110_TrickHousePuzzle3_EventScript_FoundScroll:: @ 826C5B9 setvar VAR_TRICK_HOUSE_PUZZLE_3_STATE, 1 - goto Route110_TrickHousePuzzle3_EventScript_26A3E5 + goto Route110_TrickHousePuzzle_EventScript_FoundScroll end -Route110_TrickHousePuzzle3_EventScript_26C5C4:: @ 826C5C4 - trainerbattle_single TRAINER_JUSTIN, Route110_TrickHousePuzzle3_Text_26C676, Route110_TrickHousePuzzle3_Text_26C69D - msgbox Route110_TrickHousePuzzle3_Text_26C6E6, MSGBOX_AUTOCLOSE +Route110_TrickHousePuzzle3_EventScript_Justin:: @ 826C5C4 + trainerbattle_single TRAINER_JUSTIN, Route110_TrickHousePuzzle3_Text_JustinIntro, Route110_TrickHousePuzzle3_Text_JustinDefeat + msgbox Route110_TrickHousePuzzle3_Text_JustinPostBattle, MSGBOX_AUTOCLOSE end -Route110_TrickHousePuzzle3_EventScript_26C5DB:: @ 826C5DB - trainerbattle_single TRAINER_MARTHA, Route110_TrickHousePuzzle3_Text_26C726, Route110_TrickHousePuzzle3_Text_26C763 - msgbox Route110_TrickHousePuzzle3_Text_26C776, MSGBOX_AUTOCLOSE +Route110_TrickHousePuzzle3_EventScript_Martha:: @ 826C5DB + trainerbattle_single TRAINER_MARTHA, Route110_TrickHousePuzzle3_Text_MarthaIntro, Route110_TrickHousePuzzle3_Text_MarthaDefeat + msgbox Route110_TrickHousePuzzle3_Text_MarthaPostBattle, MSGBOX_AUTOCLOSE end -Route110_TrickHousePuzzle3_EventScript_26C5F2:: @ 826C5F2 - trainerbattle_single TRAINER_ALAN, Route110_TrickHousePuzzle3_Text_26C7AA, Route110_TrickHousePuzzle3_Text_26C7EC - msgbox Route110_TrickHousePuzzle3_Text_26C80C, MSGBOX_AUTOCLOSE +Route110_TrickHousePuzzle3_EventScript_Alan:: @ 826C5F2 + trainerbattle_single TRAINER_ALAN, Route110_TrickHousePuzzle3_Text_AlanIntro, Route110_TrickHousePuzzle3_Text_AlanDefeat + msgbox Route110_TrickHousePuzzle3_Text_AlanPostBattle, MSGBOX_AUTOCLOSE end -Route110_TrickHousePuzzle3_Text_26C609: @ 826C609 +Route110_TrickHousePuzzle3_Text_WroteSecretCodeLockOpened: @ 826C609 .string "{PLAYER} wrote down the secret code\n" .string "on the door.\p" .string "“TRICK MASTER is coveted.”\n" .string "… … … … … … … …\p" .string "The lock clicked open!$" -Route110_TrickHousePuzzle3_Text_26C676: @ 826C676 +Route110_TrickHousePuzzle3_Text_JustinIntro: @ 826C676 .string "I keep coming back to this same place!$" -Route110_TrickHousePuzzle3_Text_26C69D: @ 826C69D +Route110_TrickHousePuzzle3_Text_JustinDefeat: @ 826C69D .string "I'm already having trouble, and then\n" .string "you have to beat me? It's not fair!$" -Route110_TrickHousePuzzle3_Text_26C6E6: @ 826C6E6 +Route110_TrickHousePuzzle3_Text_JustinPostBattle: @ 826C6E6 .string "It's full of doors here!\n" .string "It's too small and dark in here! Help!$" -Route110_TrickHousePuzzle3_Text_26C726: @ 826C726 +Route110_TrickHousePuzzle3_Text_MarthaIntro: @ 826C726 .string "I don't know what's going on here.\n" .string "I'm starting to feel sad…$" -Route110_TrickHousePuzzle3_Text_26C763: @ 826C763 +Route110_TrickHousePuzzle3_Text_MarthaDefeat: @ 826C763 .string "You… You're awful!$" -Route110_TrickHousePuzzle3_Text_26C776: @ 826C776 +Route110_TrickHousePuzzle3_Text_MarthaPostBattle: @ 826C776 .string "I know I'm weak!\n" .string "And, I have no sense of direction!$" -Route110_TrickHousePuzzle3_Text_26C7AA: @ 826C7AA +Route110_TrickHousePuzzle3_Text_AlanIntro: @ 826C7AA .string "I don't get it. What would anyone want\n" .string "with a house this bizarre?$" -Route110_TrickHousePuzzle3_Text_26C7EC: @ 826C7EC +Route110_TrickHousePuzzle3_Text_AlanDefeat: @ 826C7EC .string "I don't get it.\n" .string "How did I lose?$" -Route110_TrickHousePuzzle3_Text_26C80C: @ 826C80C +Route110_TrickHousePuzzle3_Text_AlanPostBattle: @ 826C80C .string "I don't get it.\n" .string "How many traps are in this house?\p" .string "You may be the one to solve that.$" diff --git a/data/maps/Route110_TrickHousePuzzle4/map.json b/data/maps/Route110_TrickHousePuzzle4/map.json index f77fa9b22..26a58166f 100644 --- a/data/maps/Route110_TrickHousePuzzle4/map.json +++ b/data/maps/Route110_TrickHousePuzzle4/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route110_TrickHousePuzzle4_EventScript_26C87E", + "script": "Route110_TrickHousePuzzle4_EventScript_Cora", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route110_TrickHousePuzzle4_EventScript_26C8AC", + "script": "Route110_TrickHousePuzzle4_EventScript_Paula", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route110_TrickHousePuzzle4_EventScript_26C895", + "script": "Route110_TrickHousePuzzle4_EventScript_Yuji", "flag": "0" }, { @@ -228,7 +228,7 @@ "y": 13, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route110_TrickHousePuzzle4_EventScript_26C861" + "script": "Route110_TrickHousePuzzle4_EventScript_Scroll" } ] } \ No newline at end of file diff --git a/data/maps/Route110_TrickHousePuzzle4/scripts.inc b/data/maps/Route110_TrickHousePuzzle4/scripts.inc index fcb10b3ab..44610a10f 100644 --- a/data/maps/Route110_TrickHousePuzzle4/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle4/scripts.inc @@ -1,71 +1,71 @@ Route110_TrickHousePuzzle4_MapScripts:: @ 826C860 .byte 0 -Route110_TrickHousePuzzle4_EventScript_26C861:: @ 826C861 +Route110_TrickHousePuzzle4_EventScript_Scroll:: @ 826C861 lockall compare VAR_TRICK_HOUSE_PUZZLE_4_STATE, 0 - goto_if_eq Route110_TrickHousePuzzle4_EventScript_26C873 - goto Route110_TrickHousePuzzle4_EventScript_26A3DB + goto_if_eq Route110_TrickHousePuzzle4_EventScript_FoundScroll + goto Route110_TrickHousePuzzle_EventScript_ReadScrollAgain end -Route110_TrickHousePuzzle4_EventScript_26C873:: @ 826C873 +Route110_TrickHousePuzzle4_EventScript_FoundScroll:: @ 826C873 setvar VAR_TRICK_HOUSE_PUZZLE_4_STATE, 1 - goto Route110_TrickHousePuzzle4_EventScript_26A3E5 + goto Route110_TrickHousePuzzle_EventScript_FoundScroll end -Route110_TrickHousePuzzle4_EventScript_26C87E:: @ 826C87E - trainerbattle_single TRAINER_CORA, Route110_TrickHousePuzzle4_Text_26C92D, Route110_TrickHousePuzzle4_Text_26C96E - msgbox Route110_TrickHousePuzzle4_Text_26C9A2, MSGBOX_AUTOCLOSE +Route110_TrickHousePuzzle4_EventScript_Cora:: @ 826C87E + trainerbattle_single TRAINER_CORA, Route110_TrickHousePuzzle4_Text_CoraIntro, Route110_TrickHousePuzzle4_Text_CoraDefeat + msgbox Route110_TrickHousePuzzle4_Text_CoraPostBattle, MSGBOX_AUTOCLOSE end -Route110_TrickHousePuzzle4_EventScript_26C895:: @ 826C895 - trainerbattle_single TRAINER_YUJI, Route110_TrickHousePuzzle4_Text_26C9E4, Route110_TrickHousePuzzle4_Text_26CA20 - msgbox Route110_TrickHousePuzzle4_Text_26CA53, MSGBOX_AUTOCLOSE +Route110_TrickHousePuzzle4_EventScript_Yuji:: @ 826C895 + trainerbattle_single TRAINER_YUJI, Route110_TrickHousePuzzle4_Text_YujiIntro, Route110_TrickHousePuzzle4_Text_YujiDefeat + msgbox Route110_TrickHousePuzzle4_Text_YujiPostBattle, MSGBOX_AUTOCLOSE end -Route110_TrickHousePuzzle4_EventScript_26C8AC:: @ 826C8AC - trainerbattle_single TRAINER_PAULA, Route110_TrickHousePuzzle4_Text_26CA9C, Route110_TrickHousePuzzle4_Text_26CACB - msgbox Route110_TrickHousePuzzle4_Text_26CAD1, MSGBOX_AUTOCLOSE +Route110_TrickHousePuzzle4_EventScript_Paula:: @ 826C8AC + trainerbattle_single TRAINER_PAULA, Route110_TrickHousePuzzle4_Text_PaulaIntro, Route110_TrickHousePuzzle4_Text_PaulaDefeat + msgbox Route110_TrickHousePuzzle4_Text_PaulaPostBattle, MSGBOX_AUTOCLOSE end -Route110_TrickHousePuzzle4_Text_26C8C3: @ 826C8C3 +Route110_TrickHousePuzzle4_Text_WroteSecretCodeLockOpened: @ 826C8C3 .string "{PLAYER} wrote down the secret code\n" .string "on the door.\p" .string "“TRICK MASTER is cool.”\n" .string "… … … … … … … …\p" .string "The lock clicked open!$" -Route110_TrickHousePuzzle4_Text_26C92D: @ 826C92D +Route110_TrickHousePuzzle4_Text_CoraIntro: @ 826C92D .string "It's too much bother to think this out.\n" .string "I only wanted to battle!$" -Route110_TrickHousePuzzle4_Text_26C96E: @ 826C96E +Route110_TrickHousePuzzle4_Text_CoraDefeat: @ 826C96E .string "Even though I lost, I still like battling\n" .string "the best!$" -Route110_TrickHousePuzzle4_Text_26C9A2: @ 826C9A2 +Route110_TrickHousePuzzle4_Text_CoraPostBattle: @ 826C9A2 .string "Wouldn't you agree? You would go\n" .string "anywhere if TRAINERS were there.$" -Route110_TrickHousePuzzle4_Text_26C9E4: @ 826C9E4 +Route110_TrickHousePuzzle4_Text_YujiIntro: @ 826C9E4 .string "Heh! Boulders like this, I can brush\n" .string "aside with one finger!$" -Route110_TrickHousePuzzle4_Text_26CA20: @ 826CA20 +Route110_TrickHousePuzzle4_Text_YujiDefeat: @ 826CA20 .string "I can push boulders, but I can't solve\n" .string "the puzzle…$" -Route110_TrickHousePuzzle4_Text_26CA53: @ 826CA53 +Route110_TrickHousePuzzle4_Text_YujiPostBattle: @ 826CA53 .string "It's not good enough to be brawny…\n" .string "You have to use your head. Be brainy!$" -Route110_TrickHousePuzzle4_Text_26CA9C: @ 826CA9C +Route110_TrickHousePuzzle4_Text_PaulaIntro: @ 826CA9C .string "The TRICK HOUSE is getting trickier,\n" .string "isn't it?$" -Route110_TrickHousePuzzle4_Text_26CACB: @ 826CACB +Route110_TrickHousePuzzle4_Text_PaulaDefeat: @ 826CACB .string "Aaak!$" -Route110_TrickHousePuzzle4_Text_26CAD1: @ 826CAD1 +Route110_TrickHousePuzzle4_Text_PaulaPostBattle: @ 826CAD1 .string "Has anyone made it to the end?$" diff --git a/data/maps/Route110_TrickHousePuzzle5/map.json b/data/maps/Route110_TrickHousePuzzle5/map.json index ae94ed240..30f4cfe47 100644 --- a/data/maps/Route110_TrickHousePuzzle5/map.json +++ b/data/maps/Route110_TrickHousePuzzle5/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_TrickHousePuzzle5_EventScript_26CB32", + "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll1", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_TrickHousePuzzle5_EventScript_26CB53", + "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll2", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_TrickHousePuzzle5_EventScript_26CB74", + "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll3", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_TrickHousePuzzle5_EventScript_26CB95", + "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll4", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_TrickHousePuzzle5_EventScript_26CBB6", + "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll5", "flag": "0" } ], @@ -111,7 +111,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "Route110_TrickHousePuzzle5_EventScript_26CBD7" + "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll1Trigger0" }, { "type": "trigger", @@ -120,7 +120,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "Route110_TrickHousePuzzle5_EventScript_26CBE3" + "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll1Trigger1" }, { "type": "trigger", @@ -129,7 +129,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "Route110_TrickHousePuzzle5_EventScript_26CBEF" + "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll1Trigger2" }, { "type": "trigger", @@ -138,7 +138,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "Route110_TrickHousePuzzle5_EventScript_26CBFB" + "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll1Trigger3" }, { "type": "trigger", @@ -147,7 +147,7 @@ "elevation": 3, "var": "VAR_TEMP_2", "var_value": "0", - "script": "Route110_TrickHousePuzzle5_EventScript_26CC13" + "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll2Trigger0" }, { "type": "trigger", @@ -156,7 +156,7 @@ "elevation": 3, "var": "VAR_TEMP_2", "var_value": "0", - "script": "Route110_TrickHousePuzzle5_EventScript_26CC1F" + "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll2Trigger1" }, { "type": "trigger", @@ -165,7 +165,7 @@ "elevation": 3, "var": "VAR_TEMP_3", "var_value": "0", - "script": "Route110_TrickHousePuzzle5_EventScript_26CC5B" + "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll3Trigger0" }, { "type": "trigger", @@ -174,7 +174,7 @@ "elevation": 3, "var": "VAR_TEMP_3", "var_value": "0", - "script": "Route110_TrickHousePuzzle5_EventScript_26CC67" + "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll3Trigger1" }, { "type": "trigger", @@ -183,7 +183,7 @@ "elevation": 3, "var": "VAR_TEMP_3", "var_value": "0", - "script": "Route110_TrickHousePuzzle5_EventScript_26CC73" + "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll3Trigger2" }, { "type": "trigger", @@ -192,7 +192,7 @@ "elevation": 3, "var": "VAR_TEMP_4", "var_value": "0", - "script": "Route110_TrickHousePuzzle5_EventScript_26CC97" + "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll4Trigger0" }, { "type": "trigger", @@ -201,7 +201,7 @@ "elevation": 3, "var": "VAR_TEMP_4", "var_value": "0", - "script": "Route110_TrickHousePuzzle5_EventScript_26CCA3" + "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll4Trigger1" }, { "type": "trigger", @@ -210,7 +210,7 @@ "elevation": 3, "var": "VAR_TEMP_5", "var_value": "0", - "script": "Route110_TrickHousePuzzle5_EventScript_26CCDF" + "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll5Trigger0" }, { "type": "trigger", @@ -219,7 +219,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "Route110_TrickHousePuzzle5_EventScript_26CC07" + "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll1Trigger4" }, { "type": "trigger", @@ -228,7 +228,7 @@ "elevation": 3, "var": "VAR_TEMP_2", "var_value": "0", - "script": "Route110_TrickHousePuzzle5_EventScript_26CC2B" + "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll2Trigger2" }, { "type": "trigger", @@ -237,7 +237,7 @@ "elevation": 3, "var": "VAR_TEMP_2", "var_value": "0", - "script": "Route110_TrickHousePuzzle5_EventScript_26CC37" + "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll2Trigger3" }, { "type": "trigger", @@ -246,7 +246,7 @@ "elevation": 3, "var": "VAR_TEMP_2", "var_value": "0", - "script": "Route110_TrickHousePuzzle5_EventScript_26CC43" + "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll2Trigger4" }, { "type": "trigger", @@ -255,7 +255,7 @@ "elevation": 3, "var": "VAR_TEMP_2", "var_value": "0", - "script": "Route110_TrickHousePuzzle5_EventScript_26CC4F" + "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll2Trigger5" }, { "type": "trigger", @@ -264,7 +264,7 @@ "elevation": 3, "var": "VAR_TEMP_3", "var_value": "0", - "script": "Route110_TrickHousePuzzle5_EventScript_26CC7F" + "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll3Trigger3" }, { "type": "trigger", @@ -273,7 +273,7 @@ "elevation": 3, "var": "VAR_TEMP_3", "var_value": "0", - "script": "Route110_TrickHousePuzzle5_EventScript_26CC8B" + "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll3Trigger4" }, { "type": "trigger", @@ -282,7 +282,7 @@ "elevation": 3, "var": "VAR_TEMP_4", "var_value": "0", - "script": "Route110_TrickHousePuzzle5_EventScript_26CCAF" + "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll4Trigger2" }, { "type": "trigger", @@ -291,7 +291,7 @@ "elevation": 3, "var": "VAR_TEMP_4", "var_value": "0", - "script": "Route110_TrickHousePuzzle5_EventScript_26CCBB" + "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll4Trigger3" }, { "type": "trigger", @@ -300,7 +300,7 @@ "elevation": 3, "var": "VAR_TEMP_4", "var_value": "0", - "script": "Route110_TrickHousePuzzle5_EventScript_26CCC7" + "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll4Trigger4" } ], "bg_events": [ @@ -310,7 +310,7 @@ "y": 21, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route110_TrickHousePuzzle5_EventScript_26CB15" + "script": "Route110_TrickHousePuzzle5_EventScript_Scroll" } ] } \ No newline at end of file diff --git a/data/maps/Route110_TrickHousePuzzle5/scripts.inc b/data/maps/Route110_TrickHousePuzzle5/scripts.inc index b678840b6..ac260981f 100644 --- a/data/maps/Route110_TrickHousePuzzle5/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle5/scripts.inc @@ -11,207 +11,208 @@ Route110_TrickHousePuzzle5_OnTransition: @ 826CAF6 setvar VAR_TEMP_8, 0 end -Route110_TrickHousePuzzle5_EventScript_26CB15:: @ 826CB15 +Route110_TrickHousePuzzle5_EventScript_Scroll:: @ 826CB15 lockall compare VAR_TRICK_HOUSE_PUZZLE_5_STATE, 0 - goto_if_eq Route110_TrickHousePuzzle5_EventScript_26CB27 - goto Route110_TrickHousePuzzle5_EventScript_26A3DB + goto_if_eq Route110_TrickHousePuzzle5_EventScript_FoundScroll + goto Route110_TrickHousePuzzle_EventScript_ReadScrollAgain end -Route110_TrickHousePuzzle5_EventScript_26CB27:: @ 826CB27 +Route110_TrickHousePuzzle5_EventScript_FoundScroll:: @ 826CB27 setvar VAR_TRICK_HOUSE_PUZZLE_5_STATE, 1 - goto Route110_TrickHousePuzzle5_EventScript_26A3E5 + goto Route110_TrickHousePuzzle_EventScript_FoundScroll end -Route110_TrickHousePuzzle5_EventScript_26CB32:: @ 826CB32 +Route110_TrickHousePuzzle5_EventScript_Mechadoll1:: @ 826CB32 lockall applymovement 1, Common_Movement_FacePlayer waitmovement 0 compare VAR_TEMP_1, 1 - goto_if_eq Route110_TrickHousePuzzle5_EventScript_26D1AA + goto_if_eq Route110_TrickHousePuzzle5_EventScript_CorrectGoThrough setvar VAR_TEMP_9, 0 - goto Route110_TrickHousePuzzle5_EventScript_26CCEB + goto Route110_TrickHousePuzzle5_EventScript_Mechadoll1Activate end -Route110_TrickHousePuzzle5_EventScript_26CB53:: @ 826CB53 +Route110_TrickHousePuzzle5_EventScript_Mechadoll2:: @ 826CB53 lockall applymovement 2, Common_Movement_FacePlayer waitmovement 0 compare VAR_TEMP_2, 1 - goto_if_eq Route110_TrickHousePuzzle5_EventScript_26D1AA + goto_if_eq Route110_TrickHousePuzzle5_EventScript_CorrectGoThrough setvar VAR_TEMP_9, 0 - goto Route110_TrickHousePuzzle5_EventScript_26CD6A + goto Route110_TrickHousePuzzle5_EventScript_Mechadoll2Activate end -Route110_TrickHousePuzzle5_EventScript_26CB74:: @ 826CB74 +Route110_TrickHousePuzzle5_EventScript_Mechadoll3:: @ 826CB74 lockall applymovement 3, Common_Movement_FacePlayer waitmovement 0 compare VAR_TEMP_3, 1 - goto_if_eq Route110_TrickHousePuzzle5_EventScript_26D1AA + goto_if_eq Route110_TrickHousePuzzle5_EventScript_CorrectGoThrough setvar VAR_TEMP_9, 0 - goto Route110_TrickHousePuzzle5_EventScript_26CDF4 + goto Route110_TrickHousePuzzle5_EventScript_Mechadoll3Activate end -Route110_TrickHousePuzzle5_EventScript_26CB95:: @ 826CB95 +Route110_TrickHousePuzzle5_EventScript_Mechadoll4:: @ 826CB95 lockall applymovement 4, Common_Movement_FacePlayer waitmovement 0 compare VAR_TEMP_4, 1 - goto_if_eq Route110_TrickHousePuzzle5_EventScript_26D1AA + goto_if_eq Route110_TrickHousePuzzle5_EventScript_CorrectGoThrough setvar VAR_TEMP_9, 0 - goto Route110_TrickHousePuzzle5_EventScript_26CE73 + goto Route110_TrickHousePuzzle5_EventScript_Mechadoll4Activate end -Route110_TrickHousePuzzle5_EventScript_26CBB6:: @ 826CBB6 +Route110_TrickHousePuzzle5_EventScript_Mechadoll5:: @ 826CBB6 lockall applymovement 5, Common_Movement_FacePlayer waitmovement 0 compare VAR_TEMP_5, 1 - goto_if_eq Route110_TrickHousePuzzle5_EventScript_26D1AA + goto_if_eq Route110_TrickHousePuzzle5_EventScript_CorrectGoThrough setvar VAR_TEMP_9, 0 - goto Route110_TrickHousePuzzle5_EventScript_26CEF2 + goto Route110_TrickHousePuzzle5_EventScript_Mechadoll5Activate end -Route110_TrickHousePuzzle5_EventScript_26CBD7:: @ 826CBD7 +Route110_TrickHousePuzzle5_EventScript_Mechadoll1Trigger0:: @ 826CBD7 lockall setvar VAR_TEMP_9, 0 - goto Route110_TrickHousePuzzle5_EventScript_26CCEB + goto Route110_TrickHousePuzzle5_EventScript_Mechadoll1Activate end -Route110_TrickHousePuzzle5_EventScript_26CBE3:: @ 826CBE3 +Route110_TrickHousePuzzle5_EventScript_Mechadoll1Trigger1:: @ 826CBE3 lockall setvar VAR_TEMP_9, 1 - goto Route110_TrickHousePuzzle5_EventScript_26CCEB + goto Route110_TrickHousePuzzle5_EventScript_Mechadoll1Activate end -Route110_TrickHousePuzzle5_EventScript_26CBEF:: @ 826CBEF +Route110_TrickHousePuzzle5_EventScript_Mechadoll1Trigger2:: @ 826CBEF lockall setvar VAR_TEMP_9, 2 - goto Route110_TrickHousePuzzle5_EventScript_26CCEB + goto Route110_TrickHousePuzzle5_EventScript_Mechadoll1Activate end -Route110_TrickHousePuzzle5_EventScript_26CBFB:: @ 826CBFB +Route110_TrickHousePuzzle5_EventScript_Mechadoll1Trigger3:: @ 826CBFB lockall setvar VAR_TEMP_9, 3 - goto Route110_TrickHousePuzzle5_EventScript_26CCEB + goto Route110_TrickHousePuzzle5_EventScript_Mechadoll1Activate end -Route110_TrickHousePuzzle5_EventScript_26CC07:: @ 826CC07 +Route110_TrickHousePuzzle5_EventScript_Mechadoll1Trigger4:: @ 826CC07 lockall setvar VAR_TEMP_9, 4 - goto Route110_TrickHousePuzzle5_EventScript_26CCEB + goto Route110_TrickHousePuzzle5_EventScript_Mechadoll1Activate end -Route110_TrickHousePuzzle5_EventScript_26CC13:: @ 826CC13 +Route110_TrickHousePuzzle5_EventScript_Mechadoll2Trigger0:: @ 826CC13 lockall setvar VAR_TEMP_9, 0 - goto Route110_TrickHousePuzzle5_EventScript_26CD6A + goto Route110_TrickHousePuzzle5_EventScript_Mechadoll2Activate end -Route110_TrickHousePuzzle5_EventScript_26CC1F:: @ 826CC1F +Route110_TrickHousePuzzle5_EventScript_Mechadoll2Trigger1:: @ 826CC1F lockall setvar VAR_TEMP_9, 1 - goto Route110_TrickHousePuzzle5_EventScript_26CD6A + goto Route110_TrickHousePuzzle5_EventScript_Mechadoll2Activate end -Route110_TrickHousePuzzle5_EventScript_26CC2B:: @ 826CC2B +Route110_TrickHousePuzzle5_EventScript_Mechadoll2Trigger2:: @ 826CC2B lockall setvar VAR_TEMP_9, 2 - goto Route110_TrickHousePuzzle5_EventScript_26CD6A + goto Route110_TrickHousePuzzle5_EventScript_Mechadoll2Activate end -Route110_TrickHousePuzzle5_EventScript_26CC37:: @ 826CC37 +Route110_TrickHousePuzzle5_EventScript_Mechadoll2Trigger3:: @ 826CC37 lockall setvar VAR_TEMP_9, 3 - goto Route110_TrickHousePuzzle5_EventScript_26CD6A + goto Route110_TrickHousePuzzle5_EventScript_Mechadoll2Activate end -Route110_TrickHousePuzzle5_EventScript_26CC43:: @ 826CC43 +Route110_TrickHousePuzzle5_EventScript_Mechadoll2Trigger4:: @ 826CC43 lockall setvar VAR_TEMP_9, 4 - goto Route110_TrickHousePuzzle5_EventScript_26CD6A + goto Route110_TrickHousePuzzle5_EventScript_Mechadoll2Activate end -Route110_TrickHousePuzzle5_EventScript_26CC4F:: @ 826CC4F +Route110_TrickHousePuzzle5_EventScript_Mechadoll2Trigger5:: @ 826CC4F lockall setvar VAR_TEMP_9, 5 - goto Route110_TrickHousePuzzle5_EventScript_26CD6A + goto Route110_TrickHousePuzzle5_EventScript_Mechadoll2Activate end -Route110_TrickHousePuzzle5_EventScript_26CC5B:: @ 826CC5B +Route110_TrickHousePuzzle5_EventScript_Mechadoll3Trigger0:: @ 826CC5B lockall setvar VAR_TEMP_9, 0 - goto Route110_TrickHousePuzzle5_EventScript_26CDF4 + goto Route110_TrickHousePuzzle5_EventScript_Mechadoll3Activate end -Route110_TrickHousePuzzle5_EventScript_26CC67:: @ 826CC67 +Route110_TrickHousePuzzle5_EventScript_Mechadoll3Trigger1:: @ 826CC67 lockall setvar VAR_TEMP_9, 1 - goto Route110_TrickHousePuzzle5_EventScript_26CDF4 + goto Route110_TrickHousePuzzle5_EventScript_Mechadoll3Activate end -Route110_TrickHousePuzzle5_EventScript_26CC73:: @ 826CC73 +Route110_TrickHousePuzzle5_EventScript_Mechadoll3Trigger2:: @ 826CC73 lockall setvar VAR_TEMP_9, 2 - goto Route110_TrickHousePuzzle5_EventScript_26CDF4 + goto Route110_TrickHousePuzzle5_EventScript_Mechadoll3Activate end -Route110_TrickHousePuzzle5_EventScript_26CC7F:: @ 826CC7F +Route110_TrickHousePuzzle5_EventScript_Mechadoll3Trigger3:: @ 826CC7F lockall setvar VAR_TEMP_9, 3 - goto Route110_TrickHousePuzzle5_EventScript_26CDF4 + goto Route110_TrickHousePuzzle5_EventScript_Mechadoll3Activate end -Route110_TrickHousePuzzle5_EventScript_26CC8B:: @ 826CC8B +Route110_TrickHousePuzzle5_EventScript_Mechadoll3Trigger4:: @ 826CC8B lockall setvar VAR_TEMP_9, 4 - goto Route110_TrickHousePuzzle5_EventScript_26CDF4 + goto Route110_TrickHousePuzzle5_EventScript_Mechadoll3Activate end -Route110_TrickHousePuzzle5_EventScript_26CC97:: @ 826CC97 +Route110_TrickHousePuzzle5_EventScript_Mechadoll4Trigger0:: @ 826CC97 lockall setvar VAR_TEMP_9, 0 - goto Route110_TrickHousePuzzle5_EventScript_26CE73 + goto Route110_TrickHousePuzzle5_EventScript_Mechadoll4Activate end -Route110_TrickHousePuzzle5_EventScript_26CCA3:: @ 826CCA3 +Route110_TrickHousePuzzle5_EventScript_Mechadoll4Trigger1:: @ 826CCA3 lockall setvar VAR_TEMP_9, 1 - goto Route110_TrickHousePuzzle5_EventScript_26CE73 + goto Route110_TrickHousePuzzle5_EventScript_Mechadoll4Activate end -Route110_TrickHousePuzzle5_EventScript_26CCAF:: @ 826CCAF +Route110_TrickHousePuzzle5_EventScript_Mechadoll4Trigger2:: @ 826CCAF lockall setvar VAR_TEMP_9, 2 - goto Route110_TrickHousePuzzle5_EventScript_26CE73 + goto Route110_TrickHousePuzzle5_EventScript_Mechadoll4Activate end -Route110_TrickHousePuzzle5_EventScript_26CCBB:: @ 826CCBB +Route110_TrickHousePuzzle5_EventScript_Mechadoll4Trigger3:: @ 826CCBB lockall setvar VAR_TEMP_9, 3 - goto Route110_TrickHousePuzzle5_EventScript_26CE73 + goto Route110_TrickHousePuzzle5_EventScript_Mechadoll4Activate end -Route110_TrickHousePuzzle5_EventScript_26CCC7:: @ 826CCC7 +Route110_TrickHousePuzzle5_EventScript_Mechadoll4Trigger4:: @ 826CCC7 lockall setvar VAR_TEMP_9, 4 - goto Route110_TrickHousePuzzle5_EventScript_26CE73 + goto Route110_TrickHousePuzzle5_EventScript_Mechadoll4Activate end -Route110_TrickHousePuzzle5_EventScript_26CCD3:: @ 826CCD3 +@ Unused +Route110_TrickHousePuzzle5_EventScript_Mechadoll4Trigger5:: @ 826CCD3 lockall setvar VAR_TEMP_9, 5 - goto Route110_TrickHousePuzzle5_EventScript_26CE73 + goto Route110_TrickHousePuzzle5_EventScript_Mechadoll4Activate end -Route110_TrickHousePuzzle5_EventScript_26CCDF:: @ 826CCDF +Route110_TrickHousePuzzle5_EventScript_Mechadoll5Trigger0:: @ 826CCDF lockall setvar VAR_TEMP_9, 0 - goto Route110_TrickHousePuzzle5_EventScript_26CEF2 + goto Route110_TrickHousePuzzle5_EventScript_Mechadoll5Activate end -Route110_TrickHousePuzzle5_EventScript_26CCEB:: @ 826CCEB +Route110_TrickHousePuzzle5_EventScript_Mechadoll1Activate:: @ 826CCEB setvar VAR_TEMP_1, 1 setvar VAR_TEMP_8, 1 playse SE_PIN @@ -220,22 +221,22 @@ Route110_TrickHousePuzzle5_EventScript_26CCEB:: @ 826CCEB applymovement 1, Common_Movement_Delay48 waitmovement 0 compare VAR_TEMP_9, 1 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D1B4 + call_if_eq Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft1 compare VAR_TEMP_9, 2 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D1EC + call_if_eq Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft2 compare VAR_TEMP_9, 3 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D224 + call_if_eq Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft3 compare VAR_TEMP_9, 4 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D25C - msgbox Route110_TrickHousePuzzle5_Text_26D6CE, MSGBOX_DEFAULT + call_if_eq Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft4 + msgbox Route110_TrickHousePuzzle5_Text_Mechadoll1Intro, MSGBOX_DEFAULT random 3 switch VAR_RESULT - case 0, Route110_TrickHousePuzzle5_EventScript_26CF45 - case 1, Route110_TrickHousePuzzle5_EventScript_26CF68 - case 2, Route110_TrickHousePuzzle5_EventScript_26CF8B + case 0, Route110_TrickHousePuzzle5_EventScript_Mechadoll1Quiz1 + case 1, Route110_TrickHousePuzzle5_EventScript_Mechadoll1Quiz2 + case 2, Route110_TrickHousePuzzle5_EventScript_Mechadoll1Quiz3 end -Route110_TrickHousePuzzle5_EventScript_26CD6A:: @ 826CD6A +Route110_TrickHousePuzzle5_EventScript_Mechadoll2Activate:: @ 826CD6A setvar VAR_TEMP_2, 1 setvar VAR_TEMP_8, 2 playse SE_PIN @@ -244,24 +245,24 @@ Route110_TrickHousePuzzle5_EventScript_26CD6A:: @ 826CD6A applymovement 2, Common_Movement_Delay48 waitmovement 0 compare VAR_TEMP_9, 1 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D2CC + call_if_eq Route110_TrickHousePuzzle5_EventScript_MechadollWalkRight1 compare VAR_TEMP_9, 2 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D304 + call_if_eq Route110_TrickHousePuzzle5_EventScript_MechadollWalkRight2 compare VAR_TEMP_9, 3 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D33C + call_if_eq Route110_TrickHousePuzzle5_EventScript_MechadollWalkRight3 compare VAR_TEMP_9, 4 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D374 + call_if_eq Route110_TrickHousePuzzle5_EventScript_MechadollWalkRight4 compare VAR_TEMP_9, 5 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D3AC - msgbox Route110_TrickHousePuzzle5_Text_26D8EA, MSGBOX_DEFAULT + call_if_eq Route110_TrickHousePuzzle5_EventScript_MechadollWalkRight5 + msgbox Route110_TrickHousePuzzle5_Text_Mechadoll2Intro, MSGBOX_DEFAULT random 3 switch VAR_RESULT - case 0, Route110_TrickHousePuzzle5_EventScript_26CFAE - case 1, Route110_TrickHousePuzzle5_EventScript_26CFD1 - case 2, Route110_TrickHousePuzzle5_EventScript_26CFF4 + case 0, Route110_TrickHousePuzzle5_EventScript_Mechadoll2Quiz1 + case 1, Route110_TrickHousePuzzle5_EventScript_Mechadoll2Quiz2 + case 2, Route110_TrickHousePuzzle5_EventScript_Mechadoll2Quiz3 end -Route110_TrickHousePuzzle5_EventScript_26CDF4:: @ 826CDF4 +Route110_TrickHousePuzzle5_EventScript_Mechadoll3Activate:: @ 826CDF4 setvar VAR_TEMP_3, 1 setvar VAR_TEMP_8, 3 playse SE_PIN @@ -270,22 +271,22 @@ Route110_TrickHousePuzzle5_EventScript_26CDF4:: @ 826CDF4 applymovement 3, Common_Movement_Delay48 waitmovement 0 compare VAR_TEMP_9, 1 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D1B4 + call_if_eq Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft1 compare VAR_TEMP_9, 2 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D1EC + call_if_eq Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft2 compare VAR_TEMP_9, 3 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D224 + call_if_eq Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft3 compare VAR_TEMP_9, 4 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D25C - msgbox Route110_TrickHousePuzzle5_Text_26DA1E, MSGBOX_DEFAULT + call_if_eq Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft4 + msgbox Route110_TrickHousePuzzle5_Text_Mechadoll3Intro, MSGBOX_DEFAULT random 3 switch VAR_RESULT - case 0, Route110_TrickHousePuzzle5_EventScript_26D017 - case 1, Route110_TrickHousePuzzle5_EventScript_26D03A - case 2, Route110_TrickHousePuzzle5_EventScript_26D05D + case 0, Route110_TrickHousePuzzle5_EventScript_Mechadoll3Quiz1 + case 1, Route110_TrickHousePuzzle5_EventScript_Mechadoll3Quiz2 + case 2, Route110_TrickHousePuzzle5_EventScript_Mechadoll3Quiz3 end -Route110_TrickHousePuzzle5_EventScript_26CE73:: @ 826CE73 +Route110_TrickHousePuzzle5_EventScript_Mechadoll4Activate:: @ 826CE73 setvar VAR_TEMP_4, 1 setvar VAR_TEMP_8, 4 playse SE_PIN @@ -294,22 +295,22 @@ Route110_TrickHousePuzzle5_EventScript_26CE73:: @ 826CE73 applymovement 4, Common_Movement_Delay48 waitmovement 0 compare VAR_TEMP_9, 1 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D1B4 + call_if_eq Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft1 compare VAR_TEMP_9, 2 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D1EC + call_if_eq Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft2 compare VAR_TEMP_9, 3 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D224 + call_if_eq Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft3 compare VAR_TEMP_9, 4 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D25C - msgbox Route110_TrickHousePuzzle5_Text_26DB4C, MSGBOX_DEFAULT + call_if_eq Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft4 + msgbox Route110_TrickHousePuzzle5_Text_Mechadoll4Intro, MSGBOX_DEFAULT random 3 switch VAR_RESULT - case 0, Route110_TrickHousePuzzle5_EventScript_26D080 - case 1, Route110_TrickHousePuzzle5_EventScript_26D0A3 - case 2, Route110_TrickHousePuzzle5_EventScript_26D0C6 + case 0, Route110_TrickHousePuzzle5_EventScript_Mechadoll4Quiz1 + case 1, Route110_TrickHousePuzzle5_EventScript_Mechadoll4Quiz2 + case 2, Route110_TrickHousePuzzle5_EventScript_Mechadoll4Quiz3 end -Route110_TrickHousePuzzle5_EventScript_26CEF2:: @ 826CEF2 +Route110_TrickHousePuzzle5_EventScript_Mechadoll5Activate:: @ 826CEF2 setvar VAR_TEMP_5, 1 setvar VAR_TEMP_8, 5 playse SE_PIN @@ -317,567 +318,571 @@ Route110_TrickHousePuzzle5_EventScript_26CEF2:: @ 826CEF2 waitmovement 0 applymovement 5, Common_Movement_Delay48 waitmovement 0 - msgbox Route110_TrickHousePuzzle5_Text_26DC78, MSGBOX_DEFAULT + msgbox Route110_TrickHousePuzzle5_Text_Mechadoll5Intro, MSGBOX_DEFAULT random 3 switch VAR_RESULT - case 0, Route110_TrickHousePuzzle5_EventScript_26D0E9 - case 1, Route110_TrickHousePuzzle5_EventScript_26D10C - case 2, Route110_TrickHousePuzzle5_EventScript_26D12F + case 0, Route110_TrickHousePuzzle5_EventScript_Mechadoll5Quiz1 + case 1, Route110_TrickHousePuzzle5_EventScript_Mechadoll5Quiz2 + case 2, Route110_TrickHousePuzzle5_EventScript_Mechadoll5Quiz3 end -Route110_TrickHousePuzzle5_EventScript_26CF45:: @ 826CF45 - msgbox Route110_TrickHousePuzzle5_Text_26D757, MSGBOX_DEFAULT +Route110_TrickHousePuzzle5_EventScript_Mechadoll1Quiz1:: @ 826CF45 + msgbox Route110_TrickHousePuzzle5_Text_Mechadoll1Quiz1, MSGBOX_DEFAULT multichoice 0, 0, MULTI_MECHADOLL1_Q1, 1 switch VAR_RESULT - case 2, Route110_TrickHousePuzzle5_EventScript_26D1A0 - goto Route110_TrickHousePuzzle5_EventScript_26D152 + case 2, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer + goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer end -Route110_TrickHousePuzzle5_EventScript_26CF68:: @ 826CF68 - msgbox Route110_TrickHousePuzzle5_Text_26D7AA, MSGBOX_DEFAULT +Route110_TrickHousePuzzle5_EventScript_Mechadoll1Quiz2:: @ 826CF68 + msgbox Route110_TrickHousePuzzle5_Text_Mechadoll1Quiz2, MSGBOX_DEFAULT multichoice 0, 0, MULTI_MECHADOLL1_Q2, 1 switch VAR_RESULT - case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0 - goto Route110_TrickHousePuzzle5_EventScript_26D152 + case 0, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer + goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer end -Route110_TrickHousePuzzle5_EventScript_26CF8B:: @ 826CF8B - msgbox Route110_TrickHousePuzzle5_Text_26D7FC, MSGBOX_DEFAULT +Route110_TrickHousePuzzle5_EventScript_Mechadoll1Quiz3:: @ 826CF8B + msgbox Route110_TrickHousePuzzle5_Text_Mechadoll1Quiz3, MSGBOX_DEFAULT multichoice 0, 0, MULTI_MECHADOLL1_Q3, 1 switch VAR_RESULT - case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0 - goto Route110_TrickHousePuzzle5_EventScript_26D152 + case 0, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer + goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer end -Route110_TrickHousePuzzle5_EventScript_26CFAE:: @ 826CFAE - msgbox Route110_TrickHousePuzzle5_Text_26D940, MSGBOX_DEFAULT +Route110_TrickHousePuzzle5_EventScript_Mechadoll2Quiz1:: @ 826CFAE + msgbox Route110_TrickHousePuzzle5_Text_Mechadoll2Quiz1, MSGBOX_DEFAULT multichoice 0, 0, MULTI_MECHADOLL2_Q1, 1 switch VAR_RESULT - case 1, Route110_TrickHousePuzzle5_EventScript_26D1A0 - goto Route110_TrickHousePuzzle5_EventScript_26D152 + case 1, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer + goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer end -Route110_TrickHousePuzzle5_EventScript_26CFD1:: @ 826CFD1 - msgbox Route110_TrickHousePuzzle5_Text_26D98C, MSGBOX_DEFAULT +Route110_TrickHousePuzzle5_EventScript_Mechadoll2Quiz2:: @ 826CFD1 + msgbox Route110_TrickHousePuzzle5_Text_Mechadoll2Quiz2, MSGBOX_DEFAULT multichoice 0, 0, MULTI_MECHADOLL2_Q2, 1 switch VAR_RESULT - case 2, Route110_TrickHousePuzzle5_EventScript_26D1A0 - goto Route110_TrickHousePuzzle5_EventScript_26D152 + case 2, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer + goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer end -Route110_TrickHousePuzzle5_EventScript_26CFF4:: @ 826CFF4 - msgbox Route110_TrickHousePuzzle5_Text_26D9CE, MSGBOX_DEFAULT +Route110_TrickHousePuzzle5_EventScript_Mechadoll2Quiz3:: @ 826CFF4 + msgbox Route110_TrickHousePuzzle5_Text_Mechadoll2Quiz3, MSGBOX_DEFAULT multichoice 0, 0, MULTI_MECHADOLL2_Q3, 1 switch VAR_RESULT - case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0 - goto Route110_TrickHousePuzzle5_EventScript_26D152 + case 0, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer + goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer end -Route110_TrickHousePuzzle5_EventScript_26D017:: @ 826D017 - msgbox Route110_TrickHousePuzzle5_Text_26DA64, MSGBOX_DEFAULT +Route110_TrickHousePuzzle5_EventScript_Mechadoll3Quiz1:: @ 826D017 + msgbox Route110_TrickHousePuzzle5_Text_Mechadoll3Quiz1, MSGBOX_DEFAULT multichoice 0, 0, MULTI_MECHADOLL3_Q1, 1 switch VAR_RESULT - case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0 - goto Route110_TrickHousePuzzle5_EventScript_26D152 + case 0, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer + goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer end -Route110_TrickHousePuzzle5_EventScript_26D03A:: @ 826D03A - msgbox Route110_TrickHousePuzzle5_Text_26DAAD, MSGBOX_DEFAULT +Route110_TrickHousePuzzle5_EventScript_Mechadoll3Quiz2:: @ 826D03A + msgbox Route110_TrickHousePuzzle5_Text_Mechadoll3Quiz2, MSGBOX_DEFAULT multichoice 0, 0, MULTI_MECHADOLL3_Q2, 1 switch VAR_RESULT - case 2, Route110_TrickHousePuzzle5_EventScript_26D1A0 - goto Route110_TrickHousePuzzle5_EventScript_26D152 + case 2, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer + goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer end -Route110_TrickHousePuzzle5_EventScript_26D05D:: @ 826D05D - msgbox Route110_TrickHousePuzzle5_Text_26DAFF, MSGBOX_DEFAULT +Route110_TrickHousePuzzle5_EventScript_Mechadoll3Quiz3:: @ 826D05D + msgbox Route110_TrickHousePuzzle5_Text_Mechadoll3Quiz3, MSGBOX_DEFAULT multichoice 0, 0, MULTI_MECHADOLL3_Q3, 1 switch VAR_RESULT - case 1, Route110_TrickHousePuzzle5_EventScript_26D1A0 - goto Route110_TrickHousePuzzle5_EventScript_26D152 + case 1, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer + goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer end -Route110_TrickHousePuzzle5_EventScript_26D080:: @ 826D080 - msgbox Route110_TrickHousePuzzle5_Text_26DB94, MSGBOX_DEFAULT +Route110_TrickHousePuzzle5_EventScript_Mechadoll4Quiz1:: @ 826D080 + msgbox Route110_TrickHousePuzzle5_Text_Mechadoll4Quiz1, MSGBOX_DEFAULT multichoice 0, 0, MULTI_MECHADOLL4_Q1, 1 switch VAR_RESULT - case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0 - goto Route110_TrickHousePuzzle5_EventScript_26D152 + case 0, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer + goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer end -Route110_TrickHousePuzzle5_EventScript_26D0A3:: @ 826D0A3 - msgbox Route110_TrickHousePuzzle5_Text_26DBD7, MSGBOX_DEFAULT +Route110_TrickHousePuzzle5_EventScript_Mechadoll4Quiz2:: @ 826D0A3 + msgbox Route110_TrickHousePuzzle5_Text_Mechadoll4Quiz2, MSGBOX_DEFAULT multichoice 0, 0, MULTI_MECHADOLL4_Q2, 1 switch VAR_RESULT - case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0 - goto Route110_TrickHousePuzzle5_EventScript_26D152 + case 0, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer + goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer end -Route110_TrickHousePuzzle5_EventScript_26D0C6:: @ 826D0C6 - msgbox Route110_TrickHousePuzzle5_Text_26DC2A, MSGBOX_DEFAULT +Route110_TrickHousePuzzle5_EventScript_Mechadoll4Quiz3:: @ 826D0C6 + msgbox Route110_TrickHousePuzzle5_Text_Mechadoll4Quiz3, MSGBOX_DEFAULT multichoice 0, 0, MULTI_MECHADOLL4_Q3, 1 switch VAR_RESULT - case 1, Route110_TrickHousePuzzle5_EventScript_26D1A0 - goto Route110_TrickHousePuzzle5_EventScript_26D152 + case 1, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer + goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer end -Route110_TrickHousePuzzle5_EventScript_26D0E9:: @ 826D0E9 - msgbox Route110_TrickHousePuzzle5_Text_26DCCB, MSGBOX_DEFAULT +Route110_TrickHousePuzzle5_EventScript_Mechadoll5Quiz1:: @ 826D0E9 + msgbox Route110_TrickHousePuzzle5_Text_Mechadoll5Quiz1, MSGBOX_DEFAULT multichoice 0, 0, MULTI_MECHADOLL5_Q1, 1 switch VAR_RESULT - case 1, Route110_TrickHousePuzzle5_EventScript_26D1A0 - goto Route110_TrickHousePuzzle5_EventScript_26D152 + case 1, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer + goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer end -Route110_TrickHousePuzzle5_EventScript_26D10C:: @ 826D10C - msgbox Route110_TrickHousePuzzle5_Text_26DD1B, MSGBOX_DEFAULT +Route110_TrickHousePuzzle5_EventScript_Mechadoll5Quiz2:: @ 826D10C + msgbox Route110_TrickHousePuzzle5_Text_Mechadoll5Quiz2, MSGBOX_DEFAULT multichoice 0, 0, MULTI_MECHADOLL5_Q2, 1 switch VAR_RESULT - case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0 - goto Route110_TrickHousePuzzle5_EventScript_26D152 + case 0, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer + goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer end -Route110_TrickHousePuzzle5_EventScript_26D12F:: @ 826D12F - msgbox Route110_TrickHousePuzzle5_Text_26DD5F, MSGBOX_DEFAULT +Route110_TrickHousePuzzle5_EventScript_Mechadoll5Quiz3:: @ 826D12F + msgbox Route110_TrickHousePuzzle5_Text_Mechadoll5Quiz3, MSGBOX_DEFAULT multichoice 0, 0, MULTI_MECHADOLL5_Q3, 1 switch VAR_RESULT - case 2, Route110_TrickHousePuzzle5_EventScript_26D1A0 - goto Route110_TrickHousePuzzle5_EventScript_26D152 + case 2, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer + goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer end -Route110_TrickHousePuzzle5_EventScript_26D152:: @ 826D152 +Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer:: @ 826D152 waitse playse SE_HAZURE - msgbox Route110_TrickHousePuzzle5_Text_26D883, MSGBOX_DEFAULT - applymovement 1, Route110_TrickHousePuzzle5_Movement_26D632 - applymovement 2, Route110_TrickHousePuzzle5_Movement_26D632 - applymovement 3, Route110_TrickHousePuzzle5_Movement_26D632 - applymovement 4, Route110_TrickHousePuzzle5_Movement_26D632 - applymovement 5, Route110_TrickHousePuzzle5_Movement_26D632 - msgbox Route110_TrickHousePuzzle5_Text_26D8A1, MSGBOX_DEFAULT + msgbox Route110_TrickHousePuzzle5_Text_DisappointmentError, MSGBOX_DEFAULT + applymovement 1, Route110_TrickHousePuzzle5_Movement_MechadollShake + applymovement 2, Route110_TrickHousePuzzle5_Movement_MechadollShake + applymovement 3, Route110_TrickHousePuzzle5_Movement_MechadollShake + applymovement 4, Route110_TrickHousePuzzle5_Movement_MechadollShake + applymovement 5, Route110_TrickHousePuzzle5_Movement_MechadollShake + msgbox Route110_TrickHousePuzzle5_Text_Wahahahaha, MSGBOX_DEFAULT waitmovement 0 - msgbox Route110_TrickHousePuzzle5_Text_26D8C9, MSGBOX_DEFAULT + msgbox Route110_TrickHousePuzzle5_Text_WaitForNextChallenge, MSGBOX_DEFAULT closemessage warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE5, 255, 0, 21 waitstate releaseall end -Route110_TrickHousePuzzle5_EventScript_26D1A0:: @ 826D1A0 +Route110_TrickHousePuzzle5_EventScript_CorrectAnswer:: @ 826D1A0 waitse playse SE_SEIKAI - goto Route110_TrickHousePuzzle5_EventScript_26D1AA + goto Route110_TrickHousePuzzle5_EventScript_CorrectGoThrough end -Route110_TrickHousePuzzle5_EventScript_26D1AA:: @ 826D1AA - msgbox Route110_TrickHousePuzzle5_Text_26D84D, MSGBOX_DEFAULT +Route110_TrickHousePuzzle5_EventScript_CorrectGoThrough:: @ 826D1AA + msgbox Route110_TrickHousePuzzle5_Text_CorrectGoThrough, MSGBOX_DEFAULT releaseall end -Route110_TrickHousePuzzle5_EventScript_26D1B4:: @ 826D1B4 +@ Absurd redundancy in movement scripts that could be resolved by using VAR_TEMP_8 for applymovement instead +@ Many of the below movement scripts arent even used, see below +@ Mechadoll 2 is the only mechadoll to walk right, all the other WalkRight scripts are unused +@ Mechadoll 5 never walks, all the Mechadoll5Walk scripts are unused +@ No mechadoll walks left 5 paces, all the WalkLeft5 scripts are unused +Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft1:: @ 826D1B4 compare VAR_TEMP_8, 1 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D3E4 + call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkLeft1 compare VAR_TEMP_8, 2 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D3EF + call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkLeft1 compare VAR_TEMP_8, 3 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D3FA + call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkLeft1 compare VAR_TEMP_8, 4 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D405 + call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkLeft1 compare VAR_TEMP_8, 5 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D410 + call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkLeft1 return -Route110_TrickHousePuzzle5_EventScript_26D1EC:: @ 826D1EC +Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft2:: @ 826D1EC compare VAR_TEMP_8, 1 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D41B + call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkLeft2 compare VAR_TEMP_8, 2 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D426 + call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkLeft2 compare VAR_TEMP_8, 3 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D431 + call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkLeft2 compare VAR_TEMP_8, 4 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D43C + call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkLeft2 compare VAR_TEMP_8, 5 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D447 + call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkLeft2 return -Route110_TrickHousePuzzle5_EventScript_26D224:: @ 826D224 +Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft3:: @ 826D224 compare VAR_TEMP_8, 1 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D452 + call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkLeft3 compare VAR_TEMP_8, 2 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D45D + call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkLeft3 compare VAR_TEMP_8, 3 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D468 + call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkLeft3 compare VAR_TEMP_8, 4 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D473 + call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkLeft3 compare VAR_TEMP_8, 5 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D47E + call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkLeft3 return -Route110_TrickHousePuzzle5_EventScript_26D25C:: @ 826D25C +Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft4:: @ 826D25C compare VAR_TEMP_8, 1 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D489 + call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkLeft4 compare VAR_TEMP_8, 2 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D494 + call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkLeft4 compare VAR_TEMP_8, 3 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D49F + call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkLeft4 compare VAR_TEMP_8, 4 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D4AA + call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkLeft4 compare VAR_TEMP_8, 5 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D4B5 + call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkLeft4 return -Route110_TrickHousePuzzle5_EventScript_26D294:: @ 826D294 +Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft5:: @ 826D294 compare VAR_TEMP_8, 1 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D4C0 + call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkLeft5 compare VAR_TEMP_8, 2 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D4CB + call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkLeft5 compare VAR_TEMP_8, 3 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D4D6 + call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkLeft5 compare VAR_TEMP_8, 4 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D4E1 + call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkLeft5 compare VAR_TEMP_8, 5 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D4EC + call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkLeft5 return -Route110_TrickHousePuzzle5_EventScript_26D2CC:: @ 826D2CC +Route110_TrickHousePuzzle5_EventScript_MechadollWalkRight1:: @ 826D2CC compare VAR_TEMP_8, 1 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D4F7 + call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkRight1 compare VAR_TEMP_8, 2 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D502 + call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkRight1 compare VAR_TEMP_8, 3 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D50D + call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkRight1 compare VAR_TEMP_8, 4 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D518 + call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkRight1 compare VAR_TEMP_8, 5 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D523 + call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkRight1 return -Route110_TrickHousePuzzle5_EventScript_26D304:: @ 826D304 +Route110_TrickHousePuzzle5_EventScript_MechadollWalkRight2:: @ 826D304 compare VAR_TEMP_8, 1 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D52E + call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkRight2 compare VAR_TEMP_8, 2 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D539 + call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkRight2 compare VAR_TEMP_8, 3 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D544 + call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkRight2 compare VAR_TEMP_8, 4 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D54F + call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkRight2 compare VAR_TEMP_8, 5 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D55A + call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkRight2 return -Route110_TrickHousePuzzle5_EventScript_26D33C:: @ 826D33C +Route110_TrickHousePuzzle5_EventScript_MechadollWalkRight3:: @ 826D33C compare VAR_TEMP_8, 1 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D565 + call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkRight3 compare VAR_TEMP_8, 2 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D570 + call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkRight3 compare VAR_TEMP_8, 3 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D57B + call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkRight3 compare VAR_TEMP_8, 4 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D586 + call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkRight3 compare VAR_TEMP_8, 5 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D591 + call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkRight3 return -Route110_TrickHousePuzzle5_EventScript_26D374:: @ 826D374 +Route110_TrickHousePuzzle5_EventScript_MechadollWalkRight4:: @ 826D374 compare VAR_TEMP_8, 1 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D59C + call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkRight4 compare VAR_TEMP_8, 2 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D5A7 + call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkRight4 compare VAR_TEMP_8, 3 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D5B2 + call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkRight4 compare VAR_TEMP_8, 4 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D5BD + call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkRight4 compare VAR_TEMP_8, 5 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D5C8 + call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkRight4 return -Route110_TrickHousePuzzle5_EventScript_26D3AC:: @ 826D3AC +Route110_TrickHousePuzzle5_EventScript_MechadollWalkRight5:: @ 826D3AC compare VAR_TEMP_8, 1 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D5D3 + call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkRight5 compare VAR_TEMP_8, 2 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D5DE + call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkRight5 compare VAR_TEMP_8, 3 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D5E9 + call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkRight5 compare VAR_TEMP_8, 4 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D5F4 + call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkRight5 compare VAR_TEMP_8, 5 - call_if_eq Route110_TrickHousePuzzle5_EventScript_26D5FF + call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkRight5 return -Route110_TrickHousePuzzle5_EventScript_26D3E4:: @ 826D3E4 - applymovement 1, Route110_TrickHousePuzzle5_Movement_26D60A +Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkLeft1:: @ 826D3E4 + applymovement 1, Route110_TrickHousePuzzle5_Movement_WalkLeft1 waitmovement 0 return -Route110_TrickHousePuzzle5_EventScript_26D3EF:: @ 826D3EF - applymovement 2, Route110_TrickHousePuzzle5_Movement_26D60A +Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkLeft1:: @ 826D3EF + applymovement 2, Route110_TrickHousePuzzle5_Movement_WalkLeft1 waitmovement 0 return -Route110_TrickHousePuzzle5_EventScript_26D3FA:: @ 826D3FA - applymovement 3, Route110_TrickHousePuzzle5_Movement_26D60A +Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkLeft1:: @ 826D3FA + applymovement 3, Route110_TrickHousePuzzle5_Movement_WalkLeft1 waitmovement 0 return -Route110_TrickHousePuzzle5_EventScript_26D405:: @ 826D405 - applymovement 4, Route110_TrickHousePuzzle5_Movement_26D60A +Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkLeft1:: @ 826D405 + applymovement 4, Route110_TrickHousePuzzle5_Movement_WalkLeft1 waitmovement 0 return -Route110_TrickHousePuzzle5_EventScript_26D410:: @ 826D410 - applymovement 5, Route110_TrickHousePuzzle5_Movement_26D60A +Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkLeft1:: @ 826D410 + applymovement 5, Route110_TrickHousePuzzle5_Movement_WalkLeft1 waitmovement 0 return -Route110_TrickHousePuzzle5_EventScript_26D41B:: @ 826D41B - applymovement 1, Route110_TrickHousePuzzle5_Movement_26D60C +Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkLeft2:: @ 826D41B + applymovement 1, Route110_TrickHousePuzzle5_Movement_WalkLeft2 waitmovement 0 return -Route110_TrickHousePuzzle5_EventScript_26D426:: @ 826D426 - applymovement 2, Route110_TrickHousePuzzle5_Movement_26D60C +Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkLeft2:: @ 826D426 + applymovement 2, Route110_TrickHousePuzzle5_Movement_WalkLeft2 waitmovement 0 return -Route110_TrickHousePuzzle5_EventScript_26D431:: @ 826D431 - applymovement 3, Route110_TrickHousePuzzle5_Movement_26D60C +Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkLeft2:: @ 826D431 + applymovement 3, Route110_TrickHousePuzzle5_Movement_WalkLeft2 waitmovement 0 return -Route110_TrickHousePuzzle5_EventScript_26D43C:: @ 826D43C - applymovement 4, Route110_TrickHousePuzzle5_Movement_26D60C +Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkLeft2:: @ 826D43C + applymovement 4, Route110_TrickHousePuzzle5_Movement_WalkLeft2 waitmovement 0 return -Route110_TrickHousePuzzle5_EventScript_26D447:: @ 826D447 - applymovement 5, Route110_TrickHousePuzzle5_Movement_26D60C +Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkLeft2:: @ 826D447 + applymovement 5, Route110_TrickHousePuzzle5_Movement_WalkLeft2 waitmovement 0 return -Route110_TrickHousePuzzle5_EventScript_26D452:: @ 826D452 - applymovement 1, Route110_TrickHousePuzzle5_Movement_26D60F +Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkLeft3:: @ 826D452 + applymovement 1, Route110_TrickHousePuzzle5_Movement_WalkLeft3 waitmovement 0 return -Route110_TrickHousePuzzle5_EventScript_26D45D:: @ 826D45D - applymovement 2, Route110_TrickHousePuzzle5_Movement_26D60F +Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkLeft3:: @ 826D45D + applymovement 2, Route110_TrickHousePuzzle5_Movement_WalkLeft3 waitmovement 0 return -Route110_TrickHousePuzzle5_EventScript_26D468:: @ 826D468 - applymovement 3, Route110_TrickHousePuzzle5_Movement_26D60F +Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkLeft3:: @ 826D468 + applymovement 3, Route110_TrickHousePuzzle5_Movement_WalkLeft3 waitmovement 0 return -Route110_TrickHousePuzzle5_EventScript_26D473:: @ 826D473 - applymovement 4, Route110_TrickHousePuzzle5_Movement_26D60F +Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkLeft3:: @ 826D473 + applymovement 4, Route110_TrickHousePuzzle5_Movement_WalkLeft3 waitmovement 0 return -Route110_TrickHousePuzzle5_EventScript_26D47E:: @ 826D47E - applymovement 5, Route110_TrickHousePuzzle5_Movement_26D60F +Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkLeft3:: @ 826D47E + applymovement 5, Route110_TrickHousePuzzle5_Movement_WalkLeft3 waitmovement 0 return -Route110_TrickHousePuzzle5_EventScript_26D489:: @ 826D489 - applymovement 1, Route110_TrickHousePuzzle5_Movement_26D613 +Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkLeft4:: @ 826D489 + applymovement 1, Route110_TrickHousePuzzle5_Movement_WalkLeft4 waitmovement 0 return -Route110_TrickHousePuzzle5_EventScript_26D494:: @ 826D494 - applymovement 2, Route110_TrickHousePuzzle5_Movement_26D613 +Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkLeft4:: @ 826D494 + applymovement 2, Route110_TrickHousePuzzle5_Movement_WalkLeft4 waitmovement 0 return -Route110_TrickHousePuzzle5_EventScript_26D49F:: @ 826D49F - applymovement 3, Route110_TrickHousePuzzle5_Movement_26D613 +Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkLeft4:: @ 826D49F + applymovement 3, Route110_TrickHousePuzzle5_Movement_WalkLeft4 waitmovement 0 return -Route110_TrickHousePuzzle5_EventScript_26D4AA:: @ 826D4AA - applymovement 4, Route110_TrickHousePuzzle5_Movement_26D613 +Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkLeft4:: @ 826D4AA + applymovement 4, Route110_TrickHousePuzzle5_Movement_WalkLeft4 waitmovement 0 return -Route110_TrickHousePuzzle5_EventScript_26D4B5:: @ 826D4B5 - applymovement 5, Route110_TrickHousePuzzle5_Movement_26D613 +Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkLeft4:: @ 826D4B5 + applymovement 5, Route110_TrickHousePuzzle5_Movement_WalkLeft4 waitmovement 0 return -Route110_TrickHousePuzzle5_EventScript_26D4C0:: @ 826D4C0 - applymovement 1, Movement_26D618 +Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkLeft5:: @ 826D4C0 + applymovement 1, Route110_TrickHousePuzzle5_Movement_WalkLeft5 waitmovement 0 return -Route110_TrickHousePuzzle5_EventScript_26D4CB:: @ 826D4CB - applymovement 2, Movement_26D618 +Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkLeft5:: @ 826D4CB + applymovement 2, Route110_TrickHousePuzzle5_Movement_WalkLeft5 waitmovement 0 return -Route110_TrickHousePuzzle5_EventScript_26D4D6:: @ 826D4D6 - applymovement 3, Movement_26D618 +Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkLeft5:: @ 826D4D6 + applymovement 3, Route110_TrickHousePuzzle5_Movement_WalkLeft5 waitmovement 0 return -Route110_TrickHousePuzzle5_EventScript_26D4E1:: @ 826D4E1 - applymovement 4, Movement_26D618 +Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkLeft5:: @ 826D4E1 + applymovement 4, Route110_TrickHousePuzzle5_Movement_WalkLeft5 waitmovement 0 return -Route110_TrickHousePuzzle5_EventScript_26D4EC:: @ 826D4EC - applymovement 5, Movement_26D618 +Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkLeft5:: @ 826D4EC + applymovement 5, Route110_TrickHousePuzzle5_Movement_WalkLeft5 waitmovement 0 return -Route110_TrickHousePuzzle5_EventScript_26D4F7:: @ 826D4F7 - applymovement 1, Route110_TrickHousePuzzle5_Movement_26D61E +Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkRight1:: @ 826D4F7 + applymovement 1, Route110_TrickHousePuzzle5_Movement_WalkRight1 waitmovement 0 return -Route110_TrickHousePuzzle5_EventScript_26D502:: @ 826D502 - applymovement 2, Route110_TrickHousePuzzle5_Movement_26D61E +Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkRight1:: @ 826D502 + applymovement 2, Route110_TrickHousePuzzle5_Movement_WalkRight1 waitmovement 0 return -Route110_TrickHousePuzzle5_EventScript_26D50D:: @ 826D50D - applymovement 3, Route110_TrickHousePuzzle5_Movement_26D61E +Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkRight1:: @ 826D50D + applymovement 3, Route110_TrickHousePuzzle5_Movement_WalkRight1 waitmovement 0 return -Route110_TrickHousePuzzle5_EventScript_26D518:: @ 826D518 - applymovement 4, Route110_TrickHousePuzzle5_Movement_26D61E +Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkRight1:: @ 826D518 + applymovement 4, Route110_TrickHousePuzzle5_Movement_WalkRight1 waitmovement 0 return -Route110_TrickHousePuzzle5_EventScript_26D523:: @ 826D523 - applymovement 5, Route110_TrickHousePuzzle5_Movement_26D61E +Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkRight1:: @ 826D523 + applymovement 5, Route110_TrickHousePuzzle5_Movement_WalkRight1 waitmovement 0 return -Route110_TrickHousePuzzle5_EventScript_26D52E:: @ 826D52E - applymovement 1, Route110_TrickHousePuzzle5_Movement_26D620 +Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkRight2:: @ 826D52E + applymovement 1, Route110_TrickHousePuzzle5_Movement_WalkRight2 waitmovement 0 return -Route110_TrickHousePuzzle5_EventScript_26D539:: @ 826D539 - applymovement 2, Route110_TrickHousePuzzle5_Movement_26D620 +Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkRight2:: @ 826D539 + applymovement 2, Route110_TrickHousePuzzle5_Movement_WalkRight2 waitmovement 0 return -Route110_TrickHousePuzzle5_EventScript_26D544:: @ 826D544 - applymovement 3, Route110_TrickHousePuzzle5_Movement_26D620 +Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkRight2:: @ 826D544 + applymovement 3, Route110_TrickHousePuzzle5_Movement_WalkRight2 waitmovement 0 return -Route110_TrickHousePuzzle5_EventScript_26D54F:: @ 826D54F - applymovement 4, Route110_TrickHousePuzzle5_Movement_26D620 +Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkRight2:: @ 826D54F + applymovement 4, Route110_TrickHousePuzzle5_Movement_WalkRight2 waitmovement 0 return -Route110_TrickHousePuzzle5_EventScript_26D55A:: @ 826D55A - applymovement 5, Route110_TrickHousePuzzle5_Movement_26D620 +Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkRight2:: @ 826D55A + applymovement 5, Route110_TrickHousePuzzle5_Movement_WalkRight2 waitmovement 0 return -Route110_TrickHousePuzzle5_EventScript_26D565:: @ 826D565 - applymovement 1, Route110_TrickHousePuzzle5_Movement_26D623 +Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkRight3:: @ 826D565 + applymovement 1, Route110_TrickHousePuzzle5_Movement_WalkRight3 waitmovement 0 return -Route110_TrickHousePuzzle5_EventScript_26D570:: @ 826D570 - applymovement 2, Route110_TrickHousePuzzle5_Movement_26D623 +Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkRight3:: @ 826D570 + applymovement 2, Route110_TrickHousePuzzle5_Movement_WalkRight3 waitmovement 0 return -Route110_TrickHousePuzzle5_EventScript_26D57B:: @ 826D57B - applymovement 3, Route110_TrickHousePuzzle5_Movement_26D623 +Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkRight3:: @ 826D57B + applymovement 3, Route110_TrickHousePuzzle5_Movement_WalkRight3 waitmovement 0 return -Route110_TrickHousePuzzle5_EventScript_26D586:: @ 826D586 - applymovement 4, Route110_TrickHousePuzzle5_Movement_26D623 +Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkRight3:: @ 826D586 + applymovement 4, Route110_TrickHousePuzzle5_Movement_WalkRight3 waitmovement 0 return -Route110_TrickHousePuzzle5_EventScript_26D591:: @ 826D591 - applymovement 5, Route110_TrickHousePuzzle5_Movement_26D623 +Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkRight3:: @ 826D591 + applymovement 5, Route110_TrickHousePuzzle5_Movement_WalkRight3 waitmovement 0 return -Route110_TrickHousePuzzle5_EventScript_26D59C:: @ 826D59C - applymovement 1, Route110_TrickHousePuzzle5_Movement_26D627 +Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkRight4:: @ 826D59C + applymovement 1, Route110_TrickHousePuzzle5_Movement_WalkRight4 waitmovement 0 return -Route110_TrickHousePuzzle5_EventScript_26D5A7:: @ 826D5A7 - applymovement 2, Route110_TrickHousePuzzle5_Movement_26D627 +Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkRight4:: @ 826D5A7 + applymovement 2, Route110_TrickHousePuzzle5_Movement_WalkRight4 waitmovement 0 return -Route110_TrickHousePuzzle5_EventScript_26D5B2:: @ 826D5B2 - applymovement 3, Route110_TrickHousePuzzle5_Movement_26D627 +Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkRight4:: @ 826D5B2 + applymovement 3, Route110_TrickHousePuzzle5_Movement_WalkRight4 waitmovement 0 return -Route110_TrickHousePuzzle5_EventScript_26D5BD:: @ 826D5BD - applymovement 4, Route110_TrickHousePuzzle5_Movement_26D627 +Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkRight4:: @ 826D5BD + applymovement 4, Route110_TrickHousePuzzle5_Movement_WalkRight4 waitmovement 0 return -Route110_TrickHousePuzzle5_EventScript_26D5C8:: @ 826D5C8 - applymovement 5, Route110_TrickHousePuzzle5_Movement_26D627 +Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkRight4:: @ 826D5C8 + applymovement 5, Route110_TrickHousePuzzle5_Movement_WalkRight4 waitmovement 0 return -Route110_TrickHousePuzzle5_EventScript_26D5D3:: @ 826D5D3 - applymovement 1, Route110_TrickHousePuzzle5_Movement_26D62C +Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkRight5:: @ 826D5D3 + applymovement 1, Route110_TrickHousePuzzle5_Movement_WalkRight5 waitmovement 0 return -Route110_TrickHousePuzzle5_EventScript_26D5DE:: @ 826D5DE - applymovement 2, Route110_TrickHousePuzzle5_Movement_26D62C +Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkRight5:: @ 826D5DE + applymovement 2, Route110_TrickHousePuzzle5_Movement_WalkRight5 waitmovement 0 return -Route110_TrickHousePuzzle5_EventScript_26D5E9:: @ 826D5E9 - applymovement 3, Route110_TrickHousePuzzle5_Movement_26D62C +Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkRight5:: @ 826D5E9 + applymovement 3, Route110_TrickHousePuzzle5_Movement_WalkRight5 waitmovement 0 return -Route110_TrickHousePuzzle5_EventScript_26D5F4:: @ 826D5F4 - applymovement 4, Route110_TrickHousePuzzle5_Movement_26D62C +Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkRight5:: @ 826D5F4 + applymovement 4, Route110_TrickHousePuzzle5_Movement_WalkRight5 waitmovement 0 return -Route110_TrickHousePuzzle5_EventScript_26D5FF:: @ 826D5FF - applymovement 5, Route110_TrickHousePuzzle5_Movement_26D62C +Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkRight5:: @ 826D5FF + applymovement 5, Route110_TrickHousePuzzle5_Movement_WalkRight5 waitmovement 0 return -Route110_TrickHousePuzzle5_Movement_26D60A: @ 826D60A +Route110_TrickHousePuzzle5_Movement_WalkLeft1: @ 826D60A walk_left step_end -Route110_TrickHousePuzzle5_Movement_26D60C: @ 826D60C +Route110_TrickHousePuzzle5_Movement_WalkLeft2: @ 826D60C walk_left walk_left step_end -Route110_TrickHousePuzzle5_Movement_26D60F: @ 826D60F +Route110_TrickHousePuzzle5_Movement_WalkLeft3: @ 826D60F walk_left walk_left walk_left step_end -Route110_TrickHousePuzzle5_Movement_26D613: @ 826D613 +Route110_TrickHousePuzzle5_Movement_WalkLeft4: @ 826D613 walk_left walk_left walk_left walk_left step_end - -Movement_26D618: @ 826D618 +Route110_TrickHousePuzzle5_Movement_WalkLeft5: @ 826D618 walk_left walk_left walk_left @@ -885,29 +890,29 @@ Movement_26D618: @ 826D618 walk_left step_end -Route110_TrickHousePuzzle5_Movement_26D61E: @ 826D61E +Route110_TrickHousePuzzle5_Movement_WalkRight1: @ 826D61E walk_right step_end -Route110_TrickHousePuzzle5_Movement_26D620: @ 826D620 +Route110_TrickHousePuzzle5_Movement_WalkRight2: @ 826D620 walk_right walk_right step_end -Route110_TrickHousePuzzle5_Movement_26D623: @ 826D623 +Route110_TrickHousePuzzle5_Movement_WalkRight3: @ 826D623 walk_right walk_right walk_right step_end -Route110_TrickHousePuzzle5_Movement_26D627: @ 826D627 +Route110_TrickHousePuzzle5_Movement_WalkRight4: @ 826D627 walk_right walk_right walk_right walk_right step_end -Route110_TrickHousePuzzle5_Movement_26D62C: @ 826D62C +Route110_TrickHousePuzzle5_Movement_WalkRight5: @ 826D62C walk_right walk_right walk_right @@ -915,8 +920,7 @@ Route110_TrickHousePuzzle5_Movement_26D62C: @ 826D62C walk_right step_end -Route110_TrickHouseEntrance_Movement_26D632: @ 826D632 -Route110_TrickHousePuzzle5_Movement_26D632: @ 826D632 +Route110_TrickHousePuzzle5_Movement_MechadollShake: @ 826D632 face_left delay_2 face_right @@ -964,128 +968,128 @@ Route110_TrickHousePuzzle5_Movement_26D632: @ 826D632 face_down step_end -Route110_TrickHousePuzzle5_Text_26D660: @ 826D660 +Route110_TrickHousePuzzle5_Text_WroteSecretCodeLockOpened: @ 826D660 .string "{PLAYER} wrote down the secret code\n" .string "on the door.\p" .string "“TRICK MASTER is a genius.”\n" .string "… … … … … … … …\p" .string "The lock clicked open!$" -Route110_TrickHousePuzzle5_Text_26D6CE: @ 826D6CE +Route110_TrickHousePuzzle5_Text_Mechadoll1Intro: @ 826D6CE .string "CLICKETY-CLACK…\n" .string "MECHADOLL 1 AM I!\p" .string "IF YOU ANSWER QUIZZES CORRECTLY,\n" .string "THEN YOU WILL GO TO MECHADOLL 5.\l" .string "THEN YOU CAN OBTAIN THE SECRET CODE.$" -Route110_TrickHousePuzzle5_Text_26D757: @ 826D757 +Route110_TrickHousePuzzle5_Text_Mechadoll1Quiz1: @ 826D757 .string "MECHADOLL 1 QUIZ.\p" .string "One of these POKéMON is not found\n" .string "on ROUTE 110. Which one is it?$" -Route110_TrickHousePuzzle5_Text_26D7AA: @ 826D7AA +Route110_TrickHousePuzzle5_Text_Mechadoll1Quiz2: @ 826D7AA .string "MECHADOLL 1 QUIZ.\p" .string "One of these POKéMON is not of the\n" .string "WATER type. Which one is it?$" -Route110_TrickHousePuzzle5_Text_26D7FC: @ 826D7FC +Route110_TrickHousePuzzle5_Text_Mechadoll1Quiz3: @ 826D7FC .string "MECHADOLL 1 QUIZ.\p" .string "One of these POKéMON does not use\n" .string "LEECH LIFE. Which one is it?$" -Route110_TrickHousePuzzle5_Text_26D84D: @ 826D84D +Route110_TrickHousePuzzle5_Text_CorrectGoThrough: @ 826D84D .string "CONGRATULATIONS. CORRECT YOU ARE.\n" .string "GO THROUGH. PLEASE.$" -Route110_TrickHousePuzzle5_Text_26D883: @ 826D883 +Route110_TrickHousePuzzle5_Text_DisappointmentError: @ 826D883 .string "BZZZT. DISAPPOINTMENT.\n" .string "ERROR.$" -Route110_TrickHousePuzzle5_Text_26D8A1: @ 826D8A1 +Route110_TrickHousePuzzle5_Text_Wahahahaha: @ 826D8A1 .string "WAHAHAHAHA! WAHAHAHAHA!\n" .string "CLICKETY-CLACK!$" -Route110_TrickHousePuzzle5_Text_26D8C9: @ 826D8C9 +Route110_TrickHousePuzzle5_Text_WaitForNextChallenge: @ 826D8C9 .string "YOUR NEXT CHALLENGE WE WAIT FOR.$" -Route110_TrickHousePuzzle5_Text_26D8EA: @ 826D8EA +Route110_TrickHousePuzzle5_Text_Mechadoll2Intro: @ 826D8EA .string "CLICKETY-CLACK…\n" .string "MECHADOLL 2 AM I!\p" .string "MECHADOLL 1'S QUIZ DIFFICULTY LEVEL\n" .string "IS SET TOO LOW.$" -Route110_TrickHousePuzzle5_Text_26D940: @ 826D940 +Route110_TrickHousePuzzle5_Text_Mechadoll2Quiz1: @ 826D940 .string "MECHADOLL 2 QUIZ.\p" .string "Which of these POKéMON did WALLY\n" .string "borrow from your father?$" -Route110_TrickHousePuzzle5_Text_26D98C: @ 826D98C +Route110_TrickHousePuzzle5_Text_Mechadoll2Quiz2: @ 826D98C .string "MECHADOLL 2 QUIZ.\p" .string "Which of these POKéMON was chasing\n" .string "PROF. BIRCH?$" -Route110_TrickHousePuzzle5_Text_26D9CE: @ 826D9CE +Route110_TrickHousePuzzle5_Text_Mechadoll2Quiz3: @ 826D9CE .string "MECHADOLL 2 QUIZ.\p" .string "Which of these POKéMON did TEAM AQUA\n" .string "use in PETALBURG FOREST?$" -Route110_TrickHousePuzzle5_Text_26DA1E: @ 826DA1E +Route110_TrickHousePuzzle5_Text_Mechadoll3Intro: @ 826DA1E .string "CLICKETY-CLACK…\n" .string "MECHADOLL 3 AM I!\p" .string "MATTERS OF MONEY ARE MY SOLE FOCUS.$" -Route110_TrickHousePuzzle5_Text_26DA64: @ 826DA64 +Route110_TrickHousePuzzle5_Text_Mechadoll3Quiz1: @ 826DA64 .string "MECHADOLL 3 QUIZ.\p" .string "Which costs more?\n" .string "Three HARBOR MAILS or one BURN HEAL?$" -Route110_TrickHousePuzzle5_Text_26DAAD: @ 826DAAD +Route110_TrickHousePuzzle5_Text_Mechadoll3Quiz2: @ 826DAAD .string "MECHADOLL 3 QUIZ.\p" .string "Sell one GREAT BALL and buy\n" .string "one POTION. How much money remains?$" -Route110_TrickHousePuzzle5_Text_26DAFF: @ 826DAFF +Route110_TrickHousePuzzle5_Text_Mechadoll3Quiz3: @ 826DAFF .string "MECHADOLL 3 QUIZ.\p" .string "Do one REPEL and SODA POP cost\n" .string "more than one SUPER POTION?$" -Route110_TrickHousePuzzle5_Text_26DB4C: @ 826DB4C +Route110_TrickHousePuzzle5_Text_Mechadoll4Intro: @ 826DB4C .string "CLICKETY-CLACK…\n" .string "MECHADOLL 4 THAT IS ME!\p" .string "MY QUIZ IS AN OBJECT OF BEAUTY.$" -Route110_TrickHousePuzzle5_Text_26DB94: @ 826DB94 +Route110_TrickHousePuzzle5_Text_Mechadoll4Quiz1: @ 826DB94 .string "MECHADOLL 4 QUIZ.\p" .string "In SEASHORE HOUSE, were there more men\n" .string "or women?$" -Route110_TrickHousePuzzle5_Text_26DBD7: @ 826DBD7 +Route110_TrickHousePuzzle5_Text_Mechadoll4Quiz2: @ 826DBD7 .string "MECHADOLL 4 QUIZ.\p" .string "In LAVARIDGE TOWN, were there more\n" .string "elderly men or elderly women?$" -Route110_TrickHousePuzzle5_Text_26DC2A: @ 826DC2A +Route110_TrickHousePuzzle5_Text_Mechadoll4Quiz3: @ 826DC2A .string "MECHADOLL 4 QUIZ.\p" .string "In the TRAINER'S SCHOOL, how many\n" .string "girl students were there?$" -Route110_TrickHousePuzzle5_Text_26DC78: @ 826DC78 +Route110_TrickHousePuzzle5_Text_Mechadoll5Intro: @ 826DC78 .string "CLICKETY-CLACK…\n" .string "MECHADOLL 5 AM I!\p" .string "THE MASTER'S BEST AND PROUDEST\n" .string "ACHIEVEMENT AM I.$" -Route110_TrickHousePuzzle5_Text_26DCCB: @ 826DCCB +Route110_TrickHousePuzzle5_Text_Mechadoll5Quiz1: @ 826DCCB .string "MECHADOLL 5 QUIZ.\p" .string "In SLATEPORT's POKéMON FAN CLUB,\n" .string "how many POKéMON were there?$" -Route110_TrickHousePuzzle5_Text_26DD1B: @ 826DD1B +Route110_TrickHousePuzzle5_Text_Mechadoll5Quiz2: @ 826DD1B .string "MECHADOLL 5 QUIZ.\p" .string "In FORTREE CITY, how many\n" .string "tree houses were there?$" -Route110_TrickHousePuzzle5_Text_26DD5F: @ 826DD5F +Route110_TrickHousePuzzle5_Text_Mechadoll5Quiz3: @ 826DD5F .string "MECHADOLL 5 QUIZ.\p" .string "On the CYCLING ROAD, how many\n" .string "TRIATHLETES were there?$" diff --git a/data/maps/Route110_TrickHousePuzzle6/map.json b/data/maps/Route110_TrickHousePuzzle6/map.json index aef182fbb..797bb9f60 100644 --- a/data/maps/Route110_TrickHousePuzzle6/map.json +++ b/data/maps/Route110_TrickHousePuzzle6/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route110_TrickHousePuzzle6_EventScript_26DDE1", + "script": "Route110_TrickHousePuzzle6_EventScript_Sophia", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route110_TrickHousePuzzle6_EventScript_26DDF8", + "script": "Route110_TrickHousePuzzle6_EventScript_Benny", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route110_TrickHousePuzzle6_EventScript_26DE0F", + "script": "Route110_TrickHousePuzzle6_EventScript_Sebastian", "flag": "0" }, { @@ -98,7 +98,7 @@ "y": 10, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route110_TrickHousePuzzle6_EventScript_26DDC4" + "script": "Route110_TrickHousePuzzle6_EventScript_Scroll" } ] } \ No newline at end of file diff --git a/data/maps/Route110_TrickHousePuzzle6/scripts.inc b/data/maps/Route110_TrickHousePuzzle6/scripts.inc index 685a0170b..142b89f42 100644 --- a/data/maps/Route110_TrickHousePuzzle6/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle6/scripts.inc @@ -1,87 +1,87 @@ Route110_TrickHousePuzzle6_MapScripts:: @ 826DDA7 map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle6_OnTransition - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route110_TrickHousePuzzle6_MapScript2_26DDB6 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route110_TrickHousePuzzle6_OnWarp .byte 0 Route110_TrickHousePuzzle6_OnTransition: @ 826DDB2 special RotatingGate_InitPuzzle end -Route110_TrickHousePuzzle6_MapScript2_26DDB6: @ 826DDB6 - map_script_2 VAR_TEMP_0, 16384, Route110_TrickHousePuzzle6_EventScript_26DDC0 +Route110_TrickHousePuzzle6_OnWarp: @ 826DDB6 + map_script_2 VAR_TEMP_0, VAR_TEMP_0, Route110_TrickHousePuzzle6_EventScript_InitPuzzle .2byte 0 -Route110_TrickHousePuzzle6_EventScript_26DDC0:: @ 826DDC0 +Route110_TrickHousePuzzle6_EventScript_InitPuzzle:: @ 826DDC0 special RotatingGate_InitPuzzleAndGraphics end -Route110_TrickHousePuzzle6_EventScript_26DDC4:: @ 826DDC4 +Route110_TrickHousePuzzle6_EventScript_Scroll:: @ 826DDC4 lockall compare VAR_TRICK_HOUSE_PUZZLE_6_STATE, 0 - goto_if_eq Route110_TrickHousePuzzle6_EventScript_26DDD6 - goto Route110_TrickHousePuzzle6_EventScript_26A3DB + goto_if_eq Route110_TrickHousePuzzle6_EventScript_FoundScroll + goto Route110_TrickHousePuzzle_EventScript_ReadScrollAgain end -Route110_TrickHousePuzzle6_EventScript_26DDD6:: @ 826DDD6 +Route110_TrickHousePuzzle6_EventScript_FoundScroll:: @ 826DDD6 setvar VAR_TRICK_HOUSE_PUZZLE_6_STATE, 1 - goto Route110_TrickHousePuzzle6_EventScript_26A3E5 + goto Route110_TrickHousePuzzle_EventScript_FoundScroll end -Route110_TrickHousePuzzle6_EventScript_26DDE1:: @ 826DDE1 - trainerbattle_single TRAINER_SOPHIA, Route110_TrickHousePuzzle6_Text_26DE93, Route110_TrickHousePuzzle6_Text_26DED2 - msgbox Route110_TrickHousePuzzle6_Text_26DEF3, MSGBOX_AUTOCLOSE +Route110_TrickHousePuzzle6_EventScript_Sophia:: @ 826DDE1 + trainerbattle_single TRAINER_SOPHIA, Route110_TrickHousePuzzle6_Text_SophiaIntro, Route110_TrickHousePuzzle6_Text_SophiaDefeat + msgbox Route110_TrickHousePuzzle6_Text_SophiaPostBattle, MSGBOX_AUTOCLOSE end -Route110_TrickHousePuzzle6_EventScript_26DDF8:: @ 826DDF8 - trainerbattle_single TRAINER_BENNY, Route110_TrickHousePuzzle6_Text_26DF55, Route110_TrickHousePuzzle6_Text_26DF8D - msgbox Route110_TrickHousePuzzle6_Text_26DFA0, MSGBOX_AUTOCLOSE +Route110_TrickHousePuzzle6_EventScript_Benny:: @ 826DDF8 + trainerbattle_single TRAINER_BENNY, Route110_TrickHousePuzzle6_Text_BennyIntro, Route110_TrickHousePuzzle6_Text_BennyDefeat + msgbox Route110_TrickHousePuzzle6_Text_BennyPostBattle, MSGBOX_AUTOCLOSE end -Route110_TrickHousePuzzle6_EventScript_26DE0F:: @ 826DE0F - trainerbattle_single TRAINER_SEBASTIAN, Route110_TrickHousePuzzle6_Text_26DFD7, Route110_TrickHousePuzzle6_Text_26E004 - msgbox Route110_TrickHousePuzzle6_Text_26E048, MSGBOX_AUTOCLOSE +Route110_TrickHousePuzzle6_EventScript_Sebastian:: @ 826DE0F + trainerbattle_single TRAINER_SEBASTIAN, Route110_TrickHousePuzzle6_Text_SebastianIntro, Route110_TrickHousePuzzle6_Text_SebastianDefeat + msgbox Route110_TrickHousePuzzle6_Text_SebastianPostBattle, MSGBOX_AUTOCLOSE end -Route110_TrickHousePuzzle6_Text_26DE26: @ 826DE26 +Route110_TrickHousePuzzle6_Text_WroteSecretCodeLockOpened: @ 826DE26 .string "{PLAYER} wrote down the secret code\n" .string "on the door.\p" .string "“TRICK MASTER is my life.”\n" .string "… … … … … … … …\p" .string "The lock clicked open!$" -Route110_TrickHousePuzzle6_Text_26DE93: @ 826DE93 +Route110_TrickHousePuzzle6_Text_SophiaIntro: @ 826DE93 .string "When I heard there was a strange\n" .string "house, I had to check it out.$" -Route110_TrickHousePuzzle6_Text_26DED2: @ 826DED2 +Route110_TrickHousePuzzle6_Text_SophiaDefeat: @ 826DED2 .string "I've discovered a tough TRAINER!$" -Route110_TrickHousePuzzle6_Text_26DEF3: @ 826DEF3 +Route110_TrickHousePuzzle6_Text_SophiaPostBattle: @ 826DEF3 .string "I'm sure having a good time checking\n" .string "this place out.\p" .string "It's a challenge I've found worth\n" .string "repeating!$" -Route110_TrickHousePuzzle6_Text_26DF55: @ 826DF55 +Route110_TrickHousePuzzle6_Text_BennyIntro: @ 826DF55 .string "Maybe I could get my BIRD POKéMON\n" .string "to fly over the wall…$" -Route110_TrickHousePuzzle6_Text_26DF8D: @ 826DF8D +Route110_TrickHousePuzzle6_Text_BennyDefeat: @ 826DF8D .string "Gwaaah! I blew it!$" -Route110_TrickHousePuzzle6_Text_26DFA0: @ 826DFA0 +Route110_TrickHousePuzzle6_Text_BennyPostBattle: @ 826DFA0 .string "Ehehehe… I guess I lost because\n" .string "I was trying to cheat.$" -Route110_TrickHousePuzzle6_Text_26DFD7: @ 826DFD7 +Route110_TrickHousePuzzle6_Text_SebastianIntro: @ 826DFD7 .string "I'm getting dizzy from these rotating\n" .string "doors…$" -Route110_TrickHousePuzzle6_Text_26E004: @ 826E004 +Route110_TrickHousePuzzle6_Text_SebastianDefeat: @ 826E004 .string "Everything's spinning around and\n" .string "around. I can't take this anymore…$" -Route110_TrickHousePuzzle6_Text_26E048: @ 826E048 +Route110_TrickHousePuzzle6_Text_SebastianPostBattle: @ 826E048 .string "You don't seem to be affected at all.\n" .string "Or do you have your poker face on?$" diff --git a/data/maps/Route110_TrickHousePuzzle7/map.json b/data/maps/Route110_TrickHousePuzzle7/map.json index 09fdafbe2..1e31e2f74 100644 --- a/data/maps/Route110_TrickHousePuzzle7/map.json +++ b/data/maps/Route110_TrickHousePuzzle7/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route110_TrickHousePuzzle7_EventScript_26E389", + "script": "Route110_TrickHousePuzzle7_EventScript_Joshua", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route110_TrickHousePuzzle7_EventScript_26E3B7", + "script": "Route110_TrickHousePuzzle7_EventScript_Alexis", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route110_TrickHousePuzzle7_EventScript_26E3A0", + "script": "Route110_TrickHousePuzzle7_EventScript_Patricia", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route110_TrickHousePuzzle7_EventScript_26E3E5", + "script": "Route110_TrickHousePuzzle7_EventScript_Alvaro", "flag": "0" }, { @@ -89,7 +89,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route110_TrickHousePuzzle7_EventScript_26E3CE", + "script": "Route110_TrickHousePuzzle7_EventScript_Mariela", "flag": "0" }, { @@ -102,7 +102,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route110_TrickHousePuzzle7_EventScript_26E3FC", + "script": "Route110_TrickHousePuzzle7_EventScript_Everett", "flag": "0" }, { @@ -233,7 +233,7 @@ "elevation": 0, "var": "VAR_TEMP_1", "var_value": "0", - "script": "Route110_TrickHousePuzzle7_EventScript_26E31B" + "script": "Route110_TrickHousePuzzle7_EventScript_YellowButton" }, { "type": "trigger", @@ -242,7 +242,7 @@ "elevation": 0, "var": "VAR_TEMP_1", "var_value": "0", - "script": "Route110_TrickHousePuzzle7_EventScript_26E331" + "script": "Route110_TrickHousePuzzle7_EventScript_BlueButton" }, { "type": "trigger", @@ -251,7 +251,7 @@ "elevation": 0, "var": "VAR_TEMP_1", "var_value": "0", - "script": "Route110_TrickHousePuzzle7_EventScript_26E347" + "script": "Route110_TrickHousePuzzle7_EventScript_GreenButton" }, { "type": "trigger", @@ -260,7 +260,7 @@ "elevation": 0, "var": "VAR_TEMP_1", "var_value": "0", - "script": "Route110_TrickHousePuzzle7_EventScript_26E35D" + "script": "Route110_TrickHousePuzzle7_EventScript_PurpleButton" } ], "bg_events": [ @@ -270,7 +270,7 @@ "y": 17, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route110_TrickHousePuzzle7_EventScript_26E1D0" + "script": "Route110_TrickHousePuzzle7_EventScript_Scroll" } ] } \ No newline at end of file diff --git a/data/maps/Route110_TrickHousePuzzle7/scripts.inc b/data/maps/Route110_TrickHousePuzzle7/scripts.inc index b5303bc24..6b7559389 100644 --- a/data/maps/Route110_TrickHousePuzzle7/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle7/scripts.inc @@ -1,75 +1,79 @@ Route110_TrickHousePuzzle7_MapScripts:: @ 826E091 - map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHousePuzzle7_MapScript1_26E0A6 + map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHousePuzzle7_OnResume map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle7_OnTransition - map_script MAP_SCRIPT_ON_LOAD, Route110_TrickHousePuzzle7_MapScript1_26E1B4 - map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_TrickHousePuzzle7_MapScript2_26E1C0 + map_script MAP_SCRIPT_ON_LOAD, Route110_TrickHousePuzzle7_OnLoad + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_TrickHousePuzzle7_OnFrame .byte 0 -Route110_TrickHousePuzzle7_MapScript1_26E0A6: @ 826E0A6 - call Route110_TrickHousePuzzle7_EventScript_26E0AC +@ Puzzle Room 7 in RSE uses whatever puzzle Mossdeep Gym uses +@ Because Mossdeep Gym was redesigned for Emerald, theres a good deal of leftover script from the old R/S puzzle + +Route110_TrickHousePuzzle7_OnResume: @ 826E0A6 + call Route110_TrickHousePuzzle7_EventScript_UpdateSwitchMetatiles end -Route110_TrickHousePuzzle7_EventScript_26E0AC:: @ 826E0AC - call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_26E0DA - call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_26E0ED - call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_26E100 - call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_26E113 - call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_26E126 +Route110_TrickHousePuzzle7_EventScript_UpdateSwitchMetatiles:: @ 826E0AC + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_SetSwitch1MetatilesOn + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_SetSwitch2MetatilesOn + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_SetSwitch3MetatilesOn + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_SetSwitch4MetatilesOn + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_SetSwitch5MetatilesOn return -Route110_TrickHousePuzzle7_EventScript_26E0DA:: @ 826E0DA +@ Leftover from R/S, none of the below metatile scripts are ever called +Route110_TrickHousePuzzle7_EventScript_SetSwitch1MetatilesOn:: @ 826E0DA setmetatile 13, 17, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Up, 0 setmetatile 12, 16, METATILE_TrickHousePuzzle_Lever_On, 1 return -Route110_TrickHousePuzzle7_EventScript_26E0ED:: @ 826E0ED +Route110_TrickHousePuzzle7_EventScript_SetSwitch2MetatilesOn:: @ 826E0ED setmetatile 12, 13, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Up, 0 setmetatile 12, 11, METATILE_TrickHousePuzzle_Lever_On, 1 return -Route110_TrickHousePuzzle7_EventScript_26E100:: @ 826E100 +Route110_TrickHousePuzzle7_EventScript_SetSwitch3MetatilesOn:: @ 826E100 setmetatile 7, 12, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Up, 0 setmetatile 5, 10, METATILE_TrickHousePuzzle_Lever_On, 1 return -Route110_TrickHousePuzzle7_EventScript_26E113:: @ 826E113 +Route110_TrickHousePuzzle7_EventScript_SetSwitch4MetatilesOn:: @ 826E113 setmetatile 6, 6, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Right_Alt, 0 setmetatile 4, 4, METATILE_TrickHousePuzzle_Lever_On, 1 return -Route110_TrickHousePuzzle7_EventScript_26E126:: @ 826E126 +Route110_TrickHousePuzzle7_EventScript_SetSwitch5MetatilesOn:: @ 826E126 setmetatile 8, 4, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Left, 0 setmetatile 7, 5, METATILE_TrickHousePuzzle_Lever_On, 1 return -Route110_TrickHousePuzzle7_EventScript_26E139:: @ 826E139 +Route110_TrickHousePuzzle7_EventScript_SetSwitch1MetatilesOff:: @ 826E139 setmetatile 13, 17, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Down, 0 setmetatile 12, 16, METATILE_TrickHousePuzzle_Lever_Off, 1 return -Route110_TrickHousePuzzle7_EventScript_26E14C:: @ 826E14C +Route110_TrickHousePuzzle7_EventScript_SetSwitch2MetatilesOff:: @ 826E14C setmetatile 12, 13, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Left, 0 setmetatile 12, 11, METATILE_TrickHousePuzzle_Lever_Off, 1 return -Route110_TrickHousePuzzle7_EventScript_26E15F:: @ 826E15F +Route110_TrickHousePuzzle7_EventScript_SetSwitch3MetatilesOff:: @ 826E15F setmetatile 7, 12, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Down, 0 setmetatile 5, 10, METATILE_TrickHousePuzzle_Lever_Off, 1 return -Route110_TrickHousePuzzle7_EventScript_26E172:: @ 826E172 +Route110_TrickHousePuzzle7_EventScript_SetSwitch4MetatilesOff:: @ 826E172 setmetatile 6, 6, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Left_Alt, 0 setmetatile 4, 4, METATILE_TrickHousePuzzle_Lever_Off, 1 return -Route110_TrickHousePuzzle7_EventScript_26E185:: @ 826E185 +Route110_TrickHousePuzzle7_EventScript_SetSwitch5MetatilesOff:: @ 826E185 setmetatile 8, 4, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Right, 0 setmetatile 7, 5, METATILE_TrickHousePuzzle_Lever_Off, 1 return Route110_TrickHousePuzzle7_OnTransition: @ 826E198 compare VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1 - goto_if_eq Route110_TrickHousePuzzle7_EventScript_26E1B3 + goto_if_eq Route110_TrickHousePuzzle7_EventScript_TeleportedTransition clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 @@ -77,35 +81,36 @@ Route110_TrickHousePuzzle7_OnTransition: @ 826E198 clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 end -Route110_TrickHousePuzzle7_EventScript_26E1B3:: @ 826E1B3 +Route110_TrickHousePuzzle7_EventScript_TeleportedTransition:: @ 826E1B3 end -Route110_TrickHousePuzzle7_MapScript1_26E1B4: @ 826E1B4 +Route110_TrickHousePuzzle7_OnLoad: @ 826E1B4 compare VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1 - call_if_eq Route110_TrickHousePuzzle7_EventScript_26E0AC + call_if_eq Route110_TrickHousePuzzle7_EventScript_UpdateSwitchMetatiles end -Route110_TrickHousePuzzle7_MapScript2_26E1C0: @ 826E1C0 - map_script_2 VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1, Route110_TrickHousePuzzle7_EventScript_26E1CA +Route110_TrickHousePuzzle7_OnFrame: @ 826E1C0 + map_script_2 VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1, Route110_TrickHousePuzzle7_EventScript_ClearState2 .2byte 0 -Route110_TrickHousePuzzle7_EventScript_26E1CA:: @ 826E1CA +Route110_TrickHousePuzzle7_EventScript_ClearState2:: @ 826E1CA setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 0 end -Route110_TrickHousePuzzle7_EventScript_26E1D0:: @ 826E1D0 +Route110_TrickHousePuzzle7_EventScript_Scroll:: @ 826E1D0 lockall compare VAR_TRICK_HOUSE_PUZZLE_7_STATE, 0 - goto_if_eq Route110_TrickHousePuzzle7_EventScript_26E1E2 - goto Route110_TrickHousePuzzle7_EventScript_26A3DB + goto_if_eq Route110_TrickHousePuzzle7_EventScript_FoundScroll + goto Route110_TrickHousePuzzle_EventScript_ReadScrollAgain end -Route110_TrickHousePuzzle7_EventScript_26E1E2:: @ 826E1E2 +Route110_TrickHousePuzzle7_EventScript_FoundScroll:: @ 826E1E2 setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE, 1 - goto Route110_TrickHousePuzzle7_EventScript_26A3E5 + goto Route110_TrickHousePuzzle_EventScript_FoundScroll end -Route110_TrickHousePuzzle7_EventScript_26E1ED:: @ 826E1ED +@ Unused, leftover from R/S +Route110_TrickHousePuzzle7_EventScript_TeleportPad:: @ 826E1ED lockall setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1 warpteleport MAP_ROUTE110_TRICK_HOUSE_PUZZLE7, 255, 3, 19 @@ -113,112 +118,115 @@ Route110_TrickHousePuzzle7_EventScript_26E1ED:: @ 826E1ED releaseall end -Route110_TrickHousePuzzle7_EventScript_26E1FE:: @ 826E1FE +@ All the below switch scripts are unused leftover from R/S +Route110_TrickHousePuzzle7_EventScript_Switch1:: @ 826E1FE lockall delay 32 - call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_26E0DA - call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_26E139 + call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_SetSwitch1MetatilesOn + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_SetSwitch1MetatilesOff special DrawWholeMapView playse SE_TK_KASYA - goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_26E2E9 - goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_26E2EE + goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_SetSwitch1On + goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_SetSwitch1Off end -Route110_TrickHousePuzzle7_EventScript_26E22D:: @ 826E22D +Route110_TrickHousePuzzle7_EventScript_Switch2:: @ 826E22D lockall delay 32 - call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_26E0ED - call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_26E14C + call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_SetSwitch2MetatilesOn + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_SetSwitch2MetatilesOff special DrawWholeMapView playse SE_TK_KASYA - goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_26E2F3 - goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_26E2F8 + goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_SetSwitch2On + goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_SetSwitch2Off end -Route110_TrickHousePuzzle7_EventScript_26E25C:: @ 826E25C +Route110_TrickHousePuzzle7_EventScript_Switch3:: @ 826E25C lockall delay 32 - call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_26E100 - call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_26E15F + call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_SetSwitch3MetatilesOn + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_SetSwitch3MetatilesOff special DrawWholeMapView playse SE_TK_KASYA - goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_26E2FD - goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_26E302 + goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_SetSwitch3On + goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_SetSwitch3Off end -Route110_TrickHousePuzzle7_EventScript_26E28B:: @ 826E28B +Route110_TrickHousePuzzle7_EventScript_Switch4:: @ 826E28B lockall delay 32 - call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_26E113 - call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_26E172 + call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_SetSwitch4MetatilesOn + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_SetSwitch4MetatilesOff special DrawWholeMapView playse SE_TK_KASYA - goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_26E307 - goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_26E30C + goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_SetSwitch4On + goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_SetSwitch4Off end -Route110_TrickHousePuzzle7_EventScript_26E2BA:: @ 826E2BA +Route110_TrickHousePuzzle7_EventScript_Switch5:: @ 826E2BA lockall delay 32 - call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_26E126 - call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_26E185 + call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_SetSwitch5MetatilesOn + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_SetSwitch5MetatilesOff special DrawWholeMapView playse SE_TK_KASYA - goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_26E311 - goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_26E316 + goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_SetSwitch5On + goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_SetSwitch5Off end -Route110_TrickHousePuzzle7_EventScript_26E2E9:: @ 826E2E9 +@ All the below switch scripts are unused leftover from R/S +Route110_TrickHousePuzzle7_EventScript_SetSwitch1On:: @ 826E2E9 setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 releaseall end -Route110_TrickHousePuzzle7_EventScript_26E2EE:: @ 826E2EE +Route110_TrickHousePuzzle7_EventScript_SetSwitch1Off:: @ 826E2EE clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 releaseall end -Route110_TrickHousePuzzle7_EventScript_26E2F3:: @ 826E2F3 +Route110_TrickHousePuzzle7_EventScript_SetSwitch2On:: @ 826E2F3 setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 releaseall end -Route110_TrickHousePuzzle7_EventScript_26E2F8:: @ 826E2F8 +Route110_TrickHousePuzzle7_EventScript_SetSwitch2Off:: @ 826E2F8 clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 releaseall end -Route110_TrickHousePuzzle7_EventScript_26E2FD:: @ 826E2FD +Route110_TrickHousePuzzle7_EventScript_SetSwitch3On:: @ 826E2FD setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 releaseall end -Route110_TrickHousePuzzle7_EventScript_26E302:: @ 826E302 +Route110_TrickHousePuzzle7_EventScript_SetSwitch3Off:: @ 826E302 clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 releaseall end -Route110_TrickHousePuzzle7_EventScript_26E307:: @ 826E307 +Route110_TrickHousePuzzle7_EventScript_SetSwitch4On:: @ 826E307 setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 releaseall end -Route110_TrickHousePuzzle7_EventScript_26E30C:: @ 826E30C +Route110_TrickHousePuzzle7_EventScript_SetSwitch4Off:: @ 826E30C clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 releaseall end -Route110_TrickHousePuzzle7_EventScript_26E311:: @ 826E311 +Route110_TrickHousePuzzle7_EventScript_SetSwitch5On:: @ 826E311 setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 releaseall end -Route110_TrickHousePuzzle7_EventScript_26E316:: @ 826E316 +Route110_TrickHousePuzzle7_EventScript_SetSwitch5Off:: @ 826E316 clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 releaseall end -Route110_TrickHousePuzzle7_EventScript_26E31B:: @ 826E31B +@ From here is where the new, actually used puzzle scripts begin +Route110_TrickHousePuzzle7_EventScript_YellowButton:: @ 826E31B playse SE_MU_PACHI waitse playse SE_TU_SAA @@ -230,7 +238,7 @@ Route110_TrickHousePuzzle7_EventScript_26E31B:: @ 826E31B freerotatingtilepuzzle end -Route110_TrickHousePuzzle7_EventScript_26E331:: @ 826E331 +Route110_TrickHousePuzzle7_EventScript_BlueButton:: @ 826E331 playse SE_MU_PACHI waitse playse SE_TU_SAA @@ -242,7 +250,7 @@ Route110_TrickHousePuzzle7_EventScript_26E331:: @ 826E331 freerotatingtilepuzzle end -Route110_TrickHousePuzzle7_EventScript_26E347:: @ 826E347 +Route110_TrickHousePuzzle7_EventScript_GreenButton:: @ 826E347 playse SE_MU_PACHI waitse playse SE_TU_SAA @@ -254,7 +262,7 @@ Route110_TrickHousePuzzle7_EventScript_26E347:: @ 826E347 freerotatingtilepuzzle end -Route110_TrickHousePuzzle7_EventScript_26E35D:: @ 826E35D +Route110_TrickHousePuzzle7_EventScript_PurpleButton:: @ 826E35D playse SE_MU_PACHI waitse playse SE_TU_SAA @@ -266,7 +274,8 @@ Route110_TrickHousePuzzle7_EventScript_26E35D:: @ 826E35D freerotatingtilepuzzle end -Route110_TrickHousePuzzle7_EventScript_26E373:: @ 826E373 +@ Unused +Route110_TrickHousePuzzle7_EventScript_RedButton:: @ 826E373 playse SE_MU_PACHI waitse playse SE_TU_SAA @@ -278,109 +287,109 @@ Route110_TrickHousePuzzle7_EventScript_26E373:: @ 826E373 freerotatingtilepuzzle end -Route110_TrickHousePuzzle7_EventScript_26E389:: @ 826E389 - trainerbattle_single TRAINER_JOSHUA, Route110_TrickHousePuzzle7_Text_26E481, Route110_TrickHousePuzzle7_Text_26E4C1 - msgbox Route110_TrickHousePuzzle7_Text_26E4F4, MSGBOX_AUTOCLOSE +Route110_TrickHousePuzzle7_EventScript_Joshua:: @ 826E389 + trainerbattle_single TRAINER_JOSHUA, Route110_TrickHousePuzzle7_Text_JoshuaIntro, Route110_TrickHousePuzzle7_Text_JoshuaDefeat + msgbox Route110_TrickHousePuzzle7_Text_JoshuaPostBattle, MSGBOX_AUTOCLOSE end -Route110_TrickHousePuzzle7_EventScript_26E3A0:: @ 826E3A0 - trainerbattle_single TRAINER_PATRICIA, Route110_TrickHousePuzzle7_Text_26E531, Route110_TrickHousePuzzle7_Text_26E564 - msgbox Route110_TrickHousePuzzle7_Text_26E57F, MSGBOX_AUTOCLOSE +Route110_TrickHousePuzzle7_EventScript_Patricia:: @ 826E3A0 + trainerbattle_single TRAINER_PATRICIA, Route110_TrickHousePuzzle7_Text_PatriciaIntro, Route110_TrickHousePuzzle7_Text_PatriciaDefeat + msgbox Route110_TrickHousePuzzle7_Text_PatriciaPostBattle, MSGBOX_AUTOCLOSE end -Route110_TrickHousePuzzle7_EventScript_26E3B7:: @ 826E3B7 - trainerbattle_single TRAINER_ALEXIS, Route110_TrickHousePuzzle7_Text_26E5C0, Route110_TrickHousePuzzle7_Text_26E604 - msgbox Route110_TrickHousePuzzle7_Text_26E61E, MSGBOX_AUTOCLOSE +Route110_TrickHousePuzzle7_EventScript_Alexis:: @ 826E3B7 + trainerbattle_single TRAINER_ALEXIS, Route110_TrickHousePuzzle7_Text_AlexisIntro, Route110_TrickHousePuzzle7_Text_AlexisDefeat + msgbox Route110_TrickHousePuzzle7_Text_AlexisPostBattle, MSGBOX_AUTOCLOSE end -Route110_TrickHousePuzzle7_EventScript_26E3CE:: @ 826E3CE - trainerbattle_single TRAINER_MARIELA, Route110_TrickHousePuzzle7_Text_26E66B, Route110_TrickHousePuzzle7_Text_26E69C - msgbox Route110_TrickHousePuzzle7_Text_26E6BC, MSGBOX_AUTOCLOSE +Route110_TrickHousePuzzle7_EventScript_Mariela:: @ 826E3CE + trainerbattle_single TRAINER_MARIELA, Route110_TrickHousePuzzle7_Text_MarielaIntro, Route110_TrickHousePuzzle7_Text_MarielaDefeat + msgbox Route110_TrickHousePuzzle7_Text_MarielaPostBattle, MSGBOX_AUTOCLOSE end -Route110_TrickHousePuzzle7_EventScript_26E3E5:: @ 826E3E5 - trainerbattle_single TRAINER_ALVARO, Route110_TrickHousePuzzle7_Text_26E6DA, Route110_TrickHousePuzzle7_Text_26E700 - msgbox Route110_TrickHousePuzzle7_Text_26E722, MSGBOX_AUTOCLOSE +Route110_TrickHousePuzzle7_EventScript_Alvaro:: @ 826E3E5 + trainerbattle_single TRAINER_ALVARO, Route110_TrickHousePuzzle7_Text_AlvaroIntro, Route110_TrickHousePuzzle7_Text_AlvaroDefeat + msgbox Route110_TrickHousePuzzle7_Text_AlvaroPostBattle, MSGBOX_AUTOCLOSE end -Route110_TrickHousePuzzle7_EventScript_26E3FC:: @ 826E3FC - trainerbattle_single TRAINER_EVERETT, Route110_TrickHousePuzzle7_Text_26E78D, Route110_TrickHousePuzzle7_Text_26E7AB - msgbox Route110_TrickHousePuzzle7_Text_26E7C4, MSGBOX_AUTOCLOSE +Route110_TrickHousePuzzle7_EventScript_Everett:: @ 826E3FC + trainerbattle_single TRAINER_EVERETT, Route110_TrickHousePuzzle7_Text_EverettIntro, Route110_TrickHousePuzzle7_Text_EverettDefeat + msgbox Route110_TrickHousePuzzle7_Text_EverettPostBattle, MSGBOX_AUTOCLOSE end -Route110_TrickHousePuzzle7_EventScript_26E413:: @ 826E413 +Route110_TrickHousePuzzle7_EventScript_WroteSecretCodeLockOpened:: @ 826E413 .string "{PLAYER} wrote down the secret code\n" .string "on the door.\p" .string "“TRICK MASTER is huggable.”\n" .string "… … … … … … … …\p" .string "The lock clicked open!$" -Route110_TrickHousePuzzle7_Text_26E481: @ 826E481 +Route110_TrickHousePuzzle7_Text_JoshuaIntro: @ 826E481 .string "The TRICK MASTER always vanishes\n" .string "like smoke. How does he do it?$" -Route110_TrickHousePuzzle7_Text_26E4C1: @ 826E4C1 +Route110_TrickHousePuzzle7_Text_JoshuaDefeat: @ 826E4C1 .string "Aiyeeeh! You're much too strong!\n" .string "How do you do it?$" -Route110_TrickHousePuzzle7_Text_26E4F4: @ 826E4F4 +Route110_TrickHousePuzzle7_Text_JoshuaPostBattle: @ 826E4F4 .string "I wish I could appear and disappear as\n" .string "if I were smoke, too.$" -Route110_TrickHousePuzzle7_Text_26E531: @ 826E531 +Route110_TrickHousePuzzle7_Text_PatriciaIntro: @ 826E531 .string "Going around the same spot…\n" .string "It begets ill fortune…$" -Route110_TrickHousePuzzle7_Text_26E564: @ 826E564 +Route110_TrickHousePuzzle7_Text_PatriciaDefeat: @ 826E564 .string "Defeated!\n" .string "It's a bad sign…$" -Route110_TrickHousePuzzle7_Text_26E57F: @ 826E57F +Route110_TrickHousePuzzle7_Text_PatriciaPostBattle: @ 826E57F .string "I've circled the same spot over ten\n" .string "times now… It's ill fortune…$" -Route110_TrickHousePuzzle7_Text_26E5C0: @ 826E5C0 +Route110_TrickHousePuzzle7_Text_AlexisIntro: @ 826E5C0 .string "Whoever wins will get through here\n" .string "first. That's the feeling I get.$" -Route110_TrickHousePuzzle7_Text_26E604: @ 826E604 +Route110_TrickHousePuzzle7_Text_AlexisDefeat: @ 826E604 .string "Oh!\n" .string "Well, go ahead, then!$" -Route110_TrickHousePuzzle7_Text_26E61E: @ 826E61E +Route110_TrickHousePuzzle7_Text_AlexisPostBattle: @ 826E61E .string "You're solving all the puzzles in the\n" .string "TRICK HOUSE. That's the feeling I get.$" -Route110_TrickHousePuzzle7_Text_26E66B: @ 826E66B +Route110_TrickHousePuzzle7_Text_MarielaIntro: @ 826E66B .string "Nufufufu, here at last!\n" .string "Let's get right with it!$" -Route110_TrickHousePuzzle7_Text_26E69C: @ 826E69C +Route110_TrickHousePuzzle7_Text_MarielaDefeat: @ 826E69C .string "You're so casual about winning!$" -Route110_TrickHousePuzzle7_Text_26E6BC: @ 826E6BC +Route110_TrickHousePuzzle7_Text_MarielaPostBattle: @ 826E6BC .string "Humph! I'm not upset!\n" .string "Not me!$" -Route110_TrickHousePuzzle7_Text_26E6DA: @ 826E6DA +Route110_TrickHousePuzzle7_Text_AlvaroIntro: @ 826E6DA .string "I ever so closely watched you coming!$" -Route110_TrickHousePuzzle7_Text_26E700: @ 826E700 +Route110_TrickHousePuzzle7_Text_AlvaroDefeat: @ 826E700 .string "This outcome I didn't see coming…$" -Route110_TrickHousePuzzle7_Text_26E722: @ 826E722 +Route110_TrickHousePuzzle7_Text_AlvaroPostBattle: @ 826E722 .string "Well, anyway, we both picked a weird\n" .string "place to get acquainted.\p" .string "As one weirdo to another,\n" .string "let's do our best!$" -Route110_TrickHousePuzzle7_Text_26E78D: @ 826E78D +Route110_TrickHousePuzzle7_Text_EverettIntro: @ 826E78D .string "It's awfully cramped in here…$" -Route110_TrickHousePuzzle7_Text_26E7AB: @ 826E7AB +Route110_TrickHousePuzzle7_Text_EverettDefeat: @ 826E7AB .string "Oh, yes, strong you are.$" -Route110_TrickHousePuzzle7_Text_26E7C4: @ 826E7C4 +Route110_TrickHousePuzzle7_Text_EverettPostBattle: @ 826E7C4 .string "I was hoping to switch places with you\n" .string "when I beat you, but…$" diff --git a/data/maps/Route110_TrickHousePuzzle8/map.json b/data/maps/Route110_TrickHousePuzzle8/map.json index b7a06abce..9e4be0cfc 100644 --- a/data/maps/Route110_TrickHousePuzzle8/map.json +++ b/data/maps/Route110_TrickHousePuzzle8/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route110_TrickHousePuzzle8_EventScript_26E81F", + "script": "Route110_TrickHousePuzzle8_EventScript_Vincent", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route110_TrickHousePuzzle8_EventScript_26E84D", + "script": "Route110_TrickHousePuzzle8_EventScript_Leroy", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route110_TrickHousePuzzle8_EventScript_26E836", + "script": "Route110_TrickHousePuzzle8_EventScript_Keira", "flag": "0" }, { @@ -98,7 +98,7 @@ "y": 21, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route110_TrickHousePuzzle8_EventScript_26E802" + "script": "Route110_TrickHousePuzzle8_EventScript_Scroll" } ] } \ No newline at end of file diff --git a/data/maps/Route110_TrickHousePuzzle8/scripts.inc b/data/maps/Route110_TrickHousePuzzle8/scripts.inc index dcb12e366..9e4218234 100644 --- a/data/maps/Route110_TrickHousePuzzle8/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle8/scripts.inc @@ -1,72 +1,72 @@ Route110_TrickHousePuzzle8_MapScripts:: @ 826E801 .byte 0 -Route110_TrickHousePuzzle8_EventScript_26E802:: @ 826E802 +Route110_TrickHousePuzzle8_EventScript_Scroll:: @ 826E802 lockall compare VAR_TRICK_HOUSE_PUZZLE_8_STATE, 0 - goto_if_eq Route110_TrickHousePuzzle8_EventScript_26E814 - goto Route110_TrickHousePuzzle8_EventScript_26A3DB + goto_if_eq Route110_TrickHousePuzzle8_EventScript_FoundScroll + goto Route110_TrickHousePuzzle_EventScript_ReadScrollAgain end -Route110_TrickHousePuzzle8_EventScript_26E814:: @ 826E814 +Route110_TrickHousePuzzle8_EventScript_FoundScroll:: @ 826E814 setvar VAR_TRICK_HOUSE_PUZZLE_8_STATE, 1 - goto Route110_TrickHousePuzzle8_EventScript_26A3E5 + goto Route110_TrickHousePuzzle_EventScript_FoundScroll end -Route110_TrickHousePuzzle8_EventScript_26E81F:: @ 826E81F - trainerbattle_single TRAINER_VINCENT, Route110_TrickHousePuzzle8_Text_26E8CD, Route110_TrickHousePuzzle8_Text_26E8F6 - msgbox Route110_TrickHousePuzzle8_Text_26E918, MSGBOX_AUTOCLOSE +Route110_TrickHousePuzzle8_EventScript_Vincent:: @ 826E81F + trainerbattle_single TRAINER_VINCENT, Route110_TrickHousePuzzle8_Text_VincentIntro, Route110_TrickHousePuzzle8_Text_VincentDefeat + msgbox Route110_TrickHousePuzzle8_Text_VincentPostBattle, MSGBOX_AUTOCLOSE end -Route110_TrickHousePuzzle8_EventScript_26E836:: @ 826E836 - trainerbattle_single TRAINER_KEIRA, Route110_TrickHousePuzzle8_Text_26E954, Route110_TrickHousePuzzle8_Text_26E97F - msgbox Route110_TrickHousePuzzle8_Text_26E99F, MSGBOX_AUTOCLOSE +Route110_TrickHousePuzzle8_EventScript_Keira:: @ 826E836 + trainerbattle_single TRAINER_KEIRA, Route110_TrickHousePuzzle8_Text_KeiraIntro, Route110_TrickHousePuzzle8_Text_KeiraDefeat + msgbox Route110_TrickHousePuzzle8_Text_KeiraPostBattle, MSGBOX_AUTOCLOSE end -Route110_TrickHousePuzzle8_EventScript_26E84D:: @ 826E84D - trainerbattle_single TRAINER_LEROY, Route110_TrickHousePuzzle8_Text_26E9D7, Route110_TrickHousePuzzle8_Text_26EA14 - msgbox Route110_TrickHousePuzzle8_Text_26EA3F, MSGBOX_AUTOCLOSE +Route110_TrickHousePuzzle8_EventScript_Leroy:: @ 826E84D + trainerbattle_single TRAINER_LEROY, Route110_TrickHousePuzzle8_Text_LeroyIntro, Route110_TrickHousePuzzle8_Text_LeroyDefeat + msgbox Route110_TrickHousePuzzle8_Text_LeroyPostBattle, MSGBOX_AUTOCLOSE end -Route110_TrickHousePuzzle8_EventScript_26E864:: @ 826E864 +Route110_TrickHousePuzzle8_EventScript_WroteSecretCodeLockOpened:: @ 826E864 .string "{PLAYER} wrote down the secret code\n" .string "on the door.\p" .string "“TRICK MASTER I love.”\n" .string "… … … … … … … …\p" .string "The lock clicked open!$" -Route110_TrickHousePuzzle8_Text_26E8CD: @ 826E8CD +Route110_TrickHousePuzzle8_Text_VincentIntro: @ 826E8CD .string "Not many TRAINERS have made it\n" .string "this far.$" -Route110_TrickHousePuzzle8_Text_26E8F6: @ 826E8F6 +Route110_TrickHousePuzzle8_Text_VincentDefeat: @ 826E8F6 .string "That must mean you're tough, too…$" -Route110_TrickHousePuzzle8_Text_26E918: @ 826E918 +Route110_TrickHousePuzzle8_Text_VincentPostBattle: @ 826E918 .string "You've beaten the POKéMON LEAGUE\n" .string "CHAMPION? That's too much!$" -Route110_TrickHousePuzzle8_Text_26E954: @ 826E954 +Route110_TrickHousePuzzle8_Text_KeiraIntro: @ 826E954 .string "Consider yourself lucky to be\n" .string "battling me!$" -Route110_TrickHousePuzzle8_Text_26E97F: @ 826E97F +Route110_TrickHousePuzzle8_Text_KeiraDefeat: @ 826E97F .string "This isn't right!\n" .string "I can't lose!$" -Route110_TrickHousePuzzle8_Text_26E99F: @ 826E99F +Route110_TrickHousePuzzle8_Text_KeiraPostBattle: @ 826E99F .string "It's a miracle that you beat me.\n" .string "You can brag about it.$" -Route110_TrickHousePuzzle8_Text_26E9D7: @ 826E9D7 +Route110_TrickHousePuzzle8_Text_LeroyIntro: @ 826E9D7 .string "You've been slugging through the TRICK\n" .string "HOUSE challenge, too.$" -Route110_TrickHousePuzzle8_Text_26EA14: @ 826EA14 +Route110_TrickHousePuzzle8_Text_LeroyDefeat: @ 826EA14 .string "I see…\n" .string "You possess an extraordinary style.$" -Route110_TrickHousePuzzle8_Text_26EA3F: @ 826EA3F +Route110_TrickHousePuzzle8_Text_LeroyPostBattle: @ 826EA3F .string "Seeing someone like you should please\n" .string "the TRICK MASTER.$" diff --git a/include/constants/flags.h b/include/constants/flags.h index 368f4f287..1d10e2249 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -207,11 +207,11 @@ #define FLAG_DEFEATED_GRUNT_SPACE_CENTER_1F 0xBF #define FLAG_RECEIVED_SUN_STONE_MOSSDEEP 0xC0 #define FLAG_WALLY_SPEECH 0xC1 -#define FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 0xC2 -#define FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 0xC3 -#define FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 0xC4 -#define FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 0xC5 -#define FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 0xC6 +#define FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 0xC2 // Leftover from the RS version of Puzzle Room 7, functionally unused +#define FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 0xC3 // +#define FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 0xC4 // +#define FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 0xC5 // +#define FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 0xC6 // #define FLAG_RUSTURF_TUNNEL_OPENED 0xC7 #define FLAG_RECEIVED_RED_SCARF 0xC8 #define FLAG_RECEIVED_BLUE_SCARF 0xC9 diff --git a/include/constants/vars.h b/include/constants/vars.h index 64ff6622b..3e476935e 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -179,9 +179,9 @@ #define VAR_SEAFLOOR_CAVERN_STATE 0x40A2 #define VAR_CABLE_CAR_STATION_STATE 0x40A3 #define VAR_SAFARI_ZONE_STATE 0x40A4 // 0: In or out of SZ, 1: Player exiting SZ, 2: Player entering SZ -#define VAR_TRICK_HOUSE_ENTRANCE_STATE_1 0x40A5 -#define VAR_TRICK_HOUSE_ENTRANCE_STATE_2 0x40A6 -#define VAR_TRICK_HOUSE_ENTRANCE_STATE_3 0x40A7 +#define VAR_TRICK_HOUSE_BEING_WATCHED_STATE 0x40A5 +#define VAR_TRICK_HOUSE_FOUND_TRICK_MASTER 0x40A6 +#define VAR_TRICK_HOUSE_ENTRANCE_STATE 0x40A7 #define VAR_UNUSED_0x40A8 0x40A8 // Unused Var #define VAR_CYCLING_CHALLENGE_STATE 0x40A9 #define VAR_SLATEPORT_MUSEUM_1F_STATE 0x40AA @@ -195,8 +195,8 @@ #define VAR_TRICK_HOUSE_PUZZLE_8_STATE 0x40B2 #define VAR_WEATHER_INSTITUTE_STATE 0x40B3 #define VAR_PORTHOLE_STATE 0x40B4 -#define VAR_TRICK_HOUSE_STATE 0x40B5 // TODO: needs some further investigation -#define VAR_TRICK_HOUSE_PUZZLE_7_STATE_2 0x40B6 +#define VAR_TRICK_HOUSE_ENTER_FROM_CORRIDOR 0x40B5 +#define VAR_TRICK_HOUSE_PUZZLE_7_STATE_2 0x40B6 // Leftover from RS, never set #define VAR_SLATEPORT_FAN_CLUB_STATE 0x40B7 #define VAR_UNUSED_0x40B8 0x40B8 // Unused Var #define VAR_MT_PYRE_STATE 0x40B9 diff --git a/include/event_scripts.h b/include/event_scripts.h index b86c46df0..5579b2163 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -527,7 +527,7 @@ extern const u8 EventScript_ClosedSootopolisDoor[]; extern const u8 SkyPillar_Outside_EventScript_2393F9[]; extern const u8 EventScript_CableBoxResults[]; extern const u8 EventScript_PokeBlockFeeder[]; -extern const u8 Route110_TrickHouseEntrance_EventScript_26A22A[]; +extern const u8 Route110_TrickHousePuzzle_EventScript_Door[]; extern const u8 EventScript_RegionMap[]; extern const u8 EventScript_RunningShoesManual[]; extern const u8 EventScript_PictureBookShelf[]; diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index bbd2ebda9..15294159c 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -380,7 +380,7 @@ static const u8 *GetInteractedMetatileScript(struct MapPosition *position, u8 me if (MetatileBehavior_IsPokeblockFeeder(metatileBehavior) == TRUE) return EventScript_PokeBlockFeeder; if (MetatileBehavior_IsTrickHousePuzzleDoor(metatileBehavior) == TRUE) - return Route110_TrickHouseEntrance_EventScript_26A22A; + return Route110_TrickHousePuzzle_EventScript_Door; if (MetatileBehavior_IsRegionMap(metatileBehavior) == TRUE) return EventScript_RegionMap; if (MetatileBehavior_IsRunningShoesManual(metatileBehavior) == TRUE) From 3a00b664070d67d0d5d16b4b9893c53101dec612 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 6 Nov 2019 20:38:53 -0500 Subject: [PATCH 15/40] Document cave scripts --- data/event_scripts.s | 2 +- .../FallarborTown_BattleTentLobby/map.json | 2 +- data/maps/FieryPath/scripts.inc | 6 +- data/maps/GraniteCave_1F/map.json | 2 +- data/maps/GraniteCave_1F/scripts.inc | 16 +- data/maps/GraniteCave_StevensRoom/map.json | 2 +- data/maps/GraniteCave_StevensRoom/scripts.inc | 62 ++--- data/maps/MeteorFalls_1F_1R/map.json | 4 +- data/maps/MeteorFalls_1F_1R/scripts.inc | 112 ++++----- data/maps/MeteorFalls_1F_2R/map.json | 6 +- data/maps/MeteorFalls_1F_2R/scripts.inc | 108 ++++---- data/maps/MeteorFalls_StevensCave/map.json | 2 +- data/maps/MeteorFalls_StevensCave/scripts.inc | 20 +- data/maps/MirageTower_4F/map.json | 4 +- data/maps/MirageTower_4F/scripts.inc | 34 +-- data/maps/RusturfTunnel/map.json | 22 +- data/maps/RusturfTunnel/scripts.inc | 233 +++++++++--------- data/maps/SealedChamber_InnerRoom/map.json | 18 +- data/maps/SealedChamber_InnerRoom/scripts.inc | 36 +-- data/maps/SealedChamber_OuterRoom/map.json | 58 ++--- data/maps/SealedChamber_OuterRoom/scripts.inc | 64 ++--- data/maps/Underwater_MarineCave/scripts.inc | 4 +- .../Underwater_SeafloorCavern/scripts.inc | 16 +- data/maps/Underwater_SealedChamber/map.json | 2 +- .../maps/Underwater_SealedChamber/scripts.inc | 18 +- data/maps/VictoryRoad_1F/map.json | 18 +- data/maps/VictoryRoad_1F/scripts.inc | 126 +++++----- data/maps/VictoryRoad_B1F/map.json | 10 +- data/maps/VictoryRoad_B1F/scripts.inc | 60 ++--- data/maps/VictoryRoad_B2F/map.json | 12 +- data/maps/VictoryRoad_B2F/scripts.inc | 72 +++--- data/scripts/new_game.inc | 4 +- data/text/braille.inc | 38 +-- include/constants/flags.h | 6 +- src/field_specials.c | 4 +- 35 files changed, 605 insertions(+), 598 deletions(-) diff --git a/data/event_scripts.s b/data/event_scripts.s index b1e637bf0..9f38d0bbe 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -901,7 +901,7 @@ EventScript_HideMrBriney:: @ 82721F8 setvar VAR_BRINEY_LOCATION, 0 return -RusturfTunnel_EventScript_272216:: @ 8272216 +RusturfTunnel_EventScript_SetRusturfTunnelOpen:: @ 8272216 removeobject 1 removeobject 10 clearflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_MAN diff --git a/data/maps/FallarborTown_BattleTentLobby/map.json b/data/maps/FallarborTown_BattleTentLobby/map.json index aa65e71a0..4c565ff8c 100644 --- a/data/maps/FallarborTown_BattleTentLobby/map.json +++ b/data/maps/FallarborTown_BattleTentLobby/map.json @@ -77,7 +77,7 @@ "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_BattleTentLobby_EventScript_200228", - "flag": "FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT" + "flag": "FLAG_HIDE_FALLARBOR_TOWN_BATTLE_TENT_SCOTT" } ], "warp_events": [ diff --git a/data/maps/FieryPath/scripts.inc b/data/maps/FieryPath/scripts.inc index 0aa5769a0..ca259993e 100644 --- a/data/maps/FieryPath/scripts.inc +++ b/data/maps/FieryPath/scripts.inc @@ -3,12 +3,12 @@ FieryPath_MapScripts:: @ 8230F24 .byte 0 FieryPath_OnTransition: @ 8230F2A - call_if_unset FLAG_LANDMARK_FIERY_PATH, FieryPath_EventScript_230F37 + call_if_unset FLAG_LANDMARK_FIERY_PATH, FieryPath_EventScript_MoveScottToFallarbor setflag FLAG_LANDMARK_FIERY_PATH end -FieryPath_EventScript_230F37:: @ 8230F37 +FieryPath_EventScript_MoveScottToFallarbor:: @ 8230F37 setflag FLAG_HIDE_VERDANTURF_TOWN_SCOTT - clearflag FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT + clearflag FLAG_HIDE_FALLARBOR_TOWN_BATTLE_TENT_SCOTT return diff --git a/data/maps/GraniteCave_1F/map.json b/data/maps/GraniteCave_1F/map.json index 2413a023d..1822dd0c9 100644 --- a/data/maps/GraniteCave_1F/map.json +++ b/data/maps/GraniteCave_1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "GraniteCave_1F_EventScript_22DA5E", + "script": "GraniteCave_1F_EventScript_Hiker", "flag": "0" }, { diff --git a/data/maps/GraniteCave_1F/scripts.inc b/data/maps/GraniteCave_1F/scripts.inc index b9e68d43c..9aa0332f7 100644 --- a/data/maps/GraniteCave_1F/scripts.inc +++ b/data/maps/GraniteCave_1F/scripts.inc @@ -1,23 +1,23 @@ GraniteCave_1F_MapScripts:: @ 822DA5D .byte 0 -GraniteCave_1F_EventScript_22DA5E:: @ 822DA5E +GraniteCave_1F_EventScript_Hiker:: @ 822DA5E lock faceplayer - goto_if_set FLAG_RECEIVED_HM05, GraniteCave_1F_EventScript_22DA8A - msgbox GraniteCave_1F_Text_22DA94, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_HM05, GraniteCave_1F_EventScript_ReceivedFlash + msgbox GraniteCave_1F_Text_GetsDarkAheadHereYouGo, MSGBOX_DEFAULT giveitem_std ITEM_HM05 setflag FLAG_RECEIVED_HM05 - msgbox GraniteCave_1F_Text_22DBB7, MSGBOX_DEFAULT + msgbox GraniteCave_1F_Text_ExplainFlash, MSGBOX_DEFAULT release end -GraniteCave_1F_EventScript_22DA8A:: @ 822DA8A - msgbox GraniteCave_1F_Text_22DBB7, MSGBOX_DEFAULT +GraniteCave_1F_EventScript_ReceivedFlash:: @ 822DA8A + msgbox GraniteCave_1F_Text_ExplainFlash, MSGBOX_DEFAULT release end -GraniteCave_1F_Text_22DA94: @ 822DA94 +GraniteCave_1F_Text_GetsDarkAheadHereYouGo: @ 822DA94 .string "Hey, you.\n" .string "It gets awfully dark ahead.\l" .string "It'll be tough trying to explore.\p" @@ -29,7 +29,7 @@ GraniteCave_1F_Text_22DA94: @ 822DA94 .string "that we meet is our motto.\p" .string "Here you go, I'll pass this on to you.$" -GraniteCave_1F_Text_22DBB7: @ 822DBB7 +GraniteCave_1F_Text_ExplainFlash: @ 822DBB7 .string "Teach that hidden move FLASH to\n" .string "a POKéMON and use it.\p" .string "It lights up even the inky darkness\n" diff --git a/data/maps/GraniteCave_StevensRoom/map.json b/data/maps/GraniteCave_StevensRoom/map.json index ae5b61a6b..87264cd54 100644 --- a/data/maps/GraniteCave_StevensRoom/map.json +++ b/data/maps/GraniteCave_StevensRoom/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "GraniteCave_StevensRoom_EventScript_22DC7B", + "script": "GraniteCave_StevensRoom_EventScript_Steven", "flag": "FLAG_HIDE_GRANITE_CAVE_STEVEN" } ], diff --git a/data/maps/GraniteCave_StevensRoom/scripts.inc b/data/maps/GraniteCave_StevensRoom/scripts.inc index 333f97a66..0456f5eaf 100644 --- a/data/maps/GraniteCave_StevensRoom/scripts.inc +++ b/data/maps/GraniteCave_StevensRoom/scripts.inc @@ -1,63 +1,63 @@ GraniteCave_StevensRoom_MapScripts:: @ 822DC7A .byte 0 -GraniteCave_StevensRoom_EventScript_22DC7B:: @ 822DC7B +GraniteCave_StevensRoom_EventScript_Steven:: @ 822DC7B lock faceplayer - msgbox GraniteCave_StevensRoom_Text_22DD5A, MSGBOX_DEFAULT + msgbox GraniteCave_StevensRoom_Text_ImStevenLetterForMe, MSGBOX_DEFAULT setvar VAR_0x8004, ITEM_LETTER call Common_EventScript_PlayerHandedOverTheItem setflag FLAG_DELIVERED_STEVEN_LETTER - msgbox GraniteCave_StevensRoom_Text_22DDBD, MSGBOX_DEFAULT + msgbox GraniteCave_StevensRoom_Text_ThankYouTakeThis, MSGBOX_DEFAULT giveitem_std ITEM_TM47 - compare VAR_RESULT, 0 - call_if_eq GraniteCave_StevensRoom_EventScript_22DD3C - msgbox GraniteCave_StevensRoom_Text_22DE6B, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + call_if_eq GraniteCave_StevensRoom_EventScript_BagFull + msgbox GraniteCave_StevensRoom_Text_CouldBecomeChampionLetsRegister, MSGBOX_DEFAULT closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox GraniteCave_StevensRoom_Text_22DF6A, MSGBOX_DEFAULT + msgbox GraniteCave_StevensRoom_Text_RegisteredSteven, MSGBOX_DEFAULT waitfanfare closemessage delay 30 setflag FLAG_REGISTERED_STEVEN_POKENAV - msgbox GraniteCave_StevensRoom_Text_22DF8C, MSGBOX_DEFAULT + msgbox GraniteCave_StevensRoom_Text_IveGotToHurryAlong, MSGBOX_DEFAULT closemessage compare VAR_FACING, DIR_NORTH - call_if_eq GraniteCave_StevensRoom_EventScript_22DD0D + call_if_eq GraniteCave_StevensRoom_EventScript_StevenExitNorth compare VAR_FACING, DIR_SOUTH - call_if_eq GraniteCave_StevensRoom_EventScript_22DD2A + call_if_eq GraniteCave_StevensRoom_EventScript_StevenExitSouth compare VAR_FACING, DIR_WEST - call_if_eq GraniteCave_StevensRoom_EventScript_22DD18 + call_if_eq GraniteCave_StevensRoom_EventScript_StevenExitWestEast compare VAR_FACING, DIR_EAST - call_if_eq GraniteCave_StevensRoom_EventScript_22DD18 + call_if_eq GraniteCave_StevensRoom_EventScript_StevenExitWestEast playse SE_KAIDAN removeobject 1 release end -GraniteCave_StevensRoom_EventScript_22DD0D:: @ 822DD0D - applymovement 1, GraniteCave_StevensRoom_Movement_22DD45 +GraniteCave_StevensRoom_EventScript_StevenExitNorth:: @ 822DD0D + applymovement 1, GraniteCave_StevensRoom_Movement_StevenExit waitmovement 0 return -GraniteCave_StevensRoom_EventScript_22DD18:: @ 822DD18 - applymovement EVENT_OBJ_ID_PLAYER, GraniteCave_StevensRoom_Movement_22DD4C - applymovement 1, GraniteCave_StevensRoom_Movement_22DD45 +GraniteCave_StevensRoom_EventScript_StevenExitWestEast:: @ 822DD18 + applymovement EVENT_OBJ_ID_PLAYER, GraniteCave_StevensRoom_Movement_PlayerTurnTowardExit + applymovement 1, GraniteCave_StevensRoom_Movement_StevenExit waitmovement 0 return -GraniteCave_StevensRoom_EventScript_22DD2A:: @ 822DD2A - applymovement EVENT_OBJ_ID_PLAYER, GraniteCave_StevensRoom_Movement_22DD4C - applymovement 1, GraniteCave_StevensRoom_Movement_22DD51 +GraniteCave_StevensRoom_EventScript_StevenExitSouth:: @ 822DD2A + applymovement EVENT_OBJ_ID_PLAYER, GraniteCave_StevensRoom_Movement_PlayerTurnTowardExit + applymovement 1, GraniteCave_StevensRoom_Movement_StevenExitSouth waitmovement 0 return -GraniteCave_StevensRoom_EventScript_22DD3C:: @ 822DD3C - msgbox GraniteCave_StevensRoom_Text_22DFAA, MSGBOX_DEFAULT +GraniteCave_StevensRoom_EventScript_BagFull:: @ 822DD3C + msgbox GraniteCave_StevensRoom_Text_OhBagIsFull, MSGBOX_DEFAULT return -GraniteCave_StevensRoom_Movement_22DD45: @ 822DD45 +GraniteCave_StevensRoom_Movement_StevenExit: @ 822DD45 walk_up walk_up walk_up @@ -66,14 +66,14 @@ GraniteCave_StevensRoom_Movement_22DD45: @ 822DD45 delay_8 step_end -GraniteCave_StevensRoom_Movement_22DD4C: @ 822DD4C +GraniteCave_StevensRoom_Movement_PlayerTurnTowardExit: @ 822DD4C delay_16 delay_16 delay_16 walk_in_place_fastest_up step_end -GraniteCave_StevensRoom_Movement_22DD51: @ 822DD51 +GraniteCave_StevensRoom_Movement_StevenExitSouth: @ 822DD51 walk_left walk_up walk_up @@ -84,14 +84,14 @@ GraniteCave_StevensRoom_Movement_22DD51: @ 822DD51 delay_8 step_end -GraniteCave_StevensRoom_Text_22DD5A: @ 822DD5A +GraniteCave_StevensRoom_Text_ImStevenLetterForMe: @ 822DD5A .string "My name is STEVEN.\p" .string "I'm interested in rare stones,\n" .string "so I travel here and there.\p" .string "Oh?\n" .string "A LETTER for me?$" -GraniteCave_StevensRoom_Text_22DDBD: @ 822DDBD +GraniteCave_StevensRoom_Text_ThankYouTakeThis: @ 822DDBD .string "STEVEN: Okay, thank you.\p" .string "You went through all this trouble to\n" .string "deliver that. I need to thank you.\p" @@ -100,7 +100,7 @@ GraniteCave_StevensRoom_Text_22DDBD: @ 822DDBD .string "It contains my favorite move,\n" .string "STEEL WING.$" -GraniteCave_StevensRoom_Text_22DE6B: @ 822DE6B +GraniteCave_StevensRoom_Text_CouldBecomeChampionLetsRegister: @ 822DE6B .string "STEVEN: Your POKéMON appear quite\n" .string "capable.\p" .string "If you keep training, you could even\n" @@ -111,14 +111,14 @@ GraniteCave_StevensRoom_Text_22DE6B: @ 822DE6B .string "our POKéNAVS.\p" .string "… … … … … …$" -GraniteCave_StevensRoom_Text_22DF6A: @ 822DF6A +GraniteCave_StevensRoom_Text_RegisteredSteven: @ 822DF6A .string "Registered STEVEN\n" .string "in the POKéNAV.$" -GraniteCave_StevensRoom_Text_22DF8C: @ 822DF8C +GraniteCave_StevensRoom_Text_IveGotToHurryAlong: @ 822DF8C .string "Now, I've got to hurry along.$" -GraniteCave_StevensRoom_Text_22DFAA: @ 822DFAA +GraniteCave_StevensRoom_Text_OhBagIsFull: @ 822DFAA .string "Oh, your BAG is full…\n" .string "That's too bad, then.$" diff --git a/data/maps/MeteorFalls_1F_1R/map.json b/data/maps/MeteorFalls_1F_1R/map.json index 200c03e86..46e031857 100644 --- a/data/maps/MeteorFalls_1F_1R/map.json +++ b/data/maps/MeteorFalls_1F_1R/map.json @@ -141,7 +141,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MeteorFalls_1F_1R_EventScript_22BF25", + "script": "MeteorFalls_1F_1R_EventScript_ProfCozmo", "flag": "FLAG_HIDE_METEOR_FALLS_1F_1R_COZMO" } ], @@ -197,7 +197,7 @@ "elevation": 4, "var": "VAR_METEOR_FALLS_STATE", "var_value": "0", - "script": "MeteorFalls_1F_1R_EventScript_22BD5F" + "script": "MeteorFalls_1F_1R_EventScript_MagmaStealsMeteoriteScene" } ], "bg_events": [ diff --git a/data/maps/MeteorFalls_1F_1R/scripts.inc b/data/maps/MeteorFalls_1F_1R/scripts.inc index dc81427bc..ad3eb3eb8 100644 --- a/data/maps/MeteorFalls_1F_1R/scripts.inc +++ b/data/maps/MeteorFalls_1F_1R/scripts.inc @@ -1,19 +1,19 @@ MeteorFalls_1F_1R_MapScripts:: @ 822BD2A - map_script MAP_SCRIPT_ON_LOAD, MeteorFalls_1F_1R_MapScript1_22BD30 + map_script MAP_SCRIPT_ON_LOAD, MeteorFalls_1F_1R_OnLoad .byte 0 -MeteorFalls_1F_1R_MapScript1_22BD30: @ 822BD30 - call_if_set FLAG_SYS_GAME_CLEAR, MeteorFalls_1F_1R_EventScript_22BD3A +MeteorFalls_1F_1R_OnLoad: @ 822BD30 + call_if_set FLAG_SYS_GAME_CLEAR, MeteorFalls_1F_1R_EventScript_OpenStevensCave end -MeteorFalls_1F_1R_EventScript_22BD3A:: @ 822BD3A +MeteorFalls_1F_1R_EventScript_OpenStevensCave:: @ 822BD3A setmetatile 4, 1, METATILE_MeteorFalls_CaveEntrance_Top, 1 setmetatile 3, 2, METATILE_MeteorFalls_CaveEntrance_Left, 1 setmetatile 4, 2, METATILE_MeteorFalls_CaveEntrance_Bottom, 0 setmetatile 5, 2, METATILE_MeteorFalls_CaveEntrance_Right, 1 return -MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F +MeteorFalls_1F_1R_EventScript_MagmaStealsMeteoriteScene:: @ 822BD5F lockall playbgm MUS_MGM0, 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceDown @@ -21,7 +21,7 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F delay 30 applymovement 5, Common_Movement_WalkInPlaceDown waitmovement 0 - msgbox MeteorFalls_1F_1R_Text_22BF47, MSGBOX_DEFAULT + msgbox MeteorFalls_1F_1R_Text_WithThisMeteorite, MSGBOX_DEFAULT closemessage applymovement 5, Common_Movement_WalkInPlaceFastestUp applymovement 6, Common_Movement_WalkInPlaceFastestUp @@ -31,11 +31,11 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F waitmovement 0 applymovement 5, Common_Movement_Delay48 waitmovement 0 - msgbox MeteorFalls_1F_1R_Text_22BF84, MSGBOX_DEFAULT + msgbox MeteorFalls_1F_1R_Text_DontExpectMercyFromMagma, MSGBOX_DEFAULT closemessage - applymovement 5, MeteorFalls_1F_1R_Movement_22BEC0 + applymovement 5, MeteorFalls_1F_1R_Movement_MagmaGruntApproachPlayer waitmovement 0 - msgbox MeteorFalls_1F_1R_Text_22BFE4, MSGBOX_DEFAULT + msgbox MeteorFalls_1F_1R_Text_HoldItRightThereMagma, MSGBOX_DEFAULT closemessage applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft applymovement 5, Common_Movement_WalkInPlaceFastestLeft @@ -45,39 +45,39 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F addobject 8 addobject 9 playbgm MUS_AQA_0, 0 - applymovement 7, MeteorFalls_1F_1R_Movement_22BED9 - applymovement 8, MeteorFalls_1F_1R_Movement_22BEE0 - applymovement 9, MeteorFalls_1F_1R_Movement_22BEE8 + applymovement 7, MeteorFalls_1F_1R_Movement_ArchieArrive + applymovement 8, MeteorFalls_1F_1R_Movement_AquaGrunt1Arrive + applymovement 9, MeteorFalls_1F_1R_Movement_AquaGrunt2Arrive waitmovement 0 applymovement 5, Common_Movement_WalkInPlaceFastestLeft applymovement 6, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - msgbox MeteorFalls_1F_1R_Text_22C04E, MSGBOX_DEFAULT + msgbox MeteorFalls_1F_1R_Text_BeSeeingYouTeamAqua, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, MeteorFalls_1F_1R_Movement_22BF1D - applymovement 5, MeteorFalls_1F_1R_Movement_22BEC4 - applymovement 6, MeteorFalls_1F_1R_Movement_22BECE + applymovement EVENT_OBJ_ID_PLAYER, MeteorFalls_1F_1R_Movement_PushPlayerOutOfWay + applymovement 5, MeteorFalls_1F_1R_Movement_MagmaGrunt1Exit + applymovement 6, MeteorFalls_1F_1R_Movement_MagmaGrunt2Exit waitmovement 0 removeobject 5 removeobject 6 - applymovement 7, MeteorFalls_1F_1R_Movement_22BEF8 + applymovement 7, MeteorFalls_1F_1R_Movement_ArchieApproachPlayer waitmovement 0 - msgbox MeteorFalls_1F_1R_Text_22C11C, MSGBOX_DEFAULT + msgbox MeteorFalls_1F_1R_Text_ArchieSeenYouBefore, MSGBOX_DEFAULT closemessage - applymovement 8, MeteorFalls_1F_1R_Movement_22BF08 - applymovement 9, MeteorFalls_1F_1R_Movement_22BF18 + applymovement 8, MeteorFalls_1F_1R_Movement_AquaGrunt1ApproachArchie + applymovement 9, MeteorFalls_1F_1R_Movement_AquaGrunt2ApproachArchie waitmovement 0 - msgbox MeteorFalls_1F_1R_Text_22C268, MSGBOX_DEFAULT + msgbox MeteorFalls_1F_1R_Text_BossWeShouldChaseMagma, MSGBOX_DEFAULT applymovement 7, Common_Movement_WalkInPlaceFastestDown waitmovement 0 - msgbox MeteorFalls_1F_1R_Text_22C292, MSGBOX_DEFAULT + msgbox MeteorFalls_1F_1R_Text_ArchieYesNoTellingWhatMagmaWillDo, MSGBOX_DEFAULT applymovement 7, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - msgbox MeteorFalls_1F_1R_Text_22C2FC, MSGBOX_DEFAULT + msgbox MeteorFalls_1F_1R_Text_ArchieFarewell, MSGBOX_DEFAULT closemessage - applymovement 7, MeteorFalls_1F_1R_Movement_22BEF0 - applymovement 8, MeteorFalls_1F_1R_Movement_22BEFE - applymovement 9, MeteorFalls_1F_1R_Movement_22BF0D + applymovement 7, MeteorFalls_1F_1R_Movement_ArchieExit + applymovement 8, MeteorFalls_1F_1R_Movement_AquaGrunt1Exit + applymovement 9, MeteorFalls_1F_1R_Movement_AquaGrunt2Exit waitmovement 0 fadedefaultbgm removeobject 7 @@ -85,18 +85,18 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F removeobject 9 setflag FLAG_HIDE_ROUTE_112_TEAM_MAGMA setflag FLAG_MET_ARCHIE_METEOR_FALLS - setflag FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT + setflag FLAG_HIDE_FALLARBOR_TOWN_BATTLE_TENT_SCOTT setvar VAR_METEOR_FALLS_STATE, 1 releaseall end -MeteorFalls_1F_1R_Movement_22BEC0: @ 822BEC0 +MeteorFalls_1F_1R_Movement_MagmaGruntApproachPlayer: @ 822BEC0 walk_right walk_right walk_in_place_fastest_up step_end -MeteorFalls_1F_1R_Movement_22BEC4: @ 822BEC4 +MeteorFalls_1F_1R_Movement_MagmaGrunt1Exit: @ 822BEC4 walk_fast_up walk_fast_up walk_fast_right @@ -108,7 +108,7 @@ MeteorFalls_1F_1R_Movement_22BEC4: @ 822BEC4 walk_fast_right step_end -MeteorFalls_1F_1R_Movement_22BECE: @ 822BECE +MeteorFalls_1F_1R_Movement_MagmaGrunt2Exit: @ 822BECE walk_fast_up walk_fast_up walk_fast_up @@ -121,7 +121,7 @@ MeteorFalls_1F_1R_Movement_22BECE: @ 822BECE walk_fast_right step_end -MeteorFalls_1F_1R_Movement_22BED9: @ 822BED9 +MeteorFalls_1F_1R_Movement_ArchieArrive: @ 822BED9 walk_right walk_right walk_right @@ -130,7 +130,7 @@ MeteorFalls_1F_1R_Movement_22BED9: @ 822BED9 walk_right step_end -MeteorFalls_1F_1R_Movement_22BEE0: @ 822BEE0 +MeteorFalls_1F_1R_Movement_AquaGrunt1Arrive: @ 822BEE0 delay_16 delay_16 walk_right @@ -140,7 +140,7 @@ MeteorFalls_1F_1R_Movement_22BEE0: @ 822BEE0 walk_right step_end -MeteorFalls_1F_1R_Movement_22BEE8: @ 822BEE8 +MeteorFalls_1F_1R_Movement_AquaGrunt2Arrive: @ 822BEE8 delay_16 delay_16 walk_right @@ -150,7 +150,7 @@ MeteorFalls_1F_1R_Movement_22BEE8: @ 822BEE8 walk_right step_end -MeteorFalls_1F_1R_Movement_22BEF0: @ 822BEF0 +MeteorFalls_1F_1R_Movement_ArchieExit: @ 822BEF0 walk_right walk_right walk_right @@ -160,7 +160,7 @@ MeteorFalls_1F_1R_Movement_22BEF0: @ 822BEF0 walk_right step_end -MeteorFalls_1F_1R_Movement_22BEF8: @ 822BEF8 +MeteorFalls_1F_1R_Movement_ArchieApproachPlayer: @ 822BEF8 walk_right walk_right walk_up @@ -168,7 +168,7 @@ MeteorFalls_1F_1R_Movement_22BEF8: @ 822BEF8 walk_in_place_fastest_left step_end -MeteorFalls_1F_1R_Movement_22BEFE: @ 822BEFE +MeteorFalls_1F_1R_Movement_AquaGrunt1Exit: @ 822BEFE walk_up walk_up walk_right @@ -180,14 +180,14 @@ MeteorFalls_1F_1R_Movement_22BEFE: @ 822BEFE walk_right step_end -MeteorFalls_1F_1R_Movement_22BF08: @ 822BF08 +MeteorFalls_1F_1R_Movement_AquaGrunt1ApproachArchie: @ 822BF08 walk_right walk_right walk_right walk_in_place_fastest_up step_end -MeteorFalls_1F_1R_Movement_22BF0D: @ 822BF0D +MeteorFalls_1F_1R_Movement_AquaGrunt2Exit: @ 822BF0D walk_up walk_up walk_up @@ -200,14 +200,14 @@ MeteorFalls_1F_1R_Movement_22BF0D: @ 822BF0D walk_right step_end -MeteorFalls_1F_1R_Movement_22BF18: @ 822BF18 +MeteorFalls_1F_1R_Movement_AquaGrunt2ApproachArchie: @ 822BF18 walk_right walk_right walk_right walk_in_place_fastest_up step_end -MeteorFalls_1F_1R_Movement_22BF1D: @ 822BF1D +MeteorFalls_1F_1R_Movement_PushPlayerOutOfWay: @ 822BF1D walk_in_place_fastest_down delay_4 walk_in_place_fastest_right @@ -217,37 +217,37 @@ MeteorFalls_1F_1R_Movement_22BF1D: @ 822BF1D face_right step_end -MeteorFalls_1F_1R_EventScript_22BF25:: @ 822BF25 +MeteorFalls_1F_1R_EventScript_ProfCozmo:: @ 822BF25 lock faceplayer - goto_if_set FLAG_MET_PROF_COSMO, MeteorFalls_1F_1R_EventScript_22BF3D - setflag FLAG_MET_PROF_COSMO - msgbox MeteorFalls_1F_1R_Text_22C342, MSGBOX_DEFAULT + goto_if_set FLAG_MET_PROF_COZMO, MeteorFalls_1F_1R_EventScript_MetCozmo + setflag FLAG_MET_PROF_COZMO + msgbox MeteorFalls_1F_1R_Text_MeetProfCozmo, MSGBOX_DEFAULT release end -MeteorFalls_1F_1R_EventScript_22BF3D:: @ 822BF3D - msgbox MeteorFalls_1F_1R_Text_22C47D, MSGBOX_DEFAULT +MeteorFalls_1F_1R_EventScript_MetCozmo:: @ 822BF3D + msgbox MeteorFalls_1F_1R_Text_WhatsTeamMagmaDoingAtMtChimney, MSGBOX_DEFAULT release end -MeteorFalls_1F_1R_Text_22BF47: @ 822BF47 +MeteorFalls_1F_1R_Text_WithThisMeteorite: @ 822BF47 .string "Hehehe!\p" .string "With this METEORITE, that thing in\n" .string "MT. CHIMNEY will…$" -MeteorFalls_1F_1R_Text_22BF84: @ 822BF84 +MeteorFalls_1F_1R_Text_DontExpectMercyFromMagma: @ 822BF84 .string "Heh?\p" .string "I don't know who you are, but if you get\n" .string "in the way of TEAM MAGMA, don't\l" .string "expect any mercy!$" -MeteorFalls_1F_1R_Text_22BFE4: @ 822BFE4 +MeteorFalls_1F_1R_Text_HoldItRightThereMagma: @ 822BFE4 .string "Hold it right there, TEAM MAGMA!\p" .string "You're badly mistaken if you think you\n" .string "can have your way with the world!$" -MeteorFalls_1F_1R_Text_22C04E: @ 822C04E +MeteorFalls_1F_1R_Text_BeSeeingYouTeamAqua: @ 822C04E .string "Hehehe!\n" .string "Even TEAM AQUA joins us!\p" .string "But it's too much trouble to deal with\n" @@ -258,7 +258,7 @@ MeteorFalls_1F_1R_Text_22C04E: @ 822C04E .string "Hehehe! Be seeing you, you TEAM\n" .string "AQUA dingbats!$" -MeteorFalls_1F_1R_Text_22C11C: @ 822C11C +MeteorFalls_1F_1R_Text_ArchieSeenYouBefore: @ 822C11C .string "ARCHIE: Didn't I see you before?\n" .string "At SLATEPORT's MUSEUM?\p" .string "Ah, so your name is {PLAYER}.\p" @@ -273,22 +273,22 @@ MeteorFalls_1F_1R_Text_22C11C: @ 822C11C .string "They are the rivals to us,\n" .string "the sea-loving TEAM AQUA!$" -MeteorFalls_1F_1R_Text_22C268: @ 822C268 +MeteorFalls_1F_1R_Text_BossWeShouldChaseMagma: @ 822C268 .string "BOSS, we should give chase to\n" .string "TEAM MAGMA…$" -MeteorFalls_1F_1R_Text_22C292: @ 822C292 +MeteorFalls_1F_1R_Text_ArchieYesNoTellingWhatMagmaWillDo: @ 822C292 .string "ARCHIE: Yes, yes, we must!\n" .string "We've got to hurry.\p" .string "There's no telling what TEAM MAGMA\n" .string "will do at MT. CHIMNEY!$" -MeteorFalls_1F_1R_Text_22C2FC: @ 822C2FC +MeteorFalls_1F_1R_Text_ArchieFarewell: @ 822C2FC .string "ARCHIE: {PLAYER}, you should keep\n" .string "an eye out for TEAM MAGMA, too.\p" .string "Farewell!$" -MeteorFalls_1F_1R_Text_22C342: @ 822C342 +MeteorFalls_1F_1R_Text_MeetProfCozmo: @ 822C342 .string "I… I'm COZMO…\n" .string "I'm a PROFESSOR…\p" .string "TEAM MAGMA asked me to guide them\n" @@ -303,7 +303,7 @@ MeteorFalls_1F_1R_Text_22C342: @ 822C342 .string "What are they going to do with that\n" .string "METEORITE at MT. CHIMNEY?$" -MeteorFalls_1F_1R_Text_22C47D: @ 822C47D +MeteorFalls_1F_1R_Text_WhatsTeamMagmaDoingAtMtChimney: @ 822C47D .string "PROF. COZMO: But that TEAM MAGMA…\p" .string "What are they going to do with that\n" .string "METEORITE at MT. CHIMNEY?$" diff --git a/data/maps/MeteorFalls_1F_2R/map.json b/data/maps/MeteorFalls_1F_2R/map.json index be52085cd..1b27e859e 100644 --- a/data/maps/MeteorFalls_1F_2R/map.json +++ b/data/maps/MeteorFalls_1F_2R/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "MeteorFalls_1F_2R_EventScript_22C4DE", + "script": "MeteorFalls_1F_2R_EventScript_Nicolas", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "MeteorFalls_1F_2R_EventScript_22C540", + "script": "MeteorFalls_1F_2R_EventScript_John", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "MeteorFalls_1F_2R_EventScript_22C5A4", + "script": "MeteorFalls_1F_2R_EventScript_Jay", "flag": "0" } ], diff --git a/data/maps/MeteorFalls_1F_2R/scripts.inc b/data/maps/MeteorFalls_1F_2R/scripts.inc index 9ed8053c6..0fa73212e 100644 --- a/data/maps/MeteorFalls_1F_2R/scripts.inc +++ b/data/maps/MeteorFalls_1F_2R/scripts.inc @@ -1,184 +1,184 @@ MeteorFalls_1F_2R_MapScripts:: @ 822C4DD .byte 0 -MeteorFalls_1F_2R_EventScript_22C4DE:: @ 822C4DE - trainerbattle_single TRAINER_NICOLAS_1, MeteorFalls_1F_2R_Text_22C608, MeteorFalls_1F_2R_Text_22C678, MeteorFalls_1F_2R_EventScript_22C50A +MeteorFalls_1F_2R_EventScript_Nicolas:: @ 822C4DE + trainerbattle_single TRAINER_NICOLAS_1, MeteorFalls_1F_2R_Text_NicolasIntro, MeteorFalls_1F_2R_Text_NicolasDefeat, MeteorFalls_1F_2R_EventScript_RegisterNicolas specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq MeteorFalls_1F_2R_EventScript_22C529 - msgbox MeteorFalls_1F_2R_Text_22C6A3, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq MeteorFalls_1F_2R_EventScript_RematchNicolas + msgbox MeteorFalls_1F_2R_Text_NicolasPostBattle, MSGBOX_DEFAULT release end -MeteorFalls_1F_2R_EventScript_22C50A:: @ 822C50A +MeteorFalls_1F_2R_EventScript_RegisterNicolas:: @ 822C50A special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox MeteorFalls_1F_2R_Text_22C6F6, MSGBOX_DEFAULT + msgbox MeteorFalls_1F_2R_Text_NicolasRegister, MSGBOX_DEFAULT register_matchcall TRAINER_NICOLAS_1 release end -MeteorFalls_1F_2R_EventScript_22C529:: @ 822C529 - trainerbattle_rematch TRAINER_NICOLAS_1, MeteorFalls_1F_2R_Text_22C73F, MeteorFalls_1F_2R_Text_22C7AD - msgbox MeteorFalls_1F_2R_Text_22C7D8, MSGBOX_AUTOCLOSE +MeteorFalls_1F_2R_EventScript_RematchNicolas:: @ 822C529 + trainerbattle_rematch TRAINER_NICOLAS_1, MeteorFalls_1F_2R_Text_NicolasRematchIntro, MeteorFalls_1F_2R_Text_NicolasRematchDefeat + msgbox MeteorFalls_1F_2R_Text_NicolasPostRematch, MSGBOX_AUTOCLOSE end -MeteorFalls_1F_2R_EventScript_22C540:: @ 822C540 - trainerbattle_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_22C843, MeteorFalls_1F_2R_Text_22C89C, MeteorFalls_1F_2R_Text_22C92B, MeteorFalls_1F_2R_EventScript_22C570 +MeteorFalls_1F_2R_EventScript_John:: @ 822C540 + trainerbattle_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_JohnIntro, MeteorFalls_1F_2R_Text_JohnDefeat, MeteorFalls_1F_2R_Text_JohnNotEnoughMons, MeteorFalls_1F_2R_EventScript_RegisterJohn specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq MeteorFalls_1F_2R_EventScript_22C589 - msgbox MeteorFalls_1F_2R_Text_22C8C1, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq MeteorFalls_1F_2R_EventScript_RematchJohn + msgbox MeteorFalls_1F_2R_Text_JohnPostBattle, MSGBOX_DEFAULT release end -MeteorFalls_1F_2R_EventScript_22C570:: @ 822C570 - msgbox MeteorFalls_1F_2R_Text_22C99C, MSGBOX_DEFAULT +MeteorFalls_1F_2R_EventScript_RegisterJohn:: @ 822C570 + msgbox MeteorFalls_1F_2R_Text_JohnRegister, MSGBOX_DEFAULT register_matchcall TRAINER_JOHN_AND_JAY_1 release end -MeteorFalls_1F_2R_EventScript_22C589:: @ 822C589 - trainerbattle_rematch_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_22CB47, MeteorFalls_1F_2R_Text_22CBA0, MeteorFalls_1F_2R_Text_22CC27 - msgbox MeteorFalls_1F_2R_Text_22CBC5, MSGBOX_AUTOCLOSE +MeteorFalls_1F_2R_EventScript_RematchJohn:: @ 822C589 + trainerbattle_rematch_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_JohnRematchIntro, MeteorFalls_1F_2R_Text_JohnRematchDefeat, MeteorFalls_1F_2R_Text_JohnRematchNotEnoughMons + msgbox MeteorFalls_1F_2R_Text_JohnPostRematch, MSGBOX_AUTOCLOSE end -MeteorFalls_1F_2R_EventScript_22C5A4:: @ 822C5A4 - trainerbattle_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_22C9E6, MeteorFalls_1F_2R_Text_22CA44, MeteorFalls_1F_2R_Text_22CACD, MeteorFalls_1F_2R_EventScript_22C5D4 +MeteorFalls_1F_2R_EventScript_Jay:: @ 822C5A4 + trainerbattle_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_JayIntro, MeteorFalls_1F_2R_Text_JayDefeat, MeteorFalls_1F_2R_Text_JayNotEnoughMons, MeteorFalls_1F_2R_EventScript_RegisterJay specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq MeteorFalls_1F_2R_EventScript_22C5ED - msgbox MeteorFalls_1F_2R_Text_22CA70, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq MeteorFalls_1F_2R_EventScript_RematchJay + msgbox MeteorFalls_1F_2R_Text_JayPostBattle, MSGBOX_DEFAULT release end -MeteorFalls_1F_2R_EventScript_22C5D4:: @ 822C5D4 - msgbox MeteorFalls_1F_2R_Text_22C99C, MSGBOX_DEFAULT +MeteorFalls_1F_2R_EventScript_RegisterJay:: @ 822C5D4 + msgbox MeteorFalls_1F_2R_Text_JohnRegister, MSGBOX_DEFAULT @ John speaks for both during register register_matchcall TRAINER_JOHN_AND_JAY_1 release end -MeteorFalls_1F_2R_EventScript_22C5ED:: @ 822C5ED - trainerbattle_rematch_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_22CC98, MeteorFalls_1F_2R_Text_22CD08, MeteorFalls_1F_2R_Text_22CDAB - msgbox MeteorFalls_1F_2R_Text_22CD34, MSGBOX_AUTOCLOSE +MeteorFalls_1F_2R_EventScript_RematchJay:: @ 822C5ED + trainerbattle_rematch_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_JayRematchIntro, MeteorFalls_1F_2R_Text_JayRematchDefeat, MeteorFalls_1F_2R_Text_JayRematchNotEnoughMons + msgbox MeteorFalls_1F_2R_Text_JayPostRematch, MSGBOX_AUTOCLOSE end -MeteorFalls_1F_2R_Text_22C608: @ 822C608 +MeteorFalls_1F_2R_Text_NicolasIntro: @ 822C608 .string "This is where we DRAGON users do our\n" .string "training.\p" .string "The CHAMPION even visits.\n" .string "Now do you see how special it is here?$" -MeteorFalls_1F_2R_Text_22C678: @ 822C678 +MeteorFalls_1F_2R_Text_NicolasDefeat: @ 822C678 .string "Urgh!\n" .string "I didn't expect you to be so strong!$" -MeteorFalls_1F_2R_Text_22C6A3: @ 822C6A3 +MeteorFalls_1F_2R_Text_NicolasPostBattle: @ 822C6A3 .string "The road ahead remains long and harsh.\p" .string "When will my POKéMON and I become\n" .string "the best?$" -MeteorFalls_1F_2R_Text_22C6F6: @ 822C6F6 +MeteorFalls_1F_2R_Text_NicolasRegister: @ 822C6F6 .string "I want to know more about your power.\n" .string "Let me register you in my POKéNAV.$" -MeteorFalls_1F_2R_Text_22C73F: @ 822C73F +MeteorFalls_1F_2R_Text_NicolasRematchIntro: @ 822C73F .string "Since we met, we have trained hard\n" .string "with our sights on number one.\p" .string "Help us see how much stronger we've\n" .string "become!$" -MeteorFalls_1F_2R_Text_22C7AD: @ 822C7AD +MeteorFalls_1F_2R_Text_NicolasRematchDefeat: @ 822C7AD .string "Urgh!\n" .string "I didn't expect you to be so strong!$" -MeteorFalls_1F_2R_Text_22C7D8: @ 822C7D8 +MeteorFalls_1F_2R_Text_NicolasPostRematch: @ 822C7D8 .string "You've obviously kept up your\n" .string "POKéMON training.\p" .string "So long as you remain strong, I, too,\n" .string "can become stronger!$" -MeteorFalls_1F_2R_Text_22C843: @ 822C843 +MeteorFalls_1F_2R_Text_JohnIntro: @ 822C843 .string "JOHN: We've always battled POKéMON\n" .string "together as a twosome.\l" .string "We've confidence in ourselves.$" -MeteorFalls_1F_2R_Text_22C89C: @ 822C89C +MeteorFalls_1F_2R_Text_JohnDefeat: @ 822C89C .string "JOHN: Oh, my.\n" .string "We've lost, dear wife.$" -MeteorFalls_1F_2R_Text_22C8C1: @ 822C8C1 +MeteorFalls_1F_2R_Text_JohnPostBattle: @ 822C8C1 .string "JOHN: We've been married for\n" .string "fifty years.\p" .string "Come to think of it, I've yet to beat\n" .string "my dear wife in a battle.$" -MeteorFalls_1F_2R_Text_22C92B: @ 822C92B +MeteorFalls_1F_2R_Text_JohnNotEnoughMons: @ 822C92B .string "JOHN: Well, well, what a young TRAINER!\p" .string "Will you battle with us? If so, you'll\n" .string "have to return with more POKéMON.$" -MeteorFalls_1F_2R_Text_22C99C: @ 822C99C +MeteorFalls_1F_2R_Text_JohnRegister: @ 822C99C .string "JOHN: Young TRAINER, if the chance\n" .string "arises, will you battle with us again?$" -MeteorFalls_1F_2R_Text_22C9E6: @ 822C9E6 +MeteorFalls_1F_2R_Text_JayIntro: @ 822C9E6 .string "JAY: We've been married for\n" .string "fifty years.\p" .string "The bond we share as a couple could\n" .string "never be broken.$" -MeteorFalls_1F_2R_Text_22CA44: @ 822CA44 +MeteorFalls_1F_2R_Text_JayDefeat: @ 822CA44 .string "JAY: Oh, dear.\n" .string "We've lost, my dear husband.$" -MeteorFalls_1F_2R_Text_22CA70: @ 822CA70 +MeteorFalls_1F_2R_Text_JayPostBattle: @ 822CA70 .string "JAY: Fifty years of marriage…\p" .string "If we ever argued, we always settled\n" .string "it with a POKéMON battle…$" -MeteorFalls_1F_2R_Text_22CACD: @ 822CACD +MeteorFalls_1F_2R_Text_JayNotEnoughMons: @ 822CACD .string "JAY: Well, well, aren't you a young\n" .string "TRAINER?\p" .string "If you'd care to battle with us, you'll\n" .string "have to come back with more POKéMON.$" -MeteorFalls_1F_2R_Text_22CB47: @ 822CB47 +MeteorFalls_1F_2R_Text_JohnRematchIntro: @ 822CB47 .string "JOHN: We've always battled POKéMON\n" .string "together as a twosome.\l" .string "We've confidence in ourselves.$" -MeteorFalls_1F_2R_Text_22CBA0: @ 822CBA0 +MeteorFalls_1F_2R_Text_JohnRematchDefeat: @ 822CBA0 .string "JOHN: Oh, my.\n" .string "We've lost, dear wife.$" -MeteorFalls_1F_2R_Text_22CBC5: @ 822CBC5 +MeteorFalls_1F_2R_Text_JohnPostRematch: @ 822CBC5 .string "JOHN: Married for fifty years…\p" .string "On reflection, the dear wife and I,\n" .string "we battled day in and day out…$" -MeteorFalls_1F_2R_Text_22CC27: @ 822CC27 +MeteorFalls_1F_2R_Text_JohnRematchNotEnoughMons: @ 822CC27 .string "JOHN: Well, well, what a young TRAINER!\p" .string "Will you battle with us? If so, you'll\n" .string "have to return with more POKéMON.$" -MeteorFalls_1F_2R_Text_22CC98: @ 822CC98 +MeteorFalls_1F_2R_Text_JayRematchIntro: @ 822CC98 .string "JAY: We've been married for\n" .string "fifty years.\p" .string "We've supported each other all that\n" .string "time. We've made ourselves strong.$" -MeteorFalls_1F_2R_Text_22CD08: @ 822CD08 +MeteorFalls_1F_2R_Text_JayRematchDefeat: @ 822CD08 .string "JAY: Oh, dear.\n" .string "We've lost, my dear husband.$" -MeteorFalls_1F_2R_Text_22CD34: @ 822CD34 +MeteorFalls_1F_2R_Text_JayPostRematch: @ 822CD34 .string "JAY: Fifty years of marriage…\n" .string "Many things have happened.\p" .string "I hope that we will continue to make\n" .string "happy memories together.$" -MeteorFalls_1F_2R_Text_22CDAB: @ 822CDAB +MeteorFalls_1F_2R_Text_JayRematchNotEnoughMons: @ 822CDAB .string "JAY: Well, well, aren't you a young\n" .string "TRAINER?\p" .string "If you'd care to battle with us, you'll\n" diff --git a/data/maps/MeteorFalls_StevensCave/map.json b/data/maps/MeteorFalls_StevensCave/map.json index b23c3f952..c5ad26805 100644 --- a/data/maps/MeteorFalls_StevensCave/map.json +++ b/data/maps/MeteorFalls_StevensCave/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MeteorFalls_StevensCave_EventScript_23B182", + "script": "MeteorFalls_StevensCave_EventScript_Steven", "flag": "0" } ], diff --git a/data/maps/MeteorFalls_StevensCave/scripts.inc b/data/maps/MeteorFalls_StevensCave/scripts.inc index 31baad43c..71313be67 100644 --- a/data/maps/MeteorFalls_StevensCave/scripts.inc +++ b/data/maps/MeteorFalls_StevensCave/scripts.inc @@ -1,9 +1,9 @@ MeteorFalls_StevensCave_MapScripts:: @ 823B181 .byte 0 -MeteorFalls_StevensCave_EventScript_23B182:: @ 823B182 +MeteorFalls_StevensCave_EventScript_Steven:: @ 823B182 lock - goto_if_set FLAG_DEFEATED_METEOR_FALLS_STEVEN, MeteorFalls_StevensCave_EventScript_23B1CD + goto_if_set FLAG_DEFEATED_METEOR_FALLS_STEVEN, MeteorFalls_StevensCave_EventScript_Defeated waitse playse SE_PIN applymovement 1, Common_Movement_ExclamationMark @@ -12,21 +12,21 @@ MeteorFalls_StevensCave_EventScript_23B182:: @ 823B182 waitmovement 0 applymovement 1, Common_Movement_FacePlayer waitmovement 0 - msgbox MeteorFalls_StevensCave_Text_23B1E1, MSGBOX_DEFAULT - trainerbattle_no_intro TRAINER_STEVEN, MeteorFalls_StevensCave_Text_23B32D - msgbox MeteorFalls_StevensCave_Text_23B358, MSGBOX_DEFAULT + msgbox MeteorFalls_StevensCave_Text_ShouldKnowHowGoodIAmExpectWorst, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_STEVEN, MeteorFalls_StevensCave_Text_StevenDefeat + msgbox MeteorFalls_StevensCave_Text_MyPredictionCameTrue, MSGBOX_DEFAULT setflag FLAG_DEFEATED_METEOR_FALLS_STEVEN release end -MeteorFalls_StevensCave_EventScript_23B1CD:: @ 823B1CD +MeteorFalls_StevensCave_EventScript_Defeated:: @ 823B1CD applymovement 1, Common_Movement_FacePlayer waitmovement 0 - msgbox MeteorFalls_StevensCave_Text_23B358, MSGBOX_DEFAULT + msgbox MeteorFalls_StevensCave_Text_MyPredictionCameTrue, MSGBOX_DEFAULT release end -MeteorFalls_StevensCave_Text_23B1E1: @ 823B1E1 +MeteorFalls_StevensCave_Text_ShouldKnowHowGoodIAmExpectWorst: @ 823B1E1 .string "STEVEN: Oh, wow, {PLAYER}{KUN}.\n" .string "I'm amazed you knew where to find me.\p" .string "Do you, uh…maybe think of me as\n" @@ -39,11 +39,11 @@ MeteorFalls_StevensCave_Text_23B1E1: @ 823B1E1 .string "Okay, {PLAYER}{KUN}, if you're going to mount\n" .string "a serious challenge, expect the worst!$" -MeteorFalls_StevensCave_Text_23B32D: @ 823B32D +MeteorFalls_StevensCave_Text_StevenDefeat: @ 823B32D .string "You…\n" .string "I had no idea you'd become so strong…$" -MeteorFalls_StevensCave_Text_23B358: @ 823B358 +MeteorFalls_StevensCave_Text_MyPredictionCameTrue: @ 823B358 .string "STEVEN: Come to think of it, ever since\n" .string "our paths first crossed in GRANITE\l" .string "CAVE in DEWFORD, I had this feeling.\p" diff --git a/data/maps/MirageTower_4F/map.json b/data/maps/MirageTower_4F/map.json index 45e5fa62b..71e080a23 100644 --- a/data/maps/MirageTower_4F/map.json +++ b/data/maps/MirageTower_4F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MirageTower_4F_EventScript_23AD48", + "script": "MirageTower_4F_EventScript_RootFossil", "flag": "FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MirageTower_4F_EventScript_23AD89", + "script": "MirageTower_4F_EventScript_ClawFossil", "flag": "FLAG_HIDE_MIRAGE_TOWER_CLAW_FOSSIL" }, { diff --git a/data/maps/MirageTower_4F/scripts.inc b/data/maps/MirageTower_4F/scripts.inc index ac3afdce6..d23cb160e 100644 --- a/data/maps/MirageTower_4F/scripts.inc +++ b/data/maps/MirageTower_4F/scripts.inc @@ -1,12 +1,12 @@ MirageTower_4F_MapScripts:: @ 823AD47 .byte 0 -MirageTower_4F_EventScript_23AD48:: @ 823AD48 +MirageTower_4F_EventScript_RootFossil:: @ 823AD48 lock faceplayer - msgbox MirageTower_4F_Text_23ADF9, MSGBOX_YESNO + msgbox MirageTower_4F_Text_TakeRootFossil, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq MirageTower_4F_EventScript_23AD7F + goto_if_eq MirageTower_4F_EventScript_LeaveRootFossil giveitem_std ITEM_ROOT_FOSSIL closemessage setflag FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL @@ -14,20 +14,20 @@ MirageTower_4F_EventScript_23AD48:: @ 823AD48 removeobject 1 delay 30 setflag FLAG_CHOSE_ROOT_FOSSIL - goto MirageTower_4F_EventScript_23ADCA + goto MirageTower_4F_EventScript_CollapseMirageTower end -MirageTower_4F_EventScript_23AD7F:: @ 823AD7F - msgbox MirageTower_4F_Text_23AE79, MSGBOX_DEFAULT +MirageTower_4F_EventScript_LeaveRootFossil:: @ 823AD7F + msgbox MirageTower_4F_Text_LeftRootFossilAlone, MSGBOX_DEFAULT release end -MirageTower_4F_EventScript_23AD89:: @ 823AD89 +MirageTower_4F_EventScript_ClawFossil:: @ 823AD89 lock faceplayer - msgbox MirageTower_4F_Text_23AE98, MSGBOX_YESNO + msgbox MirageTower_4F_Text_TakeClawFossil, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq MirageTower_4F_EventScript_23ADC0 + goto_if_eq MirageTower_4F_EventScript_LeaveClawFossil giveitem_std ITEM_CLAW_FOSSIL closemessage setflag FLAG_HIDE_MIRAGE_TOWER_CLAW_FOSSIL @@ -35,15 +35,15 @@ MirageTower_4F_EventScript_23AD89:: @ 823AD89 removeobject 2 delay 30 setflag FLAG_CHOSE_CLAW_FOSSIL - goto MirageTower_4F_EventScript_23ADCA + goto MirageTower_4F_EventScript_CollapseMirageTower end -MirageTower_4F_EventScript_23ADC0:: @ 823ADC0 - msgbox MirageTower_4F_Text_23AF18, MSGBOX_DEFAULT +MirageTower_4F_EventScript_LeaveClawFossil:: @ 823ADC0 + msgbox MirageTower_4F_Text_LeaveClawFossilAlone, MSGBOX_DEFAULT release end -MirageTower_4F_EventScript_23ADCA:: @ 823ADCA +MirageTower_4F_EventScript_CollapseMirageTower:: @ 823ADCA setvar VAR_0x8004, 1 @ vertical pan setvar VAR_0x8005, 1 @ horizontal pan setvar VAR_0x8006, 32 @ num shakes @@ -59,21 +59,21 @@ MirageTower_4F_EventScript_23ADCA:: @ 823ADCA release end -MirageTower_4F_Text_23ADF9: @ 823ADF9 +MirageTower_4F_Text_TakeRootFossil: @ 823ADF9 .string "You found the ROOT FOSSIL.\p" .string "If this FOSSIL is taken, the ground\n" .string "around it will likely crumble away…\p" .string "Take the ROOT FOSSIL anyway?$" -MirageTower_4F_Text_23AE79: @ 823AE79 +MirageTower_4F_Text_LeftRootFossilAlone: @ 823AE79 .string "{PLAYER} left the ROOT FOSSIL alone.$" -MirageTower_4F_Text_23AE98: @ 823AE98 +MirageTower_4F_Text_TakeClawFossil: @ 823AE98 .string "You found the CLAW FOSSIL.\p" .string "If this FOSSIL is taken, the ground\n" .string "around it will likely crumble away…\p" .string "Take the CLAW FOSSIL anyway?$" -MirageTower_4F_Text_23AF18: @ 823AF18 +MirageTower_4F_Text_LeaveClawFossilAlone: @ 823AF18 .string "{PLAYER} left the CLAW FOSSIL alone.$" diff --git a/data/maps/RusturfTunnel/map.json b/data/maps/RusturfTunnel/map.json index bd5c8206d..f01096ad4 100644 --- a/data/maps/RusturfTunnel/map.json +++ b/data/maps/RusturfTunnel/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RusturfTunnel_EventScript_22CE76", + "script": "RusturfTunnel_EventScript_WandasBoyfriend", "flag": "FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN" }, { @@ -77,7 +77,7 @@ "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", - "flag": "FLAG_HIDE_RUSTURF_TUNNEL_OLD_MAN" + "flag": "FLAG_HIDE_RUSTURF_TUNNEL_BRINEY" }, { "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", @@ -89,7 +89,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RusturfTunnel_EventScript_22D0C2", + "script": "RusturfTunnel_EventScript_Grunt", "flag": "FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT" }, { @@ -102,7 +102,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RusturfTunnel_EventScript_22D0AF", + "script": "RusturfTunnel_EventScript_Peeko", "flag": "FLAG_HIDE_RUSTURF_TUNNEL_PEEKO" }, { @@ -128,7 +128,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "RusturfTunnel_EventScript_22D1B1", + "script": "RusturfTunnel_EventScript_Mike", "flag": "0" }, { @@ -141,7 +141,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RusturfTunnel_EventScript_22CE5F", + "script": "RusturfTunnel_EventScript_Wanda", "flag": "FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN" } ], @@ -176,7 +176,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "RusturfTunnel_EventScript_22D071" + "script": "RusturfTunnel_EventScript_TunnelBlockagePos1" }, { "type": "trigger", @@ -185,7 +185,7 @@ "elevation": 3, "var": "VAR_RUSTURF_TUNNEL_STATE", "var_value": "2", - "script": "RusturfTunnel_EventScript_22D083" + "script": "RusturfTunnel_EventScript_AquaGruntBackUp" }, { "type": "trigger", @@ -194,7 +194,7 @@ "elevation": 3, "var": "VAR_RUSTURF_TUNNEL_STATE", "var_value": "2", - "script": "RusturfTunnel_EventScript_22D083" + "script": "RusturfTunnel_EventScript_AquaGruntBackUp" }, { "type": "trigger", @@ -203,7 +203,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "RusturfTunnel_EventScript_22D077" + "script": "RusturfTunnel_EventScript_TunnelBlockagePos2" }, { "type": "trigger", @@ -212,7 +212,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "RusturfTunnel_EventScript_22D07D" + "script": "RusturfTunnel_EventScript_TunnelBlockagePos3" } ], "bg_events": [] diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc index aa66ffcc1..9219ba3e4 100644 --- a/data/maps/RusturfTunnel/scripts.inc +++ b/data/maps/RusturfTunnel/scripts.inc @@ -1,146 +1,146 @@ RusturfTunnel_MapScripts:: @ 822CE27 map_script MAP_SCRIPT_ON_TRANSITION, RusturfTunnel_OnTransition - map_script MAP_SCRIPT_ON_FRAME_TABLE, RusturfTunnel_MapScript2_22CE32 + map_script MAP_SCRIPT_ON_FRAME_TABLE, RusturfTunnel_OnFrame .byte 0 -RusturfTunnel_MapScript2_22CE32: @ 822CE32 - map_script_2 VAR_RUSTURF_TUNNEL_STATE, 4, RusturfTunnel_EventScript_22CEAE - map_script_2 VAR_RUSTURF_TUNNEL_STATE, 5, RusturfTunnel_EventScript_22CEAE +RusturfTunnel_OnFrame: @ 822CE32 + map_script_2 VAR_RUSTURF_TUNNEL_STATE, 4, RusturfTunnel_EventScript_ClearTunnelScene + map_script_2 VAR_RUSTURF_TUNNEL_STATE, 5, RusturfTunnel_EventScript_ClearTunnelScene .2byte 0 RusturfTunnel_OnTransition: @ 822CE44 compare VAR_RUSTURF_TUNNEL_STATE, 2 - call_if_eq RusturfTunnel_EventScript_22CE50 + call_if_eq RusturfTunnel_EventScript_SetAquaGruntAndPeekoPos end -RusturfTunnel_EventScript_22CE50:: @ 822CE50 +RusturfTunnel_EventScript_SetAquaGruntAndPeekoPos:: @ 822CE50 setobjectxyperm 7, 13, 4 setobjectxyperm 6, 13, 5 return -RusturfTunnel_EventScript_22CE5F:: @ 822CE5F +RusturfTunnel_EventScript_Wanda:: @ 822CE5F lock faceplayer - msgbox RusturfTunnel_Text_22D7A3, MSGBOX_DEFAULT + msgbox RusturfTunnel_Text_BoyfriendOnOtherSideOfRock, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end -RusturfTunnel_EventScript_22CE76:: @ 822CE76 +RusturfTunnel_EventScript_WandasBoyfriend:: @ 822CE76 lock faceplayer - goto_if_set FLAG_TEMP_1, RusturfTunnel_EventScript_22CE99 + goto_if_set FLAG_TEMP_1, RusturfTunnel_EventScript_AlreadySpokenTo setflag FLAG_TEMP_1 - msgbox RusturfTunnel_Text_22D510, MSGBOX_DEFAULT + msgbox RusturfTunnel_Text_WhyCantTheyKeepDigging, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end -RusturfTunnel_EventScript_22CE99:: @ 822CE99 - msgbox RusturfTunnel_Text_22D5F3, MSGBOX_DEFAULT +RusturfTunnel_EventScript_AlreadySpokenTo:: @ 822CE99 + msgbox RusturfTunnel_Text_ToGetToVerdanturf, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end -RusturfTunnel_EventScript_22CEAE:: @ 822CEAE +RusturfTunnel_EventScript_ClearTunnelScene:: @ 822CEAE lockall compare VAR_TEMP_1, 1 - call_if_eq RusturfTunnel_EventScript_22CFA7 + call_if_eq RusturfTunnel_EventScript_FaceWandasBoyfriend1 compare VAR_TEMP_1, 2 - call_if_eq RusturfTunnel_EventScript_22CFBC + call_if_eq RusturfTunnel_EventScript_FaceWandasBoyfriend2 compare VAR_TEMP_1, 3 - call_if_eq RusturfTunnel_EventScript_22CFC7 - call RusturfTunnel_EventScript_22CFFF - msgbox RusturfTunnel_Text_22D65C, MSGBOX_DEFAULT + call_if_eq RusturfTunnel_EventScript_FaceWandasBoyfriend3 + call RusturfTunnel_EventScript_WandasBoyfriendNotice + msgbox RusturfTunnel_Text_YouShatteredBoulderTakeHM, MSGBOX_DEFAULT compare VAR_TEMP_1, 2 - call_if_eq RusturfTunnel_EventScript_22CFC8 + call_if_eq RusturfTunnel_EventScript_WandasBoyfriendApproachPlayer compare VAR_TEMP_1, 3 - call_if_eq RusturfTunnel_EventScript_22CFC8 + call_if_eq RusturfTunnel_EventScript_WandasBoyfriendApproachPlayer giveitem_std ITEM_HM04 setflag FLAG_RECEIVED_HM04 - msgbox RusturfTunnel_Text_22D6D2, MSGBOX_DEFAULT + msgbox RusturfTunnel_Text_ExplainStrength, MSGBOX_DEFAULT closemessage compare VAR_TEMP_1, 1 - call_if_eq RusturfTunnel_EventScript_22CF5D + call_if_eq RusturfTunnel_EventScript_BoyfriendApproachWanda1 compare VAR_TEMP_1, 2 - call_if_eq RusturfTunnel_EventScript_22CF6F + call_if_eq RusturfTunnel_EventScript_BoyfriendApproachWanda2 compare VAR_TEMP_1, 3 - call_if_eq RusturfTunnel_EventScript_22CF8B - msgbox RusturfTunnel_Text_22D745, MSGBOX_DEFAULT + call_if_eq RusturfTunnel_EventScript_BoyfriendApproachWanda3 + msgbox RusturfTunnel_Text_WandaReunion, MSGBOX_DEFAULT closemessage compare VAR_TEMP_1, 1 - call_if_eq RusturfTunnel_EventScript_22CFD4 + call_if_eq RusturfTunnel_EventScript_WandaAndBoyfriendExit1 compare VAR_TEMP_1, 2 - call_if_eq RusturfTunnel_EventScript_22CFE6 + call_if_eq RusturfTunnel_EventScript_WandaAndBoyfriendExit compare VAR_TEMP_1, 3 - call_if_eq RusturfTunnel_EventScript_22CFE6 - call RusturfTunnel_EventScript_272216 + call_if_eq RusturfTunnel_EventScript_WandaAndBoyfriendExit + call RusturfTunnel_EventScript_SetRusturfTunnelOpen releaseall end -RusturfTunnel_EventScript_22CF5D:: @ 822CF5D - applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D042 - applymovement 1, RusturfTunnel_Movement_22D067 +RusturfTunnel_EventScript_BoyfriendApproachWanda1:: @ 822CF5D + applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchBoyfriend1 + applymovement 1, RusturfTunnel_Movement_BoyfriendApproachWanda1 waitmovement 0 return -RusturfTunnel_EventScript_22CF6F:: @ 822CF6F - applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D045 - applymovement 1, RusturfTunnel_Movement_22D06C +RusturfTunnel_EventScript_BoyfriendApproachWanda2:: @ 822CF6F + applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchBoyfriend + applymovement 1, RusturfTunnel_Movement_BoyfriendApproachWanda waitmovement 0 applymovement 10, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return -RusturfTunnel_EventScript_22CF8B:: @ 822CF8B - applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D045 - applymovement 1, RusturfTunnel_Movement_22D06C +RusturfTunnel_EventScript_BoyfriendApproachWanda3:: @ 822CF8B + applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchBoyfriend + applymovement 1, RusturfTunnel_Movement_BoyfriendApproachWanda waitmovement 0 applymovement 10, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return -RusturfTunnel_EventScript_22CFA7:: @ 822CFA7 +RusturfTunnel_EventScript_FaceWandasBoyfriend1:: @ 822CFA7 applymovement 1, Common_Movement_WalkInPlaceFastestUp waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return -RusturfTunnel_EventScript_22CFBC:: @ 822CFBC - applymovement 1, RusturfTunnel_Movement_22D048 +RusturfTunnel_EventScript_FaceWandasBoyfriend2:: @ 822CFBC + applymovement 1, RusturfTunnel_Movement_BoyfriendFaceRight waitmovement 0 return -RusturfTunnel_EventScript_22CFC7:: @ 822CFC7 +RusturfTunnel_EventScript_FaceWandasBoyfriend3:: @ 822CFC7 return -RusturfTunnel_EventScript_22CFC8:: @ 822CFC8 +RusturfTunnel_EventScript_WandasBoyfriendApproachPlayer:: @ 822CFC8 closemessage - applymovement 1, RusturfTunnel_Movement_22D065 + applymovement 1, RusturfTunnel_Movement_WandasBoyfriendApproachPlayer waitmovement 0 return -RusturfTunnel_EventScript_22CFD4:: @ 822CFD4 - applymovement 10, RusturfTunnel_Movement_22D017 - applymovement 1, RusturfTunnel_Movement_22D04B +RusturfTunnel_EventScript_WandaAndBoyfriendExit1:: @ 822CFD4 + applymovement 10, RusturfTunnel_Movement_WandaExit1 + applymovement 1, RusturfTunnel_Movement_WandasBoyfriendExit1 waitmovement 0 return -RusturfTunnel_EventScript_22CFE6:: @ 822CFE6 - applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D02F - applymovement 10, RusturfTunnel_Movement_22D023 - applymovement 1, RusturfTunnel_Movement_22D058 +RusturfTunnel_EventScript_WandaAndBoyfriendExit:: @ 822CFE6 + applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchWandaExit + applymovement 10, RusturfTunnel_Movement_WandaExit + applymovement 1, RusturfTunnel_Movement_WandasBoyfriendExit waitmovement 0 return -RusturfTunnel_EventScript_22CFFF:: @ 822CFFF +RusturfTunnel_EventScript_WandasBoyfriendNotice:: @ 822CFFF playse SE_PIN applymovement 1, Common_Movement_ExclamationMark waitmovement 0 @@ -148,7 +148,7 @@ RusturfTunnel_EventScript_22CFFF:: @ 822CFFF waitmovement 0 return -RusturfTunnel_Movement_22D017: @ 822D017 +RusturfTunnel_Movement_WandaExit1: @ 822D017 walk_right walk_right walk_right @@ -162,7 +162,7 @@ RusturfTunnel_Movement_22D017: @ 822D017 walk_down step_end -RusturfTunnel_Movement_22D023: @ 822D023 +RusturfTunnel_Movement_WandaExit: @ 822D023 walk_right walk_right walk_right @@ -176,7 +176,7 @@ RusturfTunnel_Movement_22D023: @ 822D023 walk_down step_end -RusturfTunnel_Movement_22D02F: @ 822D02F +RusturfTunnel_Movement_PlayerWatchWandaExit: @ 822D02F delay_8 walk_in_place_fastest_up delay_16 @@ -184,11 +184,13 @@ RusturfTunnel_Movement_22D02F: @ 822D02F walk_in_place_fastest_right step_end +@ Unused RusturfTunnel_Movement_22D035: @ 822D035 walk_left walk_in_place_fastest_right step_end +@ Unused RusturfTunnel_Movement_22D038: @ 822D038 walk_down walk_in_place_fastest_up @@ -196,6 +198,7 @@ RusturfTunnel_Movement_22D038: @ 822D038 walk_in_place_fastest_right step_end +@ Unused RusturfTunnel_Movement_22D03D: @ 822D03D walk_up walk_in_place_fastest_down @@ -203,22 +206,22 @@ RusturfTunnel_Movement_22D03D: @ 822D03D walk_in_place_fastest_right step_end -RusturfTunnel_Movement_22D042: @ 822D042 +RusturfTunnel_Movement_PlayerWatchBoyfriend1: @ 822D042 walk_left walk_in_place_fastest_right step_end -RusturfTunnel_Movement_22D045: @ 822D045 +RusturfTunnel_Movement_PlayerWatchBoyfriend: @ 822D045 walk_right walk_in_place_fastest_left step_end -RusturfTunnel_Movement_22D048: @ 822D048 +RusturfTunnel_Movement_BoyfriendFaceRight: @ 822D048 walk_up walk_in_place_fastest_right step_end -RusturfTunnel_Movement_22D04B: @ 822D04B +RusturfTunnel_Movement_WandasBoyfriendExit1: @ 822D04B walk_right walk_right walk_right @@ -233,7 +236,7 @@ RusturfTunnel_Movement_22D04B: @ 822D04B walk_down step_end -RusturfTunnel_Movement_22D058: @ 822D058 +RusturfTunnel_Movement_WandasBoyfriendExit: @ 822D058 walk_up walk_right walk_right @@ -248,42 +251,42 @@ RusturfTunnel_Movement_22D058: @ 822D058 walk_down step_end -RusturfTunnel_Movement_22D065: @ 822D065 +RusturfTunnel_Movement_WandasBoyfriendApproachPlayer: @ 822D065 walk_right step_end -RusturfTunnel_Movement_22D067: @ 822D067 +RusturfTunnel_Movement_BoyfriendApproachWanda1: @ 822D067 walk_in_place_fast_up walk_in_place_fast_up walk_fast_up walk_fast_right step_end -RusturfTunnel_Movement_22D06C: @ 822D06C +RusturfTunnel_Movement_BoyfriendApproachWanda: @ 822D06C walk_in_place_fast_right walk_in_place_fast_right walk_fast_right walk_in_place_fastest_up step_end -RusturfTunnel_EventScript_22D071:: @ 822D071 +RusturfTunnel_EventScript_TunnelBlockagePos1:: @ 822D071 setvar VAR_TEMP_1, 1 end -RusturfTunnel_EventScript_22D077:: @ 822D077 +RusturfTunnel_EventScript_TunnelBlockagePos2:: @ 822D077 setvar VAR_TEMP_1, 2 end -RusturfTunnel_EventScript_22D07D:: @ 822D07D +RusturfTunnel_EventScript_TunnelBlockagePos3:: @ 822D07D setvar VAR_TEMP_1, 3 end -RusturfTunnel_EventScript_22D083:: @ 822D083 +RusturfTunnel_EventScript_AquaGruntBackUp:: @ 822D083 lockall - msgbox RusturfTunnel_Text_22D1C8, MSGBOX_DEFAULT + msgbox RusturfTunnel_Text_ComeAndGetSome, MSGBOX_DEFAULT closemessage - applymovement 6, RusturfTunnel_Movement_22D0AB - applymovement 7, RusturfTunnel_Movement_22D0AB + applymovement 6, RusturfTunnel_Movement_GruntAndPeekoBackUp + applymovement 7, RusturfTunnel_Movement_GruntAndPeekoBackUp waitmovement 0 copyobjectxytoperm 6 copyobjectxytoperm 7 @@ -291,55 +294,55 @@ RusturfTunnel_EventScript_22D083:: @ 822D083 releaseall end -RusturfTunnel_Movement_22D0AB: @ 822D0AB +RusturfTunnel_Movement_GruntAndPeekoBackUp: @ 822D0AB lock_facing_direction walk_right unlock_facing_direction step_end -RusturfTunnel_EventScript_22D0AF:: @ 822D0AF +RusturfTunnel_EventScript_Peeko:: @ 822D0AF lock faceplayer waitse playmoncry SPECIES_WINGULL, 0 - msgbox RusturfTunnel_Text_22D1F7, MSGBOX_DEFAULT + msgbox RusturfTunnel_Text_Peeko, MSGBOX_DEFAULT waitmoncry release end -RusturfTunnel_EventScript_22D0C2:: @ 822D0C2 +RusturfTunnel_EventScript_Grunt:: @ 822D0C2 lock faceplayer playbgm MUS_AQA_0, 0 - msgbox RusturfTunnel_Text_22D20A, MSGBOX_DEFAULT - trainerbattle_no_intro TRAINER_GRUNT_RUSTURF_TUNNEL, RusturfTunnel_Text_22D2B0 - msgbox RusturfTunnel_Text_22D2E1, MSGBOX_DEFAULT + msgbox RusturfTunnel_Text_GruntIntro, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_GRUNT_RUSTURF_TUNNEL, RusturfTunnel_Text_GruntDefeat + msgbox RusturfTunnel_Text_GruntTakePackage, MSGBOX_DEFAULT giveitem_std ITEM_DEVON_GOODS closemessage - applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D178 - applymovement 6, RusturfTunnel_Movement_22D181 + applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_PushPlayerAsideForGrunt + applymovement 6, RusturfTunnel_Movement_GruntEscape waitmovement 0 removeobject 6 delay 50 addobject 5 - applymovement 5, RusturfTunnel_Movement_22D18B + applymovement 5, RusturfTunnel_Movement_BrineyApproachPeeko1 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D17E - applymovement 5, RusturfTunnel_Movement_22D1A4 + applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_PlayerMoveAsideForBriney + applymovement 5, RusturfTunnel_Movement_BrineyApproachPeeko2 waitmovement 0 - msgbox RusturfTunnel_Text_22D395, MSGBOX_DEFAULT + msgbox RusturfTunnel_Text_PeekoGladToSeeYouSafe, MSGBOX_DEFAULT applymovement 5, Common_Movement_FacePlayer waitmovement 0 - message RusturfTunnel_Text_22D3BA + message RusturfTunnel_Text_ThankYouLetsGoHomePeeko waitmessage waitse playmoncry SPECIES_WINGULL, 0 waitbuttonpress waitmoncry closemessage - applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D19F - applymovement 5, RusturfTunnel_Movement_22D193 - applymovement 7, RusturfTunnel_Movement_22D1A7 + applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchBrineyExit + applymovement 5, RusturfTunnel_Movement_BrineyExit + applymovement 7, RusturfTunnel_Movement_PeekoExit waitmovement 0 removeobject 5 removeobject 7 @@ -351,7 +354,7 @@ RusturfTunnel_EventScript_22D0C2:: @ 822D0C2 release end -RusturfTunnel_Movement_22D178: @ 822D178 +RusturfTunnel_Movement_PushPlayerAsideForGrunt: @ 822D178 face_down lock_facing_direction walk_up @@ -359,12 +362,12 @@ RusturfTunnel_Movement_22D178: @ 822D178 walk_in_place_fastest_left step_end -RusturfTunnel_Movement_22D17E: @ 822D17E +RusturfTunnel_Movement_PlayerMoveAsideForBriney: @ 822D17E walk_down walk_in_place_fastest_up step_end -RusturfTunnel_Movement_22D181: @ 822D181 +RusturfTunnel_Movement_GruntEscape: @ 822D181 walk_fast_left walk_fast_left walk_fast_left @@ -376,7 +379,7 @@ RusturfTunnel_Movement_22D181: @ 822D181 walk_fast_left step_end -RusturfTunnel_Movement_22D18B: @ 822D18B +RusturfTunnel_Movement_BrineyApproachPeeko1: @ 822D18B walk_right walk_right walk_right @@ -386,7 +389,7 @@ RusturfTunnel_Movement_22D18B: @ 822D18B walk_right step_end -RusturfTunnel_Movement_22D193: @ 822D193 +RusturfTunnel_Movement_BrineyExit: @ 822D193 walk_left walk_left walk_left @@ -400,19 +403,19 @@ RusturfTunnel_Movement_22D193: @ 822D193 walk_left step_end -RusturfTunnel_Movement_22D19F: @ 822D19F +RusturfTunnel_Movement_PlayerWatchBrineyExit: @ 822D19F delay_16 delay_8 delay_4 walk_in_place_fastest_left step_end -RusturfTunnel_Movement_22D1A4: @ 822D1A4 +RusturfTunnel_Movement_BrineyApproachPeeko2: @ 822D1A4 delay_16 walk_right step_end -RusturfTunnel_Movement_22D1A7: @ 822D1A7 +RusturfTunnel_Movement_PeekoExit: @ 822D1A7 walk_left walk_left walk_left @@ -424,19 +427,19 @@ RusturfTunnel_Movement_22D1A7: @ 822D1A7 walk_left step_end -RusturfTunnel_EventScript_22D1B1:: @ 822D1B1 - trainerbattle_single TRAINER_MIKE_2, RusturfTunnel_Text_22D84D, RusturfTunnel_Text_22D8DB - msgbox RusturfTunnel_Text_22D8F9, MSGBOX_AUTOCLOSE +RusturfTunnel_EventScript_Mike:: @ 822D1B1 + trainerbattle_single TRAINER_MIKE_2, RusturfTunnel_Text_MikeIntro, RusturfTunnel_Text_MikeDefeat + msgbox RusturfTunnel_Text_MikePostBattle, MSGBOX_AUTOCLOSE end -RusturfTunnel_Text_22D1C8: @ 822D1C8 +RusturfTunnel_Text_ComeAndGetSome: @ 822D1C8 .string "What, are you coming?\n" .string "Come and get some, then!$" -RusturfTunnel_Text_22D1F7: @ 822D1F7 +RusturfTunnel_Text_Peeko: @ 822D1F7 .string "PEEKO: Pii pihyoh!$" -RusturfTunnel_Text_22D20A: @ 822D20A +RusturfTunnel_Text_GruntIntro: @ 822D20A .string "Grah, keelhaul it all!\p" .string "That hostage POKéMON turned out to\n" .string "be worthless!\p" @@ -445,11 +448,11 @@ RusturfTunnel_Text_22D20A: @ 822D20A .string "Hey! You!\n" .string "So you want to battle me?$" -RusturfTunnel_Text_22D2B0: @ 822D2B0 +RusturfTunnel_Text_GruntDefeat: @ 822D2B0 .string "Urrrggh! My career in crime comes to\n" .string "a dead end!$" -RusturfTunnel_Text_22D2E1: @ 822D2E1 +RusturfTunnel_Text_GruntTakePackage: @ 822D2E1 .string "This is plain not right…\p" .string "The BOSS told me this would be a\n" .string "slick-and-easy job to pull.\p" @@ -458,11 +461,11 @@ RusturfTunnel_Text_22D2E1: @ 822D2E1 .string "Tch!\n" .string "You want it back that badly, take it!$" -RusturfTunnel_Text_22D395: @ 822D395 +RusturfTunnel_Text_PeekoGladToSeeYouSafe: @ 822D395 .string "PEEKO!\n" .string "Am I glad to see you're safe!$" -RusturfTunnel_Text_22D3BA: @ 822D3BA +RusturfTunnel_Text_ThankYouLetsGoHomePeeko: @ 822D3BA .string "PEEKO owes her life to you!\p" .string "They call me MR. BRINEY.\n" .string "And, you are?\p" @@ -478,7 +481,7 @@ RusturfTunnel_Text_22D3BA: @ 822D3BA .string "home.\p" .string "PEEKO: Pihyoh!$" -RusturfTunnel_Text_22D510: @ 822D510 +RusturfTunnel_Text_WhyCantTheyKeepDigging: @ 822D510 .string "… …\p" .string "Why can't they keep digging?\n" .string "Is the bedrock too hard?\p" @@ -490,30 +493,30 @@ RusturfTunnel_Text_22D510: @ 822D510 .string "But this…\n" .string "What am I to do?$" -RusturfTunnel_Text_22D5F3: @ 822D5F3 +RusturfTunnel_Text_ToGetToVerdanturf: @ 822D5F3 .string "To get from RUSTBORO to VERDANTURF,\n" .string "you need to go to DEWFORD, then pass\l" .string "through SLATEPORT and MAUVILLE…$" -RusturfTunnel_Text_22D65C: @ 822D65C +RusturfTunnel_Text_YouShatteredBoulderTakeHM: @ 822D65C .string "Wow! You shattered that boulder\n" .string "blocking the way.\p" .string "To show you how much I appreciate it,\n" .string "I'd like you to have this HM.$" -RusturfTunnel_Text_22D6D2: @ 822D6D2 +RusturfTunnel_Text_ExplainStrength: @ 822D6D2 .string "That HM contains STRENGTH.\p" .string "If a muscular POKéMON were to learn\n" .string "that, it would be able to move even\l" .string "large boulders.$" -RusturfTunnel_Text_22D745: @ 822D745 +RusturfTunnel_Text_WandaReunion: @ 822D745 .string "WANDA!\n" .string "Now I can see you anytime!\p" .string "WANDA: That's…wonderful.\p" .string "Please, take some rest at my home.$" -RusturfTunnel_Text_22D7A3: @ 822D7A3 +RusturfTunnel_Text_BoyfriendOnOtherSideOfRock: @ 822D7A3 .string "On the other side of this rock…\n" .string "My boyfriend is there.\p" .string "He… He's not just digging the tunnel\n" @@ -521,17 +524,17 @@ RusturfTunnel_Text_22D7A3: @ 822D7A3 .string "He works his hands raw and rough\n" .string "for the benefit of everyone.$" -RusturfTunnel_Text_22D84D: @ 822D84D +RusturfTunnel_Text_MikeIntro: @ 822D84D .string "What do you call a wild man up in the\n" .string "mountains? A mountain man, right?\p" .string "So why don't they call a POKéMON in\n" .string "the mountains a mountain POKéMON?$" -RusturfTunnel_Text_22D8DB: @ 822D8DB +RusturfTunnel_Text_MikeDefeat: @ 822D8DB .string "My POKéMON…\n" .string "Ran out of power…$" -RusturfTunnel_Text_22D8F9: @ 822D8F9 +RusturfTunnel_Text_MikePostBattle: @ 822D8F9 .string "They halted development here to\n" .string "protect POKéMON, right?\l" .string "There's a feel-good story!$" diff --git a/data/maps/SealedChamber_InnerRoom/map.json b/data/maps/SealedChamber_InnerRoom/map.json index e0e6097ec..4549a1bbd 100644 --- a/data/maps/SealedChamber_InnerRoom/map.json +++ b/data/maps/SealedChamber_InnerRoom/map.json @@ -31,7 +31,7 @@ "y": 4, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_InnerRoom_EventScript_2391F8" + "script": "SealedChamber_InnerRoom_EventScript_BrailleBackWall" }, { "type": "sign", @@ -39,7 +39,7 @@ "y": 8, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_InnerRoom_EventScript_239255" + "script": "SealedChamber_InnerRoom_EventScript_BrailleStoryPart1" }, { "type": "sign", @@ -47,7 +47,7 @@ "y": 8, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_InnerRoom_EventScript_23925F" + "script": "SealedChamber_InnerRoom_EventScript_BrailleStoryPart2" }, { "type": "sign", @@ -55,7 +55,7 @@ "y": 13, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_InnerRoom_EventScript_239269" + "script": "SealedChamber_InnerRoom_EventScript_BrailleStoryPart3" }, { "type": "sign", @@ -63,7 +63,7 @@ "y": 13, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_InnerRoom_EventScript_239273" + "script": "SealedChamber_InnerRoom_EventScript_BrailleStoryPart4" }, { "type": "sign", @@ -71,7 +71,7 @@ "y": 18, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_InnerRoom_EventScript_23927D" + "script": "SealedChamber_InnerRoom_EventScript_BrailleStoryPart5" }, { "type": "sign", @@ -79,7 +79,7 @@ "y": 18, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_InnerRoom_EventScript_239287" + "script": "SealedChamber_InnerRoom_EventScript_BrailleStoryPart6" }, { "type": "sign", @@ -87,7 +87,7 @@ "y": 4, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_InnerRoom_EventScript_2391F8" + "script": "SealedChamber_InnerRoom_EventScript_BrailleBackWall" }, { "type": "sign", @@ -95,7 +95,7 @@ "y": 4, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_InnerRoom_EventScript_2391F8" + "script": "SealedChamber_InnerRoom_EventScript_BrailleBackWall" } ] } \ No newline at end of file diff --git a/data/maps/SealedChamber_InnerRoom/scripts.inc b/data/maps/SealedChamber_InnerRoom/scripts.inc index 6dde1d444..15c98e57e 100644 --- a/data/maps/SealedChamber_InnerRoom/scripts.inc +++ b/data/maps/SealedChamber_InnerRoom/scripts.inc @@ -1,15 +1,15 @@ SealedChamber_InnerRoom_MapScripts:: @ 82391F7 .byte 0 -SealedChamber_InnerRoom_EventScript_2391F8:: @ 82391F8 +SealedChamber_InnerRoom_EventScript_BrailleBackWall:: @ 82391F8 lockall - braillemessage SealedChamber_InnerRoom_Braille_2A6B99 + braillemessage SealedChamber_InnerRoom_Braille_FirstWailordLastRelicanth waitbuttonpress closebraillemessage - goto_if_set FLAG_REGI_DOORS_OPENED, SealedChamber_InnerRoom_EventScript_239253 + goto_if_set FLAG_REGI_DOORS_OPENED, SealedChamber_InnerRoom_EventScript_NoEffect specialvar VAR_RESULT, CheckRelicanthWailord - compare VAR_RESULT, 0 - goto_if_eq SealedChamber_InnerRoom_EventScript_239253 + compare VAR_RESULT, FALSE + goto_if_eq SealedChamber_InnerRoom_EventScript_NoEffect fadeoutbgm 0 playse SE_TRACK_MOVE special DoSealedChamberShakingEffect1 @@ -34,53 +34,53 @@ SealedChamber_InnerRoom_EventScript_2391F8:: @ 82391F8 releaseall end -SealedChamber_InnerRoom_EventScript_239253:: @ 8239253 +SealedChamber_InnerRoom_EventScript_NoEffect:: @ 8239253 releaseall end -SealedChamber_InnerRoom_EventScript_239255:: @ 8239255 +SealedChamber_InnerRoom_EventScript_BrailleStoryPart1:: @ 8239255 lockall - braillemessage SealedChamber_InnerRoom_Braille_2A6BCA + braillemessage SealedChamber_InnerRoom_Braille_InThisCaveWeHaveLived waitbuttonpress closebraillemessage releaseall end -SealedChamber_InnerRoom_EventScript_23925F:: @ 823925F +SealedChamber_InnerRoom_EventScript_BrailleStoryPart2:: @ 823925F lockall - braillemessage SealedChamber_InnerRoom_Braille_2A6BEC + braillemessage SealedChamber_InnerRoom_Braille_WeOweAllToThePokemon waitbuttonpress closebraillemessage releaseall end -SealedChamber_InnerRoom_EventScript_239269:: @ 8239269 +SealedChamber_InnerRoom_EventScript_BrailleStoryPart3:: @ 8239269 lockall - braillemessage SealedChamber_InnerRoom_Braille_2A6C0D + braillemessage SealedChamber_InnerRoom_Braille_ButWeSealedThePokemonAway waitbuttonpress closebraillemessage releaseall end -SealedChamber_InnerRoom_EventScript_239273:: @ 8239273 +SealedChamber_InnerRoom_EventScript_BrailleStoryPart4:: @ 8239273 lockall - braillemessage SealedChamber_InnerRoom_Braille_2A6C34 + braillemessage SealedChamber_InnerRoom_Braille_WeFearedIt waitbuttonpress closebraillemessage releaseall end -SealedChamber_InnerRoom_EventScript_23927D:: @ 823927D +SealedChamber_InnerRoom_EventScript_BrailleStoryPart5:: @ 823927D lockall - braillemessage SealedChamber_InnerRoom_Braille_2A6C48 + braillemessage SealedChamber_InnerRoom_Braille_ThoseWithCourageHope waitbuttonpress closebraillemessage releaseall end -SealedChamber_InnerRoom_EventScript_239287:: @ 8239287 +SealedChamber_InnerRoom_EventScript_BrailleStoryPart6:: @ 8239287 lockall - braillemessage SealedChamber_InnerRoom_Braille_2A6C73 + braillemessage SealedChamber_InnerRoom_Braille_OpenDoorEternalPokemonWaits waitbuttonpress closebraillemessage releaseall diff --git a/data/maps/SealedChamber_OuterRoom/map.json b/data/maps/SealedChamber_OuterRoom/map.json index cc9c32272..54a10ee70 100644 --- a/data/maps/SealedChamber_OuterRoom/map.json +++ b/data/maps/SealedChamber_OuterRoom/map.json @@ -31,7 +31,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_OuterRoom_EventScript_23916C" + "script": "SealedChamber_OuterRoom_EventScript_BrailleABC" }, { "type": "sign", @@ -39,7 +39,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_OuterRoom_EventScript_239176" + "script": "SealedChamber_OuterRoom_EventScript_BrailleGHI" }, { "type": "sign", @@ -47,7 +47,7 @@ "y": 12, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_OuterRoom_EventScript_239180" + "script": "SealedChamber_OuterRoom_EventScript_BrailleMNO" }, { "type": "sign", @@ -55,7 +55,7 @@ "y": 15, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_OuterRoom_EventScript_23918A" + "script": "SealedChamber_OuterRoom_EventScript_BrailleTUV" }, { "type": "sign", @@ -63,7 +63,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_OuterRoom_EventScript_239194" + "script": "SealedChamber_OuterRoom_EventScript_BrailleDEF" }, { "type": "sign", @@ -71,7 +71,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_OuterRoom_EventScript_23919E" + "script": "SealedChamber_OuterRoom_EventScript_BrailleJKL" }, { "type": "sign", @@ -79,7 +79,7 @@ "y": 12, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_OuterRoom_EventScript_2391A8" + "script": "SealedChamber_OuterRoom_EventScript_BraillePQRS" }, { "type": "sign", @@ -87,7 +87,7 @@ "y": 15, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_OuterRoom_EventScript_2391BC" + "script": "SealedChamber_OuterRoom_EventScript_BrailleWXYZ" }, { "type": "sign", @@ -95,7 +95,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_OuterRoom_EventScript_2391B2" + "script": "SealedChamber_OuterRoom_EventScript_BraillePeriod" }, { "type": "sign", @@ -103,7 +103,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_OuterRoom_EventScript_2391C6" + "script": "SealedChamber_OuterRoom_EventScript_BrailleComma" }, { "type": "sign", @@ -111,7 +111,7 @@ "y": 2, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_OuterRoom_EventScript_2391D0" + "script": "SealedChamber_OuterRoom_EventScript_InnerRoomEntranceWall" }, { "type": "sign", @@ -119,7 +119,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_OuterRoom_EventScript_23916C" + "script": "SealedChamber_OuterRoom_EventScript_BrailleABC" }, { "type": "sign", @@ -127,7 +127,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_OuterRoom_EventScript_23916C" + "script": "SealedChamber_OuterRoom_EventScript_BrailleABC" }, { "type": "sign", @@ -135,7 +135,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_OuterRoom_EventScript_239176" + "script": "SealedChamber_OuterRoom_EventScript_BrailleGHI" }, { "type": "sign", @@ -143,7 +143,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_OuterRoom_EventScript_239176" + "script": "SealedChamber_OuterRoom_EventScript_BrailleGHI" }, { "type": "sign", @@ -151,7 +151,7 @@ "y": 12, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_OuterRoom_EventScript_239180" + "script": "SealedChamber_OuterRoom_EventScript_BrailleMNO" }, { "type": "sign", @@ -159,7 +159,7 @@ "y": 12, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_OuterRoom_EventScript_239180" + "script": "SealedChamber_OuterRoom_EventScript_BrailleMNO" }, { "type": "sign", @@ -167,7 +167,7 @@ "y": 15, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_OuterRoom_EventScript_23918A" + "script": "SealedChamber_OuterRoom_EventScript_BrailleTUV" }, { "type": "sign", @@ -175,7 +175,7 @@ "y": 15, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_OuterRoom_EventScript_23918A" + "script": "SealedChamber_OuterRoom_EventScript_BrailleTUV" }, { "type": "sign", @@ -183,7 +183,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_OuterRoom_EventScript_239194" + "script": "SealedChamber_OuterRoom_EventScript_BrailleDEF" }, { "type": "sign", @@ -191,7 +191,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_OuterRoom_EventScript_239194" + "script": "SealedChamber_OuterRoom_EventScript_BrailleDEF" }, { "type": "sign", @@ -199,7 +199,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_OuterRoom_EventScript_23919E" + "script": "SealedChamber_OuterRoom_EventScript_BrailleJKL" }, { "type": "sign", @@ -207,7 +207,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_OuterRoom_EventScript_23919E" + "script": "SealedChamber_OuterRoom_EventScript_BrailleJKL" }, { "type": "sign", @@ -215,7 +215,7 @@ "y": 12, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_OuterRoom_EventScript_2391A8" + "script": "SealedChamber_OuterRoom_EventScript_BraillePQRS" }, { "type": "sign", @@ -223,7 +223,7 @@ "y": 12, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_OuterRoom_EventScript_2391A8" + "script": "SealedChamber_OuterRoom_EventScript_BraillePQRS" }, { "type": "sign", @@ -231,7 +231,7 @@ "y": 15, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_OuterRoom_EventScript_2391BC" + "script": "SealedChamber_OuterRoom_EventScript_BrailleWXYZ" }, { "type": "sign", @@ -239,7 +239,7 @@ "y": 15, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_OuterRoom_EventScript_2391BC" + "script": "SealedChamber_OuterRoom_EventScript_BrailleWXYZ" }, { "type": "sign", @@ -247,7 +247,7 @@ "y": 2, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_OuterRoom_EventScript_2391ED" + "script": "SealedChamber_OuterRoom_EventScript_BrailleDigHere" }, { "type": "sign", @@ -255,7 +255,7 @@ "y": 2, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SealedChamber_OuterRoom_EventScript_2391ED" + "script": "SealedChamber_OuterRoom_EventScript_BrailleDigHere" } ] } \ No newline at end of file diff --git a/data/maps/SealedChamber_OuterRoom/scripts.inc b/data/maps/SealedChamber_OuterRoom/scripts.inc index e3a7086a3..f3cd05a86 100644 --- a/data/maps/SealedChamber_OuterRoom/scripts.inc +++ b/data/maps/SealedChamber_OuterRoom/scripts.inc @@ -1,10 +1,10 @@ SealedChamber_OuterRoom_MapScripts:: @ 8239106 - map_script MAP_SCRIPT_ON_RESUME, SealedChamber_OuterRoom_MapScript1_239116 + map_script MAP_SCRIPT_ON_RESUME, SealedChamber_OuterRoom_OnResume map_script MAP_SCRIPT_ON_TRANSITION, SealedChamber_OuterRoom_OnTransition - map_script MAP_SCRIPT_ON_LOAD, SealedChamber_OuterRoom_MapScript1_23912B + map_script MAP_SCRIPT_ON_LOAD, SealedChamber_OuterRoom_OnLoad .byte 0 -SealedChamber_OuterRoom_MapScript1_239116: @ 8239116 +SealedChamber_OuterRoom_OnResume: @ 8239116 setdivewarp MAP_UNDERWATER_SEALED_CHAMBER, 255, 12, 44 setescapewarp MAP_UNDERWATER_SEALED_CHAMBER, 255, 12, 44 end @@ -13,11 +13,11 @@ SealedChamber_OuterRoom_OnTransition: @ 8239127 setflag FLAG_LANDMARK_SEALED_CHAMBER end -SealedChamber_OuterRoom_MapScript1_23912B: @ 823912B - call_if_unset FLAG_SYS_BRAILLE_DIG, SealedChamber_OuterRoom_EventScript_239135 +SealedChamber_OuterRoom_OnLoad: @ 823912B + call_if_unset FLAG_SYS_BRAILLE_DIG, SealedChamber_OuterRoom_EventScript_CloseInnerRoomEntrance end -SealedChamber_OuterRoom_EventScript_239135:: @ 8239135 +SealedChamber_OuterRoom_EventScript_CloseInnerRoomEntrance:: @ 8239135 setmetatile 9, 1, METATILE_Cave_EntranceCover, 1 setmetatile 10, 1, METATILE_Cave_EntranceCover, 1 setmetatile 11, 1, METATILE_Cave_EntranceCover, 1 @@ -26,103 +26,103 @@ SealedChamber_OuterRoom_EventScript_239135:: @ 8239135 setmetatile 11, 2, METATILE_Cave_SealedChamberBraille_Mid, 1 return -SealedChamber_OuterRoom_EventScript_23916C:: @ 823916C +SealedChamber_OuterRoom_EventScript_BrailleABC:: @ 823916C lockall - braillemessage SealedChamber_OuterRoom_Braille_2A6B27 + braillemessage SealedChamber_OuterRoom_Braille_ABC waitbuttonpress closebraillemessage releaseall end -SealedChamber_OuterRoom_EventScript_239176:: @ 8239176 +SealedChamber_OuterRoom_EventScript_BrailleGHI:: @ 8239176 lockall - braillemessage SealedChamber_OuterRoom_Braille_2A6B31 + braillemessage SealedChamber_OuterRoom_Braille_GHI waitbuttonpress closebraillemessage releaseall end -SealedChamber_OuterRoom_EventScript_239180:: @ 8239180 +SealedChamber_OuterRoom_EventScript_BrailleMNO:: @ 8239180 lockall - braillemessage SealedChamber_OuterRoom_Braille_2A6B3B + braillemessage SealedChamber_OuterRoom_Braille_MNO waitbuttonpress closebraillemessage releaseall end -SealedChamber_OuterRoom_EventScript_23918A:: @ 823918A +SealedChamber_OuterRoom_EventScript_BrailleTUV:: @ 823918A lockall - braillemessage SealedChamber_OuterRoom_Braille_2A6B45 + braillemessage SealedChamber_OuterRoom_Braille_TUV waitbuttonpress closebraillemessage releaseall end -SealedChamber_OuterRoom_EventScript_239194:: @ 8239194 +SealedChamber_OuterRoom_EventScript_BrailleDEF:: @ 8239194 lockall - braillemessage SealedChamber_OuterRoom_Braille_2A6B4F + braillemessage SealedChamber_OuterRoom_Braille_DEF waitbuttonpress closebraillemessage releaseall end -SealedChamber_OuterRoom_EventScript_23919E:: @ 823919E +SealedChamber_OuterRoom_EventScript_BrailleJKL:: @ 823919E lockall - braillemessage SealedChamber_OuterRoom_Braille_2A6B59 + braillemessage SealedChamber_OuterRoom_Braille_JKL waitbuttonpress closebraillemessage releaseall end -SealedChamber_OuterRoom_EventScript_2391A8:: @ 82391A8 +SealedChamber_OuterRoom_EventScript_BraillePQRS:: @ 82391A8 lockall - braillemessage SealedChamber_OuterRoom_Braille_2A6B63 + braillemessage SealedChamber_OuterRoom_Braille_PQRS waitbuttonpress closebraillemessage releaseall end -SealedChamber_OuterRoom_EventScript_2391B2:: @ 82391B2 +SealedChamber_OuterRoom_EventScript_BraillePeriod:: @ 82391B2 lockall - braillemessage SealedChamber_OuterRoom_Braille_2A6B6E + braillemessage SealedChamber_OuterRoom_Braille_Period waitbuttonpress closebraillemessage releaseall end -SealedChamber_OuterRoom_EventScript_2391BC:: @ 82391BC +SealedChamber_OuterRoom_EventScript_BrailleWXYZ:: @ 82391BC lockall - braillemessage SealedChamber_OuterRoom_Braille_2A6B76 + braillemessage SealedChamber_OuterRoom_Braille_WXYZ waitbuttonpress closebraillemessage releaseall end -SealedChamber_OuterRoom_EventScript_2391C6:: @ 82391C6 +SealedChamber_OuterRoom_EventScript_BrailleComma:: @ 82391C6 lockall - braillemessage SealedChamber_OuterRoom_Braille_2A6B81 + braillemessage SealedChamber_OuterRoom_Braille_Comma waitbuttonpress closebraillemessage releaseall end -SealedChamber_OuterRoom_EventScript_2391D0:: @ 82391D0 +SealedChamber_OuterRoom_EventScript_InnerRoomEntranceWall:: @ 82391D0 lockall - goto_if_set FLAG_SYS_BRAILLE_DIG, SealedChamber_OuterRoom_EventScript_2391E3 - braillemessage SealedChamber_OuterRoom_Braille_2A6B89 + goto_if_set FLAG_SYS_BRAILLE_DIG, SealedChamber_OuterRoom_EventScript_HoleInWall + braillemessage SealedChamber_OuterRoom_Braille_DigHere waitbuttonpress closebraillemessage releaseall end -SealedChamber_OuterRoom_EventScript_2391E3:: @ 82391E3 +SealedChamber_OuterRoom_EventScript_HoleInWall:: @ 82391E3 msgbox gText_BigHoleInTheWall, MSGBOX_DEFAULT releaseall end -SealedChamber_OuterRoom_EventScript_2391ED:: @ 82391ED +SealedChamber_OuterRoom_EventScript_BrailleDigHere:: @ 82391ED lockall - braillemessage SealedChamber_OuterRoom_Braille_2A6B89 + braillemessage SealedChamber_OuterRoom_Braille_DigHere waitbuttonpress closebraillemessage releaseall diff --git a/data/maps/Underwater_MarineCave/scripts.inc b/data/maps/Underwater_MarineCave/scripts.inc index 248854dd7..b1cc353f0 100644 --- a/data/maps/Underwater_MarineCave/scripts.inc +++ b/data/maps/Underwater_MarineCave/scripts.inc @@ -1,5 +1,5 @@ Underwater_MarineCave_MapScripts:: @ 823AFB8 - map_script MAP_SCRIPT_ON_RESUME, Underwater_MarineCave_MapScript1_OnResume + map_script MAP_SCRIPT_ON_RESUME, Underwater_MarineCave_OnResume map_script MAP_SCRIPT_ON_TRANSITION, Underwater_MarineCave_OnTransition .byte 0 @@ -7,7 +7,7 @@ Underwater_MarineCave_OnTransition: @ 823AFC3 setflag FLAG_ARRIVED_AT_MARINE_CAVE_EMERGE_SPOT end -Underwater_MarineCave_MapScript1_OnResume: @ 823AFC7 +Underwater_MarineCave_OnResume: @ 823AFC7 setdivewarp MAP_MARINE_CAVE_ENTRANCE, 255, 10, 17 end diff --git a/data/maps/Underwater_SeafloorCavern/scripts.inc b/data/maps/Underwater_SeafloorCavern/scripts.inc index ca94964cf..118632461 100644 --- a/data/maps/Underwater_SeafloorCavern/scripts.inc +++ b/data/maps/Underwater_SeafloorCavern/scripts.inc @@ -1,23 +1,23 @@ Underwater_SeafloorCavern_MapScripts:: @ 823433B - map_script MAP_SCRIPT_ON_RESUME, Underwater_SeafloorCavern_MapScript1_2343D3 + map_script MAP_SCRIPT_ON_RESUME, Underwater_SeafloorCavern_OnResume map_script MAP_SCRIPT_ON_TRANSITION, Underwater_SeafloorCavern_OnTransition - map_script MAP_SCRIPT_ON_LOAD, Underwater_SeafloorCavern_MapScript1_23435C + map_script MAP_SCRIPT_ON_LOAD, Underwater_SeafloorCavern_OnLoad .byte 0 Underwater_SeafloorCavern_OnTransition: @ 823434B setflag FLAG_LANDMARK_SEAFLOOR_CAVERN - goto_if_set FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, Underwater_SeafloorCavern_EventScript_234358 + goto_if_set FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, Underwater_SeafloorCavern_EventScript_HideSubmarine end -Underwater_SeafloorCavern_EventScript_234358:: @ 8234358 +Underwater_SeafloorCavern_EventScript_HideSubmarine:: @ 8234358 setflag FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE end -Underwater_SeafloorCavern_MapScript1_23435C: @ 823435C - call_if_set FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, Underwater_SeafloorCavern_EventScript_234366 +Underwater_SeafloorCavern_OnLoad: @ 823435C + call_if_set FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, Underwater_SeafloorCavern_EventScript_SetSubmarineGoneMetatiles end -Underwater_SeafloorCavern_EventScript_234366:: @ 8234366 +Underwater_SeafloorCavern_EventScript_SetSubmarineGoneMetatiles:: @ 8234366 setmetatile 5, 3, METATILE_Underwater_RockWall, 1 setmetatile 6, 3, METATILE_Underwater_RockWall, 1 setmetatile 7, 3, METATILE_Underwater_RockWall, 1 @@ -32,7 +32,7 @@ Underwater_SeafloorCavern_EventScript_234366:: @ 8234366 setmetatile 8, 5, METATILE_Underwater_FloorShadow, 0 return -Underwater_SeafloorCavern_MapScript1_2343D3: @ 82343D3 +Underwater_SeafloorCavern_OnResume: @ 82343D3 setdivewarp MAP_SEAFLOOR_CAVERN_ENTRANCE, 255, 10, 17 end diff --git a/data/maps/Underwater_SealedChamber/map.json b/data/maps/Underwater_SealedChamber/map.json index 2256ee670..7579f15d5 100644 --- a/data/maps/Underwater_SealedChamber/map.json +++ b/data/maps/Underwater_SealedChamber/map.json @@ -31,7 +31,7 @@ "y": 43, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Underwater_SealedChamber_EventScript_2390FC" + "script": "Underwater_SealedChamber_EventScript_Braille" } ] } \ No newline at end of file diff --git a/data/maps/Underwater_SealedChamber/scripts.inc b/data/maps/Underwater_SealedChamber/scripts.inc index 168383f5d..b1fb5e71a 100644 --- a/data/maps/Underwater_SealedChamber/scripts.inc +++ b/data/maps/Underwater_SealedChamber/scripts.inc @@ -1,26 +1,26 @@ Underwater_SealedChamber_MapScripts:: @ 82390C4 - map_script MAP_SCRIPT_ON_DIVE_WARP, Underwater_SealedChamber_MapScript1_2390CA + map_script MAP_SCRIPT_ON_DIVE_WARP, Underwater_SealedChamber_OnDive .byte 0 -Underwater_SealedChamber_MapScript1_2390CA: @ 82390CA +Underwater_SealedChamber_OnDive: @ 82390CA getplayerxy VAR_0x8004, VAR_0x8005 compare VAR_0x8004, 12 - goto_if_ne Underwater_SealedChamber_EventScript_2390EA + goto_if_ne Underwater_SealedChamber_EventScript_SurfaceRoute134 compare VAR_0x8005, 44 - goto_if_ne Underwater_SealedChamber_EventScript_2390EA - goto Underwater_SealedChamber_EventScript_2390F3 + goto_if_ne Underwater_SealedChamber_EventScript_SurfaceRoute134 + goto Underwater_SealedChamber_EventScript_SurfaceSealedChamber -Underwater_SealedChamber_EventScript_2390EA:: @ 82390EA +Underwater_SealedChamber_EventScript_SurfaceRoute134:: @ 82390EA setdivewarp MAP_ROUTE134, 255, 60, 31 end -Underwater_SealedChamber_EventScript_2390F3:: @ 82390F3 +Underwater_SealedChamber_EventScript_SurfaceSealedChamber:: @ 82390F3 setdivewarp MAP_SEALED_CHAMBER_OUTER_ROOM, 255, 10, 19 end -Underwater_SealedChamber_EventScript_2390FC:: @ 82390FC +Underwater_SealedChamber_EventScript_Braille:: @ 82390FC lockall - braillemessage Underwater_SealedChamber_Braille_2A6B15 + braillemessage Underwater_SealedChamber_Braille_GoUpHere waitbuttonpress closebraillemessage releaseall diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json index 8685f3341..d76915648 100644 --- a/data/maps/VictoryRoad_1F/map.json +++ b/data/maps/VictoryRoad_1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "VictoryRoad_1F_EventScript_235E73", + "script": "VictoryRoad_1F_EventScript_Edgar", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "VictoryRoad_1F_EventScript_235EA1", + "script": "VictoryRoad_1F_EventScript_Hope", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "VictoryRoad_1F_EventScript_235E8A", + "script": "VictoryRoad_1F_EventScript_Albert", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "VictoryRoad_1F_EventScript_235E2C", + "script": "VictoryRoad_1F_EventScript_EntranceWally", "flag": "FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY" }, { @@ -102,7 +102,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "VictoryRoad_1F_EventScript_235E35", + "script": "VictoryRoad_1F_EventScript_ExitWally", "flag": "FLAG_HIDE_VICTORY_ROAD_EXIT_WALLY" }, { @@ -115,7 +115,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "VictoryRoad_1F_EventScript_235ECF", + "script": "VictoryRoad_1F_EventScript_Katelynn", "flag": "0" }, { @@ -128,7 +128,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "VictoryRoad_1F_EventScript_235EB8", + "script": "VictoryRoad_1F_EventScript_Quincy", "flag": "0" } ], @@ -177,7 +177,7 @@ "elevation": 4, "var": "VAR_VICTORY_ROAD_1F_STATE", "var_value": "0", - "script": "VictoryRoad_1F_EventScript_235DAF" + "script": "VictoryRoad_1F_EventScript_WallyBattleTrigger1" }, { "type": "trigger", @@ -186,7 +186,7 @@ "elevation": 4, "var": "VAR_VICTORY_ROAD_1F_STATE", "var_value": "0", - "script": "VictoryRoad_1F_EventScript_235DC8" + "script": "VictoryRoad_1F_EventScript_WallyBattleTrigger2" } ], "bg_events": [ diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index 9b7c00c62..6536be934 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -4,45 +4,45 @@ VictoryRoad_1F_MapScripts:: @ 8235D7A VictoryRoad_1F_OnTransition: @ 8235D80 compare VAR_VICTORY_ROAD_1F_STATE, 1 - call_if_eq VictoryRoad_1F_EventScript_235D97 + call_if_eq VictoryRoad_1F_EventScript_SetEntranceWallyPos1 compare VAR_VICTORY_ROAD_1F_STATE, 2 - call_if_eq VictoryRoad_1F_EventScript_235DA3 + call_if_eq VictoryRoad_1F_EventScript_SetEntranceWallyPos2 end -VictoryRoad_1F_EventScript_235D97:: @ 8235D97 +VictoryRoad_1F_EventScript_SetEntranceWallyPos1:: @ 8235D97 setobjectxyperm 4, 2, 24 setobjectmovementtype 4, MOVEMENT_TYPE_FACE_DOWN return -VictoryRoad_1F_EventScript_235DA3:: @ 8235DA3 +VictoryRoad_1F_EventScript_SetEntranceWallyPos2:: @ 8235DA3 setobjectxyperm 4, 3, 24 setobjectmovementtype 4, MOVEMENT_TYPE_FACE_DOWN return -VictoryRoad_1F_EventScript_235DAF:: @ 8235DAF +VictoryRoad_1F_EventScript_WallyBattleTrigger1:: @ 8235DAF lockall setvar VAR_0x8008, 1 addobject 4 - applymovement 4, VictoryRoad_1F_Movement_235E15 + applymovement 4, VictoryRoad_1F_Movement_WallyApproachPlayer1 waitmovement 0 - goto VictoryRoad_1F_EventScript_235DE1 + goto VictoryRoad_1F_EventScript_WallyEntranceBattle end -VictoryRoad_1F_EventScript_235DC8:: @ 8235DC8 +VictoryRoad_1F_EventScript_WallyBattleTrigger2:: @ 8235DC8 lockall setvar VAR_0x8008, 2 addobject 4 - applymovement 4, VictoryRoad_1F_Movement_235E21 + applymovement 4, VictoryRoad_1F_Movement_WallyApproachPlayer2 waitmovement 0 - goto VictoryRoad_1F_EventScript_235DE1 + goto VictoryRoad_1F_EventScript_WallyEntranceBattle end -VictoryRoad_1F_EventScript_235DE1:: @ 8235DE1 +VictoryRoad_1F_EventScript_WallyEntranceBattle:: @ 8235DE1 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 - msgbox VictoryRoad_1F_Text_235EE6, MSGBOX_DEFAULT - trainerbattle_no_intro TRAINER_WALLY_1, VictoryRoad_1F_Text_235FFC - msgbox VictoryRoad_1F_Text_236020, MSGBOX_DEFAULT + msgbox VictoryRoad_1F_Text_WallyNotGoingToLoseAnymore, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_WALLY_1, VictoryRoad_1F_Text_WallyEntranceDefeat + msgbox VictoryRoad_1F_Text_WallyPostEntranceBattle, MSGBOX_DEFAULT clearflag FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY copyobjectxytoperm 4 setflag FLAG_DEFEATED_WALLY_VICTORY_ROAD @@ -50,7 +50,7 @@ VictoryRoad_1F_EventScript_235DE1:: @ 8235DE1 releaseall end -VictoryRoad_1F_Movement_235E15: @ 8235E15 +VictoryRoad_1F_Movement_WallyApproachPlayer1: @ 8235E15 walk_left walk_left walk_left @@ -64,7 +64,7 @@ VictoryRoad_1F_Movement_235E15: @ 8235E15 walk_up step_end -VictoryRoad_1F_Movement_235E21: @ 8235E21 +VictoryRoad_1F_Movement_WallyApproachPlayer2: @ 8235E21 walk_left walk_left walk_left @@ -77,49 +77,51 @@ VictoryRoad_1F_Movement_235E21: @ 8235E21 walk_up step_end -VictoryRoad_1F_EventScript_235E2C:: @ 8235E2C - msgbox VictoryRoad_1F_Text_236020, MSGBOX_NPC +@ This Wally appears near the entrance once his battle is triggered and remains there until the Hall of Fame is entered +VictoryRoad_1F_EventScript_EntranceWally:: @ 8235E2C + msgbox VictoryRoad_1F_Text_WallyPostEntranceBattle, MSGBOX_NPC end -VictoryRoad_1F_EventScript_235E35:: @ 8235E35 - trainerbattle_single TRAINER_WALLY_3, VictoryRoad_1F_Text_236073, VictoryRoad_1F_Text_2360DA +@ This Wally appears and remains at the exit after the Hall of Fame is entered +VictoryRoad_1F_EventScript_ExitWally:: @ 8235E35 + trainerbattle_single TRAINER_WALLY_3, VictoryRoad_1F_Text_WallyIntro, VictoryRoad_1F_Text_WallyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq VictoryRoad_1F_EventScript_235E5C - msgbox VictoryRoad_1F_Text_2360FE, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq VictoryRoad_1F_EventScript_RematchWally + msgbox VictoryRoad_1F_Text_WallyPostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_1F_EventScript_235E5C:: @ 8235E5C - trainerbattle_rematch TRAINER_WALLY_3, VictoryRoad_1F_Text_236073, VictoryRoad_1F_Text_2360DA - msgbox VictoryRoad_1F_Text_2360FE, MSGBOX_AUTOCLOSE +VictoryRoad_1F_EventScript_RematchWally:: @ 8235E5C + trainerbattle_rematch TRAINER_WALLY_3, VictoryRoad_1F_Text_WallyIntro, VictoryRoad_1F_Text_WallyDefeat + msgbox VictoryRoad_1F_Text_WallyPostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_1F_EventScript_235E73:: @ 8235E73 - trainerbattle_single TRAINER_EDGAR, VictoryRoad_1F_Text_236184, VictoryRoad_1F_Text_2361CB - msgbox VictoryRoad_1F_Text_2361E5, MSGBOX_AUTOCLOSE +VictoryRoad_1F_EventScript_Edgar:: @ 8235E73 + trainerbattle_single TRAINER_EDGAR, VictoryRoad_1F_Text_EdgarIntro, VictoryRoad_1F_Text_EdgarDefeat + msgbox VictoryRoad_1F_Text_EdgarPostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_1F_EventScript_235E8A:: @ 8235E8A - trainerbattle_single TRAINER_ALBERT, VictoryRoad_1F_Text_236248, VictoryRoad_1F_Text_236290 - msgbox VictoryRoad_1F_Text_2362A4, MSGBOX_AUTOCLOSE +VictoryRoad_1F_EventScript_Albert:: @ 8235E8A + trainerbattle_single TRAINER_ALBERT, VictoryRoad_1F_Text_AlbertIntro, VictoryRoad_1F_Text_AlbertDefeat + msgbox VictoryRoad_1F_Text_AlbertPostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_1F_EventScript_235EA1:: @ 8235EA1 - trainerbattle_single TRAINER_HOPE, VictoryRoad_1F_Text_2362EE, VictoryRoad_1F_Text_236336 - msgbox VictoryRoad_1F_Text_236356, MSGBOX_AUTOCLOSE +VictoryRoad_1F_EventScript_Hope:: @ 8235EA1 + trainerbattle_single TRAINER_HOPE, VictoryRoad_1F_Text_HopeIntro, VictoryRoad_1F_Text_HopeDefeat + msgbox VictoryRoad_1F_Text_HopePostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_1F_EventScript_235EB8:: @ 8235EB8 - trainerbattle_single TRAINER_QUINCY, VictoryRoad_1F_Text_236390, VictoryRoad_1F_Text_2363C4 - msgbox VictoryRoad_1F_Text_2363D5, MSGBOX_AUTOCLOSE +VictoryRoad_1F_EventScript_Quincy:: @ 8235EB8 + trainerbattle_single TRAINER_QUINCY, VictoryRoad_1F_Text_QuincyIntro, VictoryRoad_1F_Text_QuincyDefeat + msgbox VictoryRoad_1F_Text_QuincyPostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_1F_EventScript_235ECF:: @ 8235ECF - trainerbattle_single TRAINER_KATELYNN, VictoryRoad_1F_Text_236468, VictoryRoad_1F_Text_2364A7 - msgbox VictoryRoad_1F_Text_2364BB, MSGBOX_AUTOCLOSE +VictoryRoad_1F_EventScript_Katelynn:: @ 8235ECF + trainerbattle_single TRAINER_KATELYNN, VictoryRoad_1F_Text_KatelynnIntro, VictoryRoad_1F_Text_KatelynnDefeat + msgbox VictoryRoad_1F_Text_KatelynnPostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_1F_Text_235EE6: @ 8235EE6 +VictoryRoad_1F_Text_WallyNotGoingToLoseAnymore: @ 8235EE6 .string "WALLY: Hi! {PLAYER}!\p" .string "I bet you're surprised to see me here!\p" .string "I made it all the way here, and it's\n" @@ -131,89 +133,89 @@ VictoryRoad_1F_Text_235EE6: @ 8235EE6 .string "gave me courage and strength!\p" .string "Okay… Here I come!$" -VictoryRoad_1F_Text_235FFC: @ 8235FFC +VictoryRoad_1F_Text_WallyEntranceDefeat: @ 8235FFC .string "Wow!\n" .string "{PLAYER}, you are strong, after all!$" -VictoryRoad_1F_Text_236020: @ 8236020 +VictoryRoad_1F_Text_WallyPostEntranceBattle: @ 8236020 .string "WALLY: I couldn't beat you today,\n" .string "{PLAYER}, but one of these days, I'll\l" .string "catch up to you!$" -VictoryRoad_1F_Text_236073: @ 8236073 +VictoryRoad_1F_Text_WallyIntro: @ 8236073 .string "WALLY: Hi! {PLAYER}!\p" .string "I've gotten stronger since that last\n" .string "time! I wanted to show you, {PLAYER}!\p" .string "Okay… Here I come!$" -VictoryRoad_1F_Text_2360DA: @ 82360DA +VictoryRoad_1F_Text_WallyDefeat: @ 82360DA .string "Wow!\n" .string "{PLAYER}, you are strong, after all!$" -VictoryRoad_1F_Text_2360FE: @ 82360FE +VictoryRoad_1F_Text_WallyPostBattle: @ 82360FE .string "WALLY: I couldn't beat you this time,\n" .string "too… But one of these days, {PLAYER},\l" .string "I'm going to catch up to you…\p" .string "And challenge the POKéMON LEAGUE!$" -VictoryRoad_1F_Text_236184: @ 8236184 +VictoryRoad_1F_Text_EdgarIntro: @ 8236184 .string "I've made it this far a couple times,\n" .string "but the last stretch is so long…$" -VictoryRoad_1F_Text_2361CB: @ 82361CB +VictoryRoad_1F_Text_EdgarDefeat: @ 82361CB .string "My dream ends here again…$" -VictoryRoad_1F_Text_2361E5: @ 82361E5 +VictoryRoad_1F_Text_EdgarPostBattle: @ 82361E5 .string "You've made it this far. Keep the\n" .string "momentum going and become the\l" .string "CHAMPION! If anyone can, it's you!$" -VictoryRoad_1F_Text_236248: @ 8236248 +VictoryRoad_1F_Text_AlbertIntro: @ 8236248 .string "I didn't come all this way to lose now.\n" .string "That possibility doesn't exist!$" -VictoryRoad_1F_Text_236290: @ 8236290 +VictoryRoad_1F_Text_AlbertDefeat: @ 8236290 .string "Impossible…\n" .string "I lost?$" -VictoryRoad_1F_Text_2362A4: @ 82362A4 +VictoryRoad_1F_Text_AlbertPostBattle: @ 82362A4 .string "I lost here…\p" .string "That means I lack the qualifications\n" .string "to become the CHAMPION…$" -VictoryRoad_1F_Text_2362EE: @ 82362EE +VictoryRoad_1F_Text_HopeIntro: @ 82362EE .string "This seemingly infinite and harsh road\n" .string "lives up to its name of VICTORY.$" -VictoryRoad_1F_Text_236336: @ 8236336 +VictoryRoad_1F_Text_HopeDefeat: @ 8236336 .string "Your battle style is fantastic…$" -VictoryRoad_1F_Text_236356: @ 8236356 +VictoryRoad_1F_Text_HopePostBattle: @ 8236356 .string "You seem to have the potential for\n" .string "becoming the CHAMPION.$" -VictoryRoad_1F_Text_236390: @ 8236390 +VictoryRoad_1F_Text_QuincyIntro: @ 8236390 .string "What is the VICTORY ROAD?\n" .string "I'll tell you if you win!$" -VictoryRoad_1F_Text_2363C4: @ 82363C4 +VictoryRoad_1F_Text_QuincyDefeat: @ 82363C4 .string "Okay!\n" .string "Well done!$" -VictoryRoad_1F_Text_2363D5: @ 82363D5 +VictoryRoad_1F_Text_QuincyPostBattle: @ 82363D5 .string "Getting through here safely--that's\n" .string "the final test for any TRAINER aiming\l" .string "to become the POKéMON CHAMPION.\p" .string "That's why it's called the VICTORY\n" .string "ROAD.$" -VictoryRoad_1F_Text_236468: @ 8236468 +VictoryRoad_1F_Text_KatelynnIntro: @ 8236468 .string "I have nothing to say to anyone\n" .string "that's come this far. Come on!$" -VictoryRoad_1F_Text_2364A7: @ 82364A7 +VictoryRoad_1F_Text_KatelynnDefeat: @ 82364A7 .string "This is a disgrace…$" -VictoryRoad_1F_Text_2364BB: @ 82364BB +VictoryRoad_1F_Text_KatelynnPostBattle: @ 82364BB .string "Humph, go right on ahead.\n" .string "See if I care.$" diff --git a/data/maps/VictoryRoad_B1F/map.json b/data/maps/VictoryRoad_B1F/map.json index b8f00f4fb..3241c1364 100644 --- a/data/maps/VictoryRoad_B1F/map.json +++ b/data/maps/VictoryRoad_B1F/map.json @@ -193,7 +193,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "VictoryRoad_B1F_EventScript_2364E5", + "script": "VictoryRoad_B1F_EventScript_Samuel", "flag": "0" }, { @@ -206,7 +206,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "VictoryRoad_B1F_EventScript_2364FC", + "script": "VictoryRoad_B1F_EventScript_Shannon", "flag": "0" }, { @@ -219,7 +219,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "VictoryRoad_B1F_EventScript_236513", + "script": "VictoryRoad_B1F_EventScript_Michelle", "flag": "0" }, { @@ -271,7 +271,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "VictoryRoad_B1F_EventScript_23652A", + "script": "VictoryRoad_B1F_EventScript_Mitchell", "flag": "0" }, { @@ -284,7 +284,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "VictoryRoad_B1F_EventScript_236541", + "script": "VictoryRoad_B1F_EventScript_Halle", "flag": "0" } ], diff --git a/data/maps/VictoryRoad_B1F/scripts.inc b/data/maps/VictoryRoad_B1F/scripts.inc index c2fb918cc..fd175599c 100644 --- a/data/maps/VictoryRoad_B1F/scripts.inc +++ b/data/maps/VictoryRoad_B1F/scripts.inc @@ -1,88 +1,88 @@ VictoryRoad_B1F_MapScripts:: @ 82364E4 .byte 0 -VictoryRoad_B1F_EventScript_2364E5:: @ 82364E5 - trainerbattle_single TRAINER_SAMUEL, VictoryRoad_B1F_Text_236558, VictoryRoad_B1F_Text_2365AD - msgbox VictoryRoad_B1F_Text_2365C4, MSGBOX_AUTOCLOSE +VictoryRoad_B1F_EventScript_Samuel:: @ 82364E5 + trainerbattle_single TRAINER_SAMUEL, VictoryRoad_B1F_Text_SamuelIntro, VictoryRoad_B1F_Text_SamuelDefeat + msgbox VictoryRoad_B1F_Text_SamuelPostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_B1F_EventScript_2364FC:: @ 82364FC - trainerbattle_single TRAINER_SHANNON, VictoryRoad_B1F_Text_2365FD, VictoryRoad_B1F_Text_23664D - msgbox VictoryRoad_B1F_Text_236678, MSGBOX_AUTOCLOSE +VictoryRoad_B1F_EventScript_Shannon:: @ 82364FC + trainerbattle_single TRAINER_SHANNON, VictoryRoad_B1F_Text_ShannonIntro, VictoryRoad_B1F_Text_ShannonDefeat + msgbox VictoryRoad_B1F_Text_ShannonPostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_B1F_EventScript_236513:: @ 8236513 - trainerbattle_single TRAINER_MICHELLE, VictoryRoad_B1F_Text_2366C2, VictoryRoad_B1F_Text_23670B - msgbox VictoryRoad_B1F_Text_23671B, MSGBOX_AUTOCLOSE +VictoryRoad_B1F_EventScript_Michelle:: @ 8236513 + trainerbattle_single TRAINER_MICHELLE, VictoryRoad_B1F_Text_MichelleIntro, VictoryRoad_B1F_Text_MichelleDefeat + msgbox VictoryRoad_B1F_Text_MichellePostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_B1F_EventScript_23652A:: @ 823652A - trainerbattle_single TRAINER_MITCHELL, VictoryRoad_B1F_Text_236757, VictoryRoad_B1F_Text_236780 - msgbox VictoryRoad_B1F_Text_2367A7, MSGBOX_AUTOCLOSE +VictoryRoad_B1F_EventScript_Mitchell:: @ 823652A + trainerbattle_single TRAINER_MITCHELL, VictoryRoad_B1F_Text_MitchellIntro, VictoryRoad_B1F_Text_MitchellDefeat + msgbox VictoryRoad_B1F_Text_MitchellPostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_B1F_EventScript_236541:: @ 8236541 - trainerbattle_single TRAINER_HALLE, VictoryRoad_B1F_Text_2367FD, VictoryRoad_B1F_Text_23683B - msgbox VictoryRoad_B1F_Text_23684C, MSGBOX_AUTOCLOSE +VictoryRoad_B1F_EventScript_Halle:: @ 8236541 + trainerbattle_single TRAINER_HALLE, VictoryRoad_B1F_Text_HalleIntro, VictoryRoad_B1F_Text_HalleDefeat + msgbox VictoryRoad_B1F_Text_HallePostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_B1F_Text_236558: @ 8236558 +VictoryRoad_B1F_Text_SamuelIntro: @ 8236558 .string "The thought that I'm getting closer to\n" .string "the POKéMON LEAGUE…\p" .string "I'm getting stage fright…$" -VictoryRoad_B1F_Text_2365AD: @ 82365AD +VictoryRoad_B1F_Text_SamuelDefeat: @ 82365AD .string "I couldn't do a thing…$" -VictoryRoad_B1F_Text_2365C4: @ 82365C4 +VictoryRoad_B1F_Text_SamuelPostBattle: @ 82365C4 .string "The POKéMON LEAGUE became distant\n" .string "again… What a letdown…$" -VictoryRoad_B1F_Text_2365FD: @ 82365FD +VictoryRoad_B1F_Text_ShannonIntro: @ 82365FD .string "To win your way through the POKéMON\n" .string "LEAGUE, you need the trust of your\l" .string "POKéMON.$" -VictoryRoad_B1F_Text_23664D: @ 823664D +VictoryRoad_B1F_Text_ShannonDefeat: @ 823664D .string "Your relationship is based on\n" .string "solid trust.$" -VictoryRoad_B1F_Text_236678: @ 8236678 +VictoryRoad_B1F_Text_ShannonPostBattle: @ 8236678 .string "By being together all the time, trust\n" .string "grows between POKéMON and TRAINERS.$" -VictoryRoad_B1F_Text_2366C2: @ 82366C2 +VictoryRoad_B1F_Text_MichelleIntro: @ 82366C2 .string "This isn't the goal. It's only a place\n" .string "on the way to the POKéMON LEAGUE.$" -VictoryRoad_B1F_Text_23670B: @ 823670B +VictoryRoad_B1F_Text_MichelleDefeat: @ 823670B .string "That's the way!$" -VictoryRoad_B1F_Text_23671B: @ 823671B +VictoryRoad_B1F_Text_MichellePostBattle: @ 823671B .string "You'll do fine, for sure!\n" .string "Your POKéMON are all eager to go!$" -VictoryRoad_B1F_Text_236757: @ 8236757 +VictoryRoad_B1F_Text_MitchellIntro: @ 8236757 .string "My POKéMON are cosmically\n" .string "awe inspiring!$" -VictoryRoad_B1F_Text_236780: @ 8236780 +VictoryRoad_B1F_Text_MitchellDefeat: @ 8236780 .string "I've never met anyone like you before.$" -VictoryRoad_B1F_Text_2367A7: @ 82367A7 +VictoryRoad_B1F_Text_MitchellPostBattle: @ 82367A7 .string "Even outside of battle, I sense\n" .string "incredible power emanating from you\l" .string "and your POKéMON.$" -VictoryRoad_B1F_Text_2367FD: @ 82367FD +VictoryRoad_B1F_Text_HalleIntro: @ 82367FD .string "Okay, no need to get your back up!\n" .string "Relax, let's take it easy!$" -VictoryRoad_B1F_Text_23683B: @ 823683B +VictoryRoad_B1F_Text_HalleDefeat: @ 823683B .string "Whoa!\n" .string "Wonderful!$" -VictoryRoad_B1F_Text_23684C: @ 823684C +VictoryRoad_B1F_Text_HallePostBattle: @ 823684C .string "Sure, this is VICTORY ROAD.\p" .string "But it's not all that different from\n" .string "the path you've taken so far.\p" diff --git a/data/maps/VictoryRoad_B2F/map.json b/data/maps/VictoryRoad_B2F/map.json index de10ef891..d78339b52 100644 --- a/data/maps/VictoryRoad_B2F/map.json +++ b/data/maps/VictoryRoad_B2F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "VictoryRoad_B2F_EventScript_2368D5", + "script": "VictoryRoad_B2F_EventScript_Vito", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "VictoryRoad_B2F_EventScript_2368EC", + "script": "VictoryRoad_B2F_EventScript_Owen", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "VictoryRoad_B2F_EventScript_236903", + "script": "VictoryRoad_B2F_EventScript_Caroline", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "VictoryRoad_B2F_EventScript_23691A", + "script": "VictoryRoad_B2F_EventScript_Julie", "flag": "0" }, { @@ -89,7 +89,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "VictoryRoad_B2F_EventScript_236948", + "script": "VictoryRoad_B2F_EventScript_Dianne", "flag": "0" }, { @@ -102,7 +102,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "VictoryRoad_B2F_EventScript_236931", + "script": "VictoryRoad_B2F_EventScript_Felix", "flag": "0" } ], diff --git a/data/maps/VictoryRoad_B2F/scripts.inc b/data/maps/VictoryRoad_B2F/scripts.inc index 732878de3..9db635a85 100644 --- a/data/maps/VictoryRoad_B2F/scripts.inc +++ b/data/maps/VictoryRoad_B2F/scripts.inc @@ -1,108 +1,108 @@ VictoryRoad_B2F_MapScripts:: @ 82368D4 .byte 0 -VictoryRoad_B2F_EventScript_2368D5:: @ 82368D5 - trainerbattle_single TRAINER_VITO, VictoryRoad_B2F_Text_23695F, VictoryRoad_B2F_Text_2369B3 - msgbox VictoryRoad_B2F_Text_2369DE, MSGBOX_AUTOCLOSE +VictoryRoad_B2F_EventScript_Vito:: @ 82368D5 + trainerbattle_single TRAINER_VITO, VictoryRoad_B2F_Text_VitoIntro, VictoryRoad_B2F_Text_VitoDefeat + msgbox VictoryRoad_B2F_Text_VitoPostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_B2F_EventScript_2368EC:: @ 82368EC - trainerbattle_single TRAINER_OWEN, VictoryRoad_B2F_Text_236A4C, VictoryRoad_B2F_Text_236A92 - msgbox VictoryRoad_B2F_Text_236AAE, MSGBOX_AUTOCLOSE +VictoryRoad_B2F_EventScript_Owen:: @ 82368EC + trainerbattle_single TRAINER_OWEN, VictoryRoad_B2F_Text_OwenIntro, VictoryRoad_B2F_Text_OwenDefeat + msgbox VictoryRoad_B2F_Text_OwenPostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_B2F_EventScript_236903:: @ 8236903 - trainerbattle_single TRAINER_CAROLINE, VictoryRoad_B2F_Text_236AF0, VictoryRoad_B2F_Text_236B14 - msgbox VictoryRoad_B2F_Text_236B2F, MSGBOX_AUTOCLOSE +VictoryRoad_B2F_EventScript_Caroline:: @ 8236903 + trainerbattle_single TRAINER_CAROLINE, VictoryRoad_B2F_Text_CarolineIntro, VictoryRoad_B2F_Text_CarolineDefeat + msgbox VictoryRoad_B2F_Text_CarolinePostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_B2F_EventScript_23691A:: @ 823691A - trainerbattle_single TRAINER_JULIE, VictoryRoad_B2F_Text_236B88, VictoryRoad_B2F_Text_236C0A - msgbox VictoryRoad_B2F_Text_236C21, MSGBOX_AUTOCLOSE +VictoryRoad_B2F_EventScript_Julie:: @ 823691A + trainerbattle_single TRAINER_JULIE, VictoryRoad_B2F_Text_JulieIntro, VictoryRoad_B2F_Text_JulieDefeat + msgbox VictoryRoad_B2F_Text_JuliePostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_B2F_EventScript_236931:: @ 8236931 - trainerbattle_single TRAINER_FELIX, VictoryRoad_B2F_Text_236C67, VictoryRoad_B2F_Text_236CAB - msgbox VictoryRoad_B2F_Text_236CBA, MSGBOX_AUTOCLOSE +VictoryRoad_B2F_EventScript_Felix:: @ 8236931 + trainerbattle_single TRAINER_FELIX, VictoryRoad_B2F_Text_FelixIntro, VictoryRoad_B2F_Text_FelixDefeat + msgbox VictoryRoad_B2F_Text_FelixPostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_B2F_EventScript_236948:: @ 8236948 - trainerbattle_single TRAINER_DIANNE, VictoryRoad_B2F_Text_236D27, VictoryRoad_B2F_Text_236D6E - msgbox VictoryRoad_B2F_Text_236D8C, MSGBOX_AUTOCLOSE +VictoryRoad_B2F_EventScript_Dianne:: @ 8236948 + trainerbattle_single TRAINER_DIANNE, VictoryRoad_B2F_Text_DianneIntro, VictoryRoad_B2F_Text_DianneDefeat + msgbox VictoryRoad_B2F_Text_DiannePostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_B2F_Text_23695F: @ 823695F +VictoryRoad_B2F_Text_VitoIntro: @ 823695F .string "I trained together with my whole family,\n" .string "every one of us!\l" .string "I'm not losing to anyone!$" -VictoryRoad_B2F_Text_2369B3: @ 82369B3 +VictoryRoad_B2F_Text_VitoDefeat: @ 82369B3 .string "Better than my family?!\n" .string "Is that possible?!$" -VictoryRoad_B2F_Text_2369DE: @ 82369DE +VictoryRoad_B2F_Text_VitoPostBattle: @ 82369DE .string "I was better than everyone in my\n" .string "family. I've never lost before…\p" .string "I've lost my confidence…\n" .string "Maybe I'll go home…$" -VictoryRoad_B2F_Text_236A4C: @ 8236A4C +VictoryRoad_B2F_Text_OwenIntro: @ 8236A4C .string "I'd heard that there was a tough\n" .string "little kid around. Do they mean you?$" -VictoryRoad_B2F_Text_236A92: @ 8236A92 +VictoryRoad_B2F_Text_OwenDefeat: @ 8236A92 .string "The little shrimp is tough!$" -VictoryRoad_B2F_Text_236AAE: @ 8236AAE +VictoryRoad_B2F_Text_OwenPostBattle: @ 8236AAE .string "The rumors I heard, that tough little\n" .string "kid is from PETALBURG CITY.$" -VictoryRoad_B2F_Text_236AF0: @ 8236AF0 +VictoryRoad_B2F_Text_CarolineIntro: @ 8236AF0 .string "You must be getting a little tired.$" -VictoryRoad_B2F_Text_236B14: @ 8236B14 +VictoryRoad_B2F_Text_CarolineDefeat: @ 8236B14 .string "No signs of tiring at all!$" -VictoryRoad_B2F_Text_236B2F: @ 8236B2F +VictoryRoad_B2F_Text_CarolinePostBattle: @ 8236B2F .string "VICTORY ROAD and the POKéMON LEAGUE\n" .string "are long and grueling challenges.\l" .string "Beware of fatigue!$" -VictoryRoad_B2F_Text_236B88: @ 8236B88 +VictoryRoad_B2F_Text_JulieIntro: @ 8236B88 .string "You shouldn't get complacent just\n" .string "because you have a lot of GYM BADGES.\p" .string "There's always going to be someone\n" .string "who's better than you!$" -VictoryRoad_B2F_Text_236C0A: @ 8236C0A +VictoryRoad_B2F_Text_JulieDefeat: @ 8236C0A .string "You're better than me!$" -VictoryRoad_B2F_Text_236C21: @ 8236C21 +VictoryRoad_B2F_Text_JuliePostBattle: @ 8236C21 .string "Gaze on your collected BADGES and\n" .string "remember the TRAINERS you've faced.$" -VictoryRoad_B2F_Text_236C67: @ 8236C67 +VictoryRoad_B2F_Text_FelixIntro: @ 8236C67 .string "I've come this far, but the tension's\n" .string "giving me awful stomach pain…$" -VictoryRoad_B2F_Text_236CAB: @ 8236CAB +VictoryRoad_B2F_Text_FelixDefeat: @ 8236CAB .string "Ooh…\n" .string "It hurts…$" -VictoryRoad_B2F_Text_236CBA: @ 8236CBA +VictoryRoad_B2F_Text_FelixPostBattle: @ 8236CBA .string "I can't help getting all tense knowing\n" .string "that I'm nearing the POKéMON LEAGUE.\p" .string "It's all I can do to feign calm.$" -VictoryRoad_B2F_Text_236D27: @ 8236D27 +VictoryRoad_B2F_Text_DianneIntro: @ 8236D27 .string "The elite among the elite gather in\n" .string "this cave.\p" .string "How are you finding it?$" -VictoryRoad_B2F_Text_236D6E: @ 8236D6E +VictoryRoad_B2F_Text_DianneDefeat: @ 8236D6E .string "Not rattled in the least bit!$" -VictoryRoad_B2F_Text_236D8C: @ 8236D8C +VictoryRoad_B2F_Text_DiannePostBattle: @ 8236D8C .string "You do have guts! I like that!\n" .string "Keep it going!$" diff --git a/data/scripts/new_game.inc b/data/scripts/new_game.inc index e39c6eca6..20a2b0222 100644 --- a/data/scripts/new_game.inc +++ b/data/scripts/new_game.inc @@ -166,7 +166,7 @@ EventScript_ResetAllMapFlags:: @ 82715DE setflag FLAG_HIDE_TRICK_HOUSE_ENTRANCE_MAN setflag FLAG_HIDE_MT_CHIMNEY_TRAINERS setflag FLAG_HIDE_MT_CHIMNEY_LAVA_COOKIE_LADY - setflag FLAG_HIDE_RUSTURF_TUNNEL_OLD_MAN + setflag FLAG_HIDE_RUSTURF_TUNNEL_BRINEY setflag FLAG_HIDE_ROUTE_116_MR_BRINEY setflag FLAG_HIDE_RUSTURF_TUNNEL_PEEKO setflag FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT @@ -237,7 +237,7 @@ EventScript_ResetAllMapFlags:: @ 82715DE setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS setflag FLAG_HIDE_DEOXYS setflag FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION - setflag FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT + setflag FLAG_HIDE_FALLARBOR_TOWN_BATTLE_TENT_SCOTT setflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT setflag FLAG_HIDE_SKY_PILLAR_WALLACE setflag FLAG_HIDE_RAYQUAZA_SKY_TOWER_SUMMIT diff --git a/data/text/braille.inc b/data/text/braille.inc index 13c66c52f..30f9b44d4 100644 --- a/data/text/braille.inc +++ b/data/text/braille.inc @@ -1,4 +1,4 @@ -Underwater_SealedChamber_Braille_2A6B15: @ 82A6B15 +Underwater_SealedChamber_Braille_GoUpHere: @ 82A6B15 .byte 4 .byte 6 .byte 26 @@ -7,7 +7,7 @@ Underwater_SealedChamber_Braille_2A6B15: @ 82A6B15 .byte 9 .braille "GO UP HERE.$" -SealedChamber_OuterRoom_Braille_2A6B27: @ 82A6B27 +SealedChamber_OuterRoom_Braille_ABC: @ 82A6B27 .byte 7 .byte 6 .byte 21 @@ -16,7 +16,7 @@ SealedChamber_OuterRoom_Braille_2A6B27: @ 82A6B27 .byte 9 .braille "ABC$" -SealedChamber_OuterRoom_Braille_2A6B31: @ 82A6B31 +SealedChamber_OuterRoom_Braille_GHI: @ 82A6B31 .byte 7 .byte 6 .byte 21 @@ -25,7 +25,7 @@ SealedChamber_OuterRoom_Braille_2A6B31: @ 82A6B31 .byte 9 .braille "GHI$" -SealedChamber_OuterRoom_Braille_2A6B3B: @ 82A6B3B +SealedChamber_OuterRoom_Braille_MNO: @ 82A6B3B .byte 7 .byte 6 .byte 21 @@ -34,7 +34,7 @@ SealedChamber_OuterRoom_Braille_2A6B3B: @ 82A6B3B .byte 9 .braille "MNO$" -SealedChamber_OuterRoom_Braille_2A6B45: @ 82A6B45 +SealedChamber_OuterRoom_Braille_TUV: @ 82A6B45 .byte 7 .byte 6 .byte 21 @@ -43,7 +43,7 @@ SealedChamber_OuterRoom_Braille_2A6B45: @ 82A6B45 .byte 9 .braille "TUV$" -SealedChamber_OuterRoom_Braille_2A6B4F: @ 82A6B4F +SealedChamber_OuterRoom_Braille_DEF: @ 82A6B4F .byte 7 .byte 6 .byte 21 @@ -52,7 +52,7 @@ SealedChamber_OuterRoom_Braille_2A6B4F: @ 82A6B4F .byte 9 .braille "DEF$" -SealedChamber_OuterRoom_Braille_2A6B59: @ 82A6B59 +SealedChamber_OuterRoom_Braille_JKL: @ 82A6B59 .byte 7 .byte 6 .byte 21 @@ -61,7 +61,7 @@ SealedChamber_OuterRoom_Braille_2A6B59: @ 82A6B59 .byte 9 .braille "JKL$" -SealedChamber_OuterRoom_Braille_2A6B63: @ 82A6B63 +SealedChamber_OuterRoom_Braille_PQRS: @ 82A6B63 .byte 7 .byte 6 .byte 21 @@ -70,7 +70,7 @@ SealedChamber_OuterRoom_Braille_2A6B63: @ 82A6B63 .byte 9 .braille "PQRS$" -SealedChamber_OuterRoom_Braille_2A6B6E: @ 82A6B6E +SealedChamber_OuterRoom_Braille_Period: @ 82A6B6E .byte 9 .byte 6 .byte 19 @@ -79,7 +79,7 @@ SealedChamber_OuterRoom_Braille_2A6B6E: @ 82A6B6E .byte 9 .braille ".$" -SealedChamber_OuterRoom_Braille_2A6B76: @ 82A6B76 +SealedChamber_OuterRoom_Braille_WXYZ: @ 82A6B76 .byte 7 .byte 6 .byte 21 @@ -88,7 +88,7 @@ SealedChamber_OuterRoom_Braille_2A6B76: @ 82A6B76 .byte 9 .braille "WXYZ$" -SealedChamber_OuterRoom_Braille_2A6B81: @ 82A6B81 +SealedChamber_OuterRoom_Braille_Comma: @ 82A6B81 .byte 9 .byte 6 .byte 19 @@ -97,7 +97,7 @@ SealedChamber_OuterRoom_Braille_2A6B81: @ 82A6B81 .byte 9 .braille ",$" -SealedChamber_OuterRoom_Braille_2A6B89: @ 82A6B89 +SealedChamber_OuterRoom_Braille_DigHere: @ 82A6B89 .byte 7 .byte 4 .byte 23 @@ -106,7 +106,7 @@ SealedChamber_OuterRoom_Braille_2A6B89: @ 82A6B89 .byte 7 .braille "DIG HERE.$" -SealedChamber_InnerRoom_Braille_2A6B99: @ 82A6B99 +SealedChamber_InnerRoom_Braille_FirstWailordLastRelicanth: @ 82A6B99 .byte 0 .byte 0 .byte 29 @@ -118,7 +118,7 @@ SealedChamber_InnerRoom_Braille_2A6B99: @ 82A6B99 .braille "LAST COMES\n" .braille "RELICANTH.$" -SealedChamber_InnerRoom_Braille_2A6BCA: @ 82A6BCA +SealedChamber_InnerRoom_Braille_InThisCaveWeHaveLived: @ 82A6BCA .byte 2 .byte 0 .byte 26 @@ -130,7 +130,7 @@ SealedChamber_InnerRoom_Braille_2A6BCA: @ 82A6BCA .braille "HAVE\n" .braille "LIVED.$" -SealedChamber_InnerRoom_Braille_2A6BEC: @ 82A6BEC +SealedChamber_InnerRoom_Braille_WeOweAllToThePokemon: @ 82A6BEC .byte 7 .byte 2 .byte 23 @@ -141,7 +141,7 @@ SealedChamber_InnerRoom_Braille_2A6BEC: @ 82A6BEC .braille "TO THE\n" .braille "POKEMON.$" -SealedChamber_InnerRoom_Braille_2A6C0D: @ 82A6C0D +SealedChamber_InnerRoom_Braille_ButWeSealedThePokemonAway: @ 82A6C0D .byte 3 .byte 0 .byte 25 @@ -153,7 +153,7 @@ SealedChamber_InnerRoom_Braille_2A6C0D: @ 82A6C0D .braille "POKEMON\n" .braille "AWAY.$" -SealedChamber_InnerRoom_Braille_2A6C34: @ 82A6C34 +SealedChamber_InnerRoom_Braille_WeFearedIt: @ 82A6C34 .byte 5 .byte 6 .byte 25 @@ -162,7 +162,7 @@ SealedChamber_InnerRoom_Braille_2A6C34: @ 82A6C34 .byte 9 .braille "WE FEARED IT.$" -SealedChamber_InnerRoom_Braille_2A6C48: @ 82A6C48 +SealedChamber_InnerRoom_Braille_ThoseWithCourageHope: @ 82A6C48 .byte 6 .byte 0 .byte 24 @@ -174,7 +174,7 @@ SealedChamber_InnerRoom_Braille_2A6C48: @ 82A6C48 .braille "THOSE WITH\n" .braille "HOPE.$" -SealedChamber_InnerRoom_Braille_2A6C73: @ 82A6C73 +SealedChamber_InnerRoom_Braille_OpenDoorEternalPokemonWaits: @ 82A6C73 .byte 3 .byte 2 .byte 27 diff --git a/include/constants/flags.h b/include/constants/flags.h index e76a9d9d7..ed42894ff 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -261,7 +261,7 @@ #define FLAG_USED_ROOM_2_KEY 0xF1 #define FLAG_USED_ROOM_4_KEY 0xF2 #define FLAG_USED_ROOM_6_KEY 0xF3 -#define FLAG_MET_PROF_COSMO 0xF4 +#define FLAG_MET_PROF_COZMO 0xF4 #define FLAG_RECEIVED_WAILMER_DOLL 0xF5 #define FLAG_RECEIVED_CHESTO_BERRY_ROUTE_104 0xF6 #define FLAG_DEFEATED_SS_TIDAL_TRAINERS 0xF7 @@ -807,7 +807,7 @@ #define FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE 0x2FC #define FLAG_HIDE_MAUVILLE_CITY_SCOTT 0x2FD #define FLAG_HIDE_VERDANTURF_TOWN_SCOTT 0x2FE -#define FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT 0x2FF +#define FLAG_HIDE_FALLARBOR_TOWN_BATTLE_TENT_SCOTT 0x2FF #define FLAG_HIDE_ROUTE_111_VICTOR_WINSTRATE 0x300 #define FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE 0x301 #define FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE 0x302 @@ -919,7 +919,7 @@ #define FLAG_HIDE_ROUTE_111_DESERT_FOSSIL 0x36C #define FLAG_HIDE_MT_CHIMNEY_TRAINERS 0x36D #define FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT 0x36E -#define FLAG_HIDE_RUSTURF_TUNNEL_OLD_MAN 0x36F +#define FLAG_HIDE_RUSTURF_TUNNEL_BRINEY 0x36F #define FLAG_HIDE_RUSTURF_TUNNEL_PEEKO 0x370 #define FLAG_HIDE_BRINEYS_HOUSE_PEEKO 0x371 #define FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA 0x372 diff --git a/src/field_specials.c b/src/field_specials.c index 65bc3a095..ee1fe9f98 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -1427,7 +1427,9 @@ bool8 Special_AreLeadMonEVsMaxedOut(void) u8 TryUpdateRusturfTunnelState(void) { - if (!FlagGet(FLAG_RUSTURF_TUNNEL_OPENED) && gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(RUSTURF_TUNNEL) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(RUSTURF_TUNNEL)) + if (!FlagGet(FLAG_RUSTURF_TUNNEL_OPENED) + && gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(RUSTURF_TUNNEL) + && gSaveBlock1Ptr->location.mapNum == MAP_NUM(RUSTURF_TUNNEL)) { if (FlagGet(FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1)) { From 43b7fd741a3fcbda3ff868843e4639a3ab64b988 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 7 Nov 2019 09:41:59 -0500 Subject: [PATCH 16/40] Document Game Corner scripts --- data/event_scripts.s | 1 + data/maps/MauvilleCity_GameCorner/map.json | 48 +- data/maps/MauvilleCity_GameCorner/scripts.inc | 620 +++++++++--------- data/maps/MauvilleCity_House1/map.json | 2 +- data/maps/MauvilleCity_House1/scripts.inc | 18 +- data/maps/MauvilleCity_House2/map.json | 2 +- data/maps/MauvilleCity_House2/scripts.inc | 42 +- include/constants/coins.h | 6 + src/coins.c | 3 +- 9 files changed, 381 insertions(+), 361 deletions(-) create mode 100644 include/constants/coins.h diff --git a/data/event_scripts.s b/data/event_scripts.s index b1e637bf0..7a86344bb 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -6,6 +6,7 @@ #include "constants/battle_setup.h" #include "constants/berry.h" #include "constants/cable_club.h" +#include "constants/coins.h" #include "constants/contest.h" #include "constants/daycare.h" #include "constants/decorations.h" diff --git a/data/maps/MauvilleCity_GameCorner/map.json b/data/maps/MauvilleCity_GameCorner/map.json index c811cd7fd..efebc685a 100644 --- a/data/maps/MauvilleCity_GameCorner/map.json +++ b/data/maps/MauvilleCity_GameCorner/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_GameCorner_EventScript_210125", + "script": "MauvilleCity_GameCorner_EventScript_Woman2", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_GameCorner_EventScript_21012E", + "script": "MauvilleCity_GameCorner_EventScript_Gentleman", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_GameCorner_EventScript_20FBB9", + "script": "MauvilleCity_GameCorner_EventScript_CoinsClerk", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_GameCorner_EventScript_20FCF1", + "script": "MauvilleCity_GameCorner_EventScript_PrizeCornerDolls", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_GameCorner_EventScript_210137", + "script": "MauvilleCity_GameCorner_EventScript_Girl", "flag": "0" }, { @@ -89,7 +89,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_GameCorner_EventScript_21021D", + "script": "MauvilleCity_GameCorner_EventScript_PokefanM", "flag": "0" }, { @@ -102,7 +102,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_GameCorner_EventScript_210279", + "script": "MauvilleCity_GameCorner_EventScript_OldMan", "flag": "0" }, { @@ -115,7 +115,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_GameCorner_EventScript_210289", + "script": "MauvilleCity_GameCorner_EventScript_Cook", "flag": "0" }, { @@ -128,7 +128,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_GameCorner_EventScript_20FE9F", + "script": "MauvilleCity_GameCorner_EventScript_PrizeCornerTMs", "flag": "0" }, { @@ -141,7 +141,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_GameCorner_EventScript_210299", + "script": "MauvilleCity_GameCorner_EventScript_Man", "flag": "0" }, { @@ -154,7 +154,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_GameCorner_EventScript_2102B6", + "script": "MauvilleCity_GameCorner_EventScript_Maniac", "flag": "0" }, { @@ -167,7 +167,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_GameCorner_EventScript_2102C6", + "script": "MauvilleCity_GameCorner_EventScript_Woman", "flag": "0" } ], @@ -195,7 +195,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", - "script": "MauvilleCity_GameCorner_EventScript_2102D6" + "script": "MauvilleCity_GameCorner_EventScript_SlotMachine0" }, { "type": "sign", @@ -203,7 +203,7 @@ "y": 8, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", - "script": "MauvilleCity_GameCorner_EventScript_2102F6" + "script": "MauvilleCity_GameCorner_EventScript_SlotMachine1" }, { "type": "sign", @@ -211,7 +211,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", - "script": "MauvilleCity_GameCorner_EventScript_210316" + "script": "MauvilleCity_GameCorner_EventScript_SlotMachine2" }, { "type": "sign", @@ -219,7 +219,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST", - "script": "MauvilleCity_GameCorner_EventScript_210336" + "script": "MauvilleCity_GameCorner_EventScript_SlotMachine3" }, { "type": "sign", @@ -227,7 +227,7 @@ "y": 8, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST", - "script": "MauvilleCity_GameCorner_EventScript_210356" + "script": "MauvilleCity_GameCorner_EventScript_SlotMachine4" }, { "type": "sign", @@ -235,7 +235,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST", - "script": "MauvilleCity_GameCorner_EventScript_210376" + "script": "MauvilleCity_GameCorner_EventScript_SlotMachine5" }, { "type": "sign", @@ -243,7 +243,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", - "script": "MauvilleCity_GameCorner_EventScript_210396" + "script": "MauvilleCity_GameCorner_EventScript_SlotMachine6" }, { "type": "sign", @@ -251,7 +251,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", - "script": "MauvilleCity_GameCorner_EventScript_2103B6" + "script": "MauvilleCity_GameCorner_EventScript_SlotMachine7" }, { "type": "sign", @@ -259,7 +259,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", - "script": "MauvilleCity_GameCorner_EventScript_2103D6" + "script": "MauvilleCity_GameCorner_EventScript_SlotMachine8" }, { "type": "sign", @@ -267,7 +267,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST", - "script": "MauvilleCity_GameCorner_EventScript_2103F6" + "script": "MauvilleCity_GameCorner_EventScript_SlotMachine9" }, { "type": "sign", @@ -275,7 +275,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST", - "script": "MauvilleCity_GameCorner_EventScript_210416" + "script": "MauvilleCity_GameCorner_EventScript_SlotMachine10" }, { "type": "sign", @@ -283,7 +283,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST", - "script": "MauvilleCity_GameCorner_EventScript_210436" + "script": "MauvilleCity_GameCorner_EventScript_SlotMachine11" }, { "type": "sign", diff --git a/data/maps/MauvilleCity_GameCorner/scripts.inc b/data/maps/MauvilleCity_GameCorner/scripts.inc index 7e4180b92..2a77c010f 100644 --- a/data/maps/MauvilleCity_GameCorner/scripts.inc +++ b/data/maps/MauvilleCity_GameCorner/scripts.inc @@ -1,48 +1,60 @@ MauvilleCity_GameCorner_MapScripts:: @ 820FBB8 .byte 0 -MauvilleCity_GameCorner_EventScript_20FBB9:: @ 820FBB9 + @ Game Corner prices + .set TM32_COINS, 1500 + .set TM29_COINS, 3500 + .set TM35_COINS, 4000 + .set TM24_COINS, 4000 + .set TM13_COINS, 4000 + .set DOLL_COINS, 1000 + + .set COINS_PRICE_50, 1000 + .set COINS_PRICE_500, 10000 + +MauvilleCity_GameCorner_EventScript_CoinsClerk:: @ 820FBB9 lock faceplayer - msgbox MauvilleCity_GameCorner_Text_210460, MSGBOX_DEFAULT + msgbox MauvilleCity_GameCorner_Text_ThisIsMauvilleGameCorner, MSGBOX_DEFAULT checkitem ITEM_COIN_CASE, 1 - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_20FCB7 - message MauvilleCity_GameCorner_Text_2104DF + compare VAR_RESULT, FALSE + goto_if_eq MauvilleCity_GameCorner_EventScript_NeedCoinCase + message MauvilleCity_GameCorner_Text_WereYouLookingForCoins waitmessage showmoneybox 0, 0, 0 showcoinsbox 1, 6 - goto MauvilleCity_GameCorner_EventScript_20FBE5 + goto MauvilleCity_GameCorner_EventScript_ChooseCoinsDefault50 -MauvilleCity_GameCorner_EventScript_20FBE5:: @ 820FBE5 +MauvilleCity_GameCorner_EventScript_ChooseCoinsDefault50:: @ 820FBE5 multichoicedefault 15, 0, MULTI_GAME_CORNER_COINS, 0, 0 switch VAR_RESULT - case 0, MauvilleCity_GameCorner_EventScript_20FC33 - case 1, MauvilleCity_GameCorner_EventScript_20FC75 - goto MauvilleCity_GameCorner_EventScript_20FCD1 + case 0, MauvilleCity_GameCorner_EventScript_Buy50Coins + case 1, MauvilleCity_GameCorner_EventScript_Buy500Coins + goto MauvilleCity_GameCorner_EventScript_CancelBuyCoins end -MauvilleCity_GameCorner_EventScript_20FC0C:: @ 820FC0C +@ Unused +MauvilleCity_GameCorner_EventScript_ChooseCoinsDefault500:: @ 820FC0C multichoicedefault 15, 0, MULTI_GAME_CORNER_COINS, 1, 0 switch VAR_RESULT - case 0, MauvilleCity_GameCorner_EventScript_20FC33 - case 1, MauvilleCity_GameCorner_EventScript_20FC75 - goto MauvilleCity_GameCorner_EventScript_20FCD1 + case 0, MauvilleCity_GameCorner_EventScript_Buy50Coins + case 1, MauvilleCity_GameCorner_EventScript_Buy500Coins + goto MauvilleCity_GameCorner_EventScript_CancelBuyCoins end -MauvilleCity_GameCorner_EventScript_20FC33:: @ 820FC33 +MauvilleCity_GameCorner_EventScript_Buy50Coins:: @ 820FC33 checkcoins VAR_TEMP_1 - compare VAR_TEMP_1, 9950 - goto_if_ge MauvilleCity_GameCorner_EventScript_20FCE1 - checkmoney 1000, 0 - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_20FCC1 + compare VAR_TEMP_1, MAX_COINS + 1 - 50 + goto_if_ge MauvilleCity_GameCorner_EventScript_NoRoomForCoins + checkmoney COINS_PRICE_50, 0 + compare VAR_RESULT, FALSE + goto_if_eq MauvilleCity_GameCorner_EventScript_NotEnoughMoney givecoins 50 - takemoney 1000, 0 + takemoney COINS_PRICE_50, 0 updatemoneybox 0, 0 updatecoinsbox 1, 6 playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_210529, MSGBOX_DEFAULT + msgbox MauvilleCity_GameCorner_Text_ThankYouHereAreYourCoins, MSGBOX_DEFAULT hidemoneybox nop nop @@ -50,19 +62,19 @@ MauvilleCity_GameCorner_EventScript_20FC33:: @ 820FC33 release end -MauvilleCity_GameCorner_EventScript_20FC75:: @ 820FC75 +MauvilleCity_GameCorner_EventScript_Buy500Coins:: @ 820FC75 checkcoins VAR_TEMP_1 - compare VAR_TEMP_1, 9500 - goto_if_ge MauvilleCity_GameCorner_EventScript_20FCE1 - checkmoney 10000, 0 - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_20FCC1 + compare VAR_TEMP_1, MAX_COINS + 1 - 500 + goto_if_ge MauvilleCity_GameCorner_EventScript_NoRoomForCoins + checkmoney COINS_PRICE_500, 0 + compare VAR_RESULT, FALSE + goto_if_eq MauvilleCity_GameCorner_EventScript_NotEnoughMoney givecoins 500 - takemoney 10000, 0 + takemoney COINS_PRICE_500, 0 updatemoneybox 0, 0 updatecoinsbox 1, 6 playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_210529, MSGBOX_DEFAULT + msgbox MauvilleCity_GameCorner_Text_ThankYouHereAreYourCoins, MSGBOX_DEFAULT hidemoneybox nop nop @@ -70,13 +82,13 @@ MauvilleCity_GameCorner_EventScript_20FC75:: @ 820FC75 release end -MauvilleCity_GameCorner_EventScript_20FCB7:: @ 820FCB7 - msgbox MauvilleCity_GameCorner_Text_21047E, MSGBOX_DEFAULT +MauvilleCity_GameCorner_EventScript_NeedCoinCase:: @ 820FCB7 + msgbox MauvilleCity_GameCorner_Text_NeedCoinCaseForCoins, MSGBOX_DEFAULT release end -MauvilleCity_GameCorner_EventScript_20FCC1:: @ 820FCC1 - msgbox MauvilleCity_GameCorner_Text_210553, MSGBOX_DEFAULT +MauvilleCity_GameCorner_EventScript_NotEnoughMoney:: @ 820FCC1 + msgbox MauvilleCity_GameCorner_Text_DontHaveEnoughMoney, MSGBOX_DEFAULT hidemoneybox nop nop @@ -84,8 +96,8 @@ MauvilleCity_GameCorner_EventScript_20FCC1:: @ 820FCC1 release end -MauvilleCity_GameCorner_EventScript_20FCD1:: @ 820FCD1 - msgbox MauvilleCity_GameCorner_Text_21059A, MSGBOX_DEFAULT +MauvilleCity_GameCorner_EventScript_CancelBuyCoins:: @ 820FCD1 + msgbox MauvilleCity_GameCorner_Text_DontNeedCoinsThen, MSGBOX_DEFAULT hidemoneybox nop nop @@ -93,8 +105,8 @@ MauvilleCity_GameCorner_EventScript_20FCD1:: @ 820FCD1 release end -MauvilleCity_GameCorner_EventScript_20FCE1:: @ 820FCE1 - msgbox MauvilleCity_GameCorner_Text_21057E, MSGBOX_DEFAULT +MauvilleCity_GameCorner_EventScript_NoRoomForCoins:: @ 820FCE1 + msgbox MauvilleCity_GameCorner_Text_CoinCaseIsFull, MSGBOX_DEFAULT hidemoneybox nop nop @@ -102,438 +114,438 @@ MauvilleCity_GameCorner_EventScript_20FCE1:: @ 820FCE1 release end -MauvilleCity_GameCorner_EventScript_20FCF1:: @ 820FCF1 +MauvilleCity_GameCorner_EventScript_PrizeCornerDolls:: @ 820FCF1 lock faceplayer - msgbox MauvilleCity_GameCorner_Text_2105D7, MSGBOX_DEFAULT + msgbox MauvilleCity_GameCorner_Text_ExchangeCoinsForPrizes, MSGBOX_DEFAULT checkitem ITEM_COIN_CASE, 1 - compare VAR_RESULT, 1 - goto_if_eq MauvilleCity_GameCorner_EventScript_20FD0D + compare VAR_RESULT, TRUE + goto_if_eq MauvilleCity_GameCorner_EventScript_ChooseDollPrizeMessage release end -MauvilleCity_GameCorner_EventScript_20FD0D:: @ 820FD0D - message MauvilleCity_GameCorner_Text_21060D +MauvilleCity_GameCorner_EventScript_ChooseDollPrizeMessage:: @ 820FD0D + message MauvilleCity_GameCorner_Text_WhichPrize waitmessage setvar VAR_TEMP_1, 0 showcoinsbox 1, 1 - goto MauvilleCity_GameCorner_EventScript_20FD2B + goto MauvilleCity_GameCorner_EventScript_ChooseDollPrize -MauvilleCity_GameCorner_EventScript_20FD20:: @ 820FD20 - message MauvilleCity_GameCorner_Text_21060D +MauvilleCity_GameCorner_EventScript_ReturnToChooseDollPrize:: @ 820FD20 + message MauvilleCity_GameCorner_Text_WhichPrize waitmessage - goto MauvilleCity_GameCorner_EventScript_20FD2B + goto MauvilleCity_GameCorner_EventScript_ChooseDollPrize -MauvilleCity_GameCorner_EventScript_20FD2B:: @ 820FD2B +MauvilleCity_GameCorner_EventScript_ChooseDollPrize:: @ 820FD2B multichoice 12, 0, MULTI_GAME_CORNER_DOLLS, 0 switch VAR_RESULT - case 0, MauvilleCity_GameCorner_EventScript_20FD67 - case 1, MauvilleCity_GameCorner_EventScript_20FD75 - case 2, MauvilleCity_GameCorner_EventScript_20FD83 - case 3, MauvilleCity_GameCorner_EventScript_20FE92 - goto MauvilleCity_GameCorner_EventScript_20FE92 + case 0, MauvilleCity_GameCorner_EventScript_TreeckoDoll + case 1, MauvilleCity_GameCorner_EventScript_TorchicDoll + case 2, MauvilleCity_GameCorner_EventScript_MudkipDoll + case 3, MauvilleCity_GameCorner_EventScript_CancelDollSelect + goto MauvilleCity_GameCorner_EventScript_CancelDollSelect end -MauvilleCity_GameCorner_EventScript_20FD67:: @ 820FD67 +MauvilleCity_GameCorner_EventScript_TreeckoDoll:: @ 820FD67 setvar VAR_TEMP_1, 1 bufferdecorationname 0, DECOR_TREECKO_DOLL - goto MauvilleCity_GameCorner_EventScript_20FD91 + goto MauvilleCity_GameCorner_EventScript_ConfirmDollPrize -MauvilleCity_GameCorner_EventScript_20FD75:: @ 820FD75 +MauvilleCity_GameCorner_EventScript_TorchicDoll:: @ 820FD75 setvar VAR_TEMP_1, 2 bufferdecorationname 0, DECOR_TORCHIC_DOLL - goto MauvilleCity_GameCorner_EventScript_20FD91 + goto MauvilleCity_GameCorner_EventScript_ConfirmDollPrize -MauvilleCity_GameCorner_EventScript_20FD83:: @ 820FD83 +MauvilleCity_GameCorner_EventScript_MudkipDoll:: @ 820FD83 setvar VAR_TEMP_1, 3 bufferdecorationname 0, DECOR_MUDKIP_DOLL - goto MauvilleCity_GameCorner_EventScript_20FD91 + goto MauvilleCity_GameCorner_EventScript_ConfirmDollPrize -MauvilleCity_GameCorner_EventScript_20FD91:: @ 820FD91 - msgbox MauvilleCity_GameCorner_Text_210705, MSGBOX_YESNO +MauvilleCity_GameCorner_EventScript_ConfirmDollPrize:: @ 820FD91 + msgbox MauvilleCity_GameCorner_Text_SoYourChoiceIsX, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq MauvilleCity_GameCorner_EventScript_20FE92 + goto_if_eq MauvilleCity_GameCorner_EventScript_CancelDollSelect switch VAR_TEMP_1 - case 1, MauvilleCity_GameCorner_EventScript_20FDCB - case 2, MauvilleCity_GameCorner_EventScript_20FE05 - case 3, MauvilleCity_GameCorner_EventScript_20FE3F + case 1, MauvilleCity_GameCorner_EventScript_BuyTreeckoDoll + case 2, MauvilleCity_GameCorner_EventScript_BuyTorchicDoll + case 3, MauvilleCity_GameCorner_EventScript_BuyMudkipDoll end -MauvilleCity_GameCorner_EventScript_20FDCB:: @ 820FDCB +MauvilleCity_GameCorner_EventScript_BuyTreeckoDoll:: @ 820FDCB checkcoins VAR_TEMP_2 - compare VAR_TEMP_2, 1000 - goto_if_lt MauvilleCity_GameCorner_EventScript_20FE79 + compare VAR_TEMP_2, DOLL_COINS + goto_if_lt MauvilleCity_GameCorner_EventScript_NotEnoughCoinsForDoll bufferdecorationname 1, DECOR_TREECKO_DOLL checkdecorspace DECOR_TREECKO_DOLL - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_20FE87 - takecoins 1000 + compare VAR_RESULT, FALSE + goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForDoll + takecoins DOLL_COINS givedecoration DECOR_TREECKO_DOLL updatecoinsbox 1, 1 playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_210646, MSGBOX_DEFAULT - goto MauvilleCity_GameCorner_EventScript_20FD20 + msgbox MauvilleCity_GameCorner_Text_SendToYourHomePC, MSGBOX_DEFAULT + goto MauvilleCity_GameCorner_EventScript_ReturnToChooseDollPrize end -MauvilleCity_GameCorner_EventScript_20FE05:: @ 820FE05 +MauvilleCity_GameCorner_EventScript_BuyTorchicDoll:: @ 820FE05 checkcoins VAR_TEMP_2 - compare VAR_TEMP_2, 1000 - goto_if_lt MauvilleCity_GameCorner_EventScript_20FE79 + compare VAR_TEMP_2, DOLL_COINS + goto_if_lt MauvilleCity_GameCorner_EventScript_NotEnoughCoinsForDoll bufferdecorationname 1, DECOR_TORCHIC_DOLL checkdecorspace DECOR_TORCHIC_DOLL - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_20FE87 - takecoins 1000 + compare VAR_RESULT, FALSE + goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForDoll + takecoins DOLL_COINS givedecoration DECOR_TORCHIC_DOLL updatecoinsbox 1, 1 playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_210646, MSGBOX_DEFAULT - goto MauvilleCity_GameCorner_EventScript_20FD20 + msgbox MauvilleCity_GameCorner_Text_SendToYourHomePC, MSGBOX_DEFAULT + goto MauvilleCity_GameCorner_EventScript_ReturnToChooseDollPrize end -MauvilleCity_GameCorner_EventScript_20FE3F:: @ 820FE3F +MauvilleCity_GameCorner_EventScript_BuyMudkipDoll:: @ 820FE3F checkcoins VAR_TEMP_2 - compare VAR_TEMP_2, 1000 - goto_if_lt MauvilleCity_GameCorner_EventScript_20FE79 + compare VAR_TEMP_2, DOLL_COINS + goto_if_lt MauvilleCity_GameCorner_EventScript_NotEnoughCoinsForDoll bufferdecorationname 1, DECOR_MUDKIP_DOLL checkdecorspace DECOR_MUDKIP_DOLL - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_20FE87 - takecoins 1000 + compare VAR_RESULT, FALSE + goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForDoll + takecoins DOLL_COINS givedecoration DECOR_MUDKIP_DOLL updatecoinsbox 1, 1 playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_210646, MSGBOX_DEFAULT - goto MauvilleCity_GameCorner_EventScript_20FD20 + msgbox MauvilleCity_GameCorner_Text_SendToYourHomePC, MSGBOX_DEFAULT + goto MauvilleCity_GameCorner_EventScript_ReturnToChooseDollPrize end -MauvilleCity_GameCorner_EventScript_20FE79:: @ 820FE79 - msgbox MauvilleCity_GameCorner_Text_210673, MSGBOX_DEFAULT - goto MauvilleCity_GameCorner_EventScript_20FD20 +MauvilleCity_GameCorner_EventScript_NotEnoughCoinsForDoll:: @ 820FE79 + msgbox MauvilleCity_GameCorner_Text_NotEnoughCoins, MSGBOX_DEFAULT + goto MauvilleCity_GameCorner_EventScript_ReturnToChooseDollPrize end -MauvilleCity_GameCorner_EventScript_20FE87:: @ 820FE87 +MauvilleCity_GameCorner_EventScript_NoRoomForDoll:: @ 820FE87 call Common_EventScript_NoRoomForDecor - goto MauvilleCity_GameCorner_EventScript_20FD20 + goto MauvilleCity_GameCorner_EventScript_ReturnToChooseDollPrize end -MauvilleCity_GameCorner_EventScript_20FE92:: @ 820FE92 - msgbox MauvilleCity_GameCorner_Text_2106BF, MSGBOX_DEFAULT +MauvilleCity_GameCorner_EventScript_CancelDollSelect:: @ 820FE92 + msgbox MauvilleCity_GameCorner_Text_OhIsThatSo, MSGBOX_DEFAULT hidecoinsbox 0, 0 release end -MauvilleCity_GameCorner_EventScript_20FE9F:: @ 820FE9F +MauvilleCity_GameCorner_EventScript_PrizeCornerTMs:: @ 820FE9F lock faceplayer - msgbox MauvilleCity_GameCorner_Text_2105D7, MSGBOX_DEFAULT + msgbox MauvilleCity_GameCorner_Text_ExchangeCoinsForPrizes, MSGBOX_DEFAULT checkitem ITEM_COIN_CASE, 1 - compare VAR_RESULT, 1 - goto_if_eq MauvilleCity_GameCorner_EventScript_20FEBB + compare VAR_RESULT, TRUE + goto_if_eq MauvilleCity_GameCorner_EventScript_ChooseTMPrizeMessage release end -MauvilleCity_GameCorner_EventScript_20FEBB:: @ 820FEBB - message MauvilleCity_GameCorner_Text_21060D +MauvilleCity_GameCorner_EventScript_ChooseTMPrizeMessage:: @ 820FEBB + message MauvilleCity_GameCorner_Text_WhichPrize waitmessage setvar VAR_TEMP_1, 0 showcoinsbox 1, 1 - goto MauvilleCity_GameCorner_EventScript_20FED9 + goto MauvilleCity_GameCorner_EventScript_ChooseTMPrize -MauvilleCity_GameCorner_EventScript_20FECE:: @ 820FECE - message MauvilleCity_GameCorner_Text_21060D +MauvilleCity_GameCorner_EventScript_ReturnToChooseTMPrize:: @ 820FECE + message MauvilleCity_GameCorner_Text_WhichPrize waitmessage - goto MauvilleCity_GameCorner_EventScript_20FED9 + goto MauvilleCity_GameCorner_EventScript_ChooseTMPrize -MauvilleCity_GameCorner_EventScript_20FED9:: @ 820FED9 +MauvilleCity_GameCorner_EventScript_ChooseTMPrize:: @ 820FED9 multichoice 12, 0, MULTI_GAME_CORNER_TMS, 0 switch VAR_RESULT - case 0, MauvilleCity_GameCorner_EventScript_20FF2B - case 1, MauvilleCity_GameCorner_EventScript_20FF3E - case 2, MauvilleCity_GameCorner_EventScript_20FF51 - case 3, MauvilleCity_GameCorner_EventScript_20FF64 - case 4, MauvilleCity_GameCorner_EventScript_20FF77 - case 5, MauvilleCity_GameCorner_EventScript_210118 - goto MauvilleCity_GameCorner_EventScript_210118 + case 0, MauvilleCity_GameCorner_EventScript_TM32 + case 1, MauvilleCity_GameCorner_EventScript_TM29 + case 2, MauvilleCity_GameCorner_EventScript_TM35 + case 3, MauvilleCity_GameCorner_EventScript_TM24 + case 4, MauvilleCity_GameCorner_EventScript_TM13 + case 5, MauvilleCity_GameCorner_EventScript_CancelTMSelect + goto MauvilleCity_GameCorner_EventScript_CancelTMSelect end -MauvilleCity_GameCorner_EventScript_20FF2B:: @ 820FF2B +MauvilleCity_GameCorner_EventScript_TM32:: @ 820FF2B setvar VAR_TEMP_1, 1 bufferitemname 0, ITEM_TM32 - setvar VAR_0x8004, 320 - goto MauvilleCity_GameCorner_EventScript_20FF8A + setvar VAR_0x8004, ITEM_TM32 + goto MauvilleCity_GameCorner_EventScript_ConfirmTMPrize -MauvilleCity_GameCorner_EventScript_20FF3E:: @ 820FF3E +MauvilleCity_GameCorner_EventScript_TM29:: @ 820FF3E setvar VAR_TEMP_1, 2 bufferitemname 0, ITEM_TM29 - setvar VAR_0x8004, 317 - goto MauvilleCity_GameCorner_EventScript_20FF8A + setvar VAR_0x8004, ITEM_TM29 + goto MauvilleCity_GameCorner_EventScript_ConfirmTMPrize -MauvilleCity_GameCorner_EventScript_20FF51:: @ 820FF51 +MauvilleCity_GameCorner_EventScript_TM35:: @ 820FF51 setvar VAR_TEMP_1, 3 bufferitemname 0, ITEM_TM35 - setvar VAR_0x8004, 323 - goto MauvilleCity_GameCorner_EventScript_20FF8A + setvar VAR_0x8004, ITEM_TM35 + goto MauvilleCity_GameCorner_EventScript_ConfirmTMPrize -MauvilleCity_GameCorner_EventScript_20FF64:: @ 820FF64 +MauvilleCity_GameCorner_EventScript_TM24:: @ 820FF64 setvar VAR_TEMP_1, 4 bufferitemname 0, ITEM_TM24 - setvar VAR_0x8004, 312 - goto MauvilleCity_GameCorner_EventScript_20FF8A + setvar VAR_0x8004, ITEM_TM24 + goto MauvilleCity_GameCorner_EventScript_ConfirmTMPrize -MauvilleCity_GameCorner_EventScript_20FF77:: @ 820FF77 +MauvilleCity_GameCorner_EventScript_TM13:: @ 820FF77 setvar VAR_TEMP_1, 5 bufferitemname 0, ITEM_TM13 - setvar VAR_0x8004, 301 - goto MauvilleCity_GameCorner_EventScript_20FF8A + setvar VAR_0x8004, ITEM_TM13 + goto MauvilleCity_GameCorner_EventScript_ConfirmTMPrize -MauvilleCity_GameCorner_EventScript_20FF8A:: @ 820FF8A +MauvilleCity_GameCorner_EventScript_ConfirmTMPrize:: @ 820FF8A special BufferTMHMMoveName - msgbox MauvilleCity_GameCorner_Text_210629, MSGBOX_YESNO + msgbox MauvilleCity_GameCorner_Text_SoYourChoiceIsTheTMX, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq MauvilleCity_GameCorner_EventScript_210118 + goto_if_eq MauvilleCity_GameCorner_EventScript_CancelTMSelect switch VAR_TEMP_1 - case 1, MauvilleCity_GameCorner_EventScript_20FFDD - case 2, MauvilleCity_GameCorner_EventScript_210017 - case 3, MauvilleCity_GameCorner_EventScript_210051 - case 4, MauvilleCity_GameCorner_EventScript_21008B - case 5, MauvilleCity_GameCorner_EventScript_2100C5 + case 1, MauvilleCity_GameCorner_EventScript_BuyTM32 + case 2, MauvilleCity_GameCorner_EventScript_BuyTM29 + case 3, MauvilleCity_GameCorner_EventScript_BuyTM35 + case 4, MauvilleCity_GameCorner_EventScript_BuyTM24 + case 5, MauvilleCity_GameCorner_EventScript_BuyTM13 end -MauvilleCity_GameCorner_EventScript_20FFDD:: @ 820FFDD +MauvilleCity_GameCorner_EventScript_BuyTM32:: @ 820FFDD checkcoins VAR_TEMP_2 - compare VAR_TEMP_2, 1500 - goto_if_lt MauvilleCity_GameCorner_EventScript_2100FF + compare VAR_TEMP_2, TM32_COINS + goto_if_lt MauvilleCity_GameCorner_EventScript_NotEnoughCoinsForTM checkitemspace ITEM_TM32, 1 - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_21010D - takecoins 1500 + compare VAR_RESULT, FALSE + goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForTM + takecoins TM32_COINS giveitem ITEM_TM32, 1 updatecoinsbox 1, 1 playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_21071B, MSGBOX_DEFAULT - goto MauvilleCity_GameCorner_EventScript_20FECE + msgbox MauvilleCity_GameCorner_Text_HereYouGo, MSGBOX_DEFAULT + goto MauvilleCity_GameCorner_EventScript_ReturnToChooseTMPrize end -MauvilleCity_GameCorner_EventScript_210017:: @ 8210017 +MauvilleCity_GameCorner_EventScript_BuyTM29:: @ 8210017 checkcoins VAR_TEMP_2 - compare VAR_TEMP_2, 3500 - goto_if_lt MauvilleCity_GameCorner_EventScript_2100FF + compare VAR_TEMP_2, TM29_COINS + goto_if_lt MauvilleCity_GameCorner_EventScript_NotEnoughCoinsForTM checkitemspace ITEM_TM29, 1 - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_21010D - takecoins 3500 + compare VAR_RESULT, FALSE + goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForTM + takecoins TM29_COINS giveitem ITEM_TM29, 1 updatecoinsbox 1, 1 playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_21071B, MSGBOX_DEFAULT - goto MauvilleCity_GameCorner_EventScript_20FECE + msgbox MauvilleCity_GameCorner_Text_HereYouGo, MSGBOX_DEFAULT + goto MauvilleCity_GameCorner_EventScript_ReturnToChooseTMPrize end -MauvilleCity_GameCorner_EventScript_210051:: @ 8210051 +MauvilleCity_GameCorner_EventScript_BuyTM35:: @ 8210051 checkcoins VAR_TEMP_2 - compare VAR_TEMP_2, 4000 - goto_if_lt MauvilleCity_GameCorner_EventScript_2100FF + compare VAR_TEMP_2, TM35_COINS + goto_if_lt MauvilleCity_GameCorner_EventScript_NotEnoughCoinsForTM checkitemspace ITEM_TM35, 1 - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_21010D - takecoins 4000 + compare VAR_RESULT, FALSE + goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForTM + takecoins TM35_COINS giveitem ITEM_TM35, 1 updatecoinsbox 1, 1 playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_21071B, MSGBOX_DEFAULT - goto MauvilleCity_GameCorner_EventScript_20FECE + msgbox MauvilleCity_GameCorner_Text_HereYouGo, MSGBOX_DEFAULT + goto MauvilleCity_GameCorner_EventScript_ReturnToChooseTMPrize end -MauvilleCity_GameCorner_EventScript_21008B:: @ 821008B +MauvilleCity_GameCorner_EventScript_BuyTM24:: @ 821008B checkcoins VAR_TEMP_2 - compare VAR_TEMP_2, 4000 - goto_if_lt MauvilleCity_GameCorner_EventScript_2100FF + compare VAR_TEMP_2, TM24_COINS + goto_if_lt MauvilleCity_GameCorner_EventScript_NotEnoughCoinsForTM checkitemspace ITEM_TM24, 1 - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_21010D - takecoins 4000 + compare VAR_RESULT, FALSE + goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForTM + takecoins TM24_COINS giveitem ITEM_TM24, 1 updatecoinsbox 1, 1 playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_21071B, MSGBOX_DEFAULT - goto MauvilleCity_GameCorner_EventScript_20FECE + msgbox MauvilleCity_GameCorner_Text_HereYouGo, MSGBOX_DEFAULT + goto MauvilleCity_GameCorner_EventScript_ReturnToChooseTMPrize end -MauvilleCity_GameCorner_EventScript_2100C5:: @ 82100C5 +MauvilleCity_GameCorner_EventScript_BuyTM13:: @ 82100C5 checkcoins VAR_TEMP_2 - compare VAR_TEMP_2, 4000 - goto_if_lt MauvilleCity_GameCorner_EventScript_2100FF + compare VAR_TEMP_2, TM13_COINS + goto_if_lt MauvilleCity_GameCorner_EventScript_NotEnoughCoinsForTM checkitemspace ITEM_TM13, 1 - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_21010D - takecoins 4000 + compare VAR_RESULT, FALSE + goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForTM + takecoins TM13_COINS giveitem ITEM_TM13, 1 updatecoinsbox 1, 1 playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_21071B, MSGBOX_DEFAULT - goto MauvilleCity_GameCorner_EventScript_20FECE + msgbox MauvilleCity_GameCorner_Text_HereYouGo, MSGBOX_DEFAULT + goto MauvilleCity_GameCorner_EventScript_ReturnToChooseTMPrize end -MauvilleCity_GameCorner_EventScript_2100FF:: @ 82100FF - msgbox MauvilleCity_GameCorner_Text_210673, MSGBOX_DEFAULT - goto MauvilleCity_GameCorner_EventScript_20FECE +MauvilleCity_GameCorner_EventScript_NotEnoughCoinsForTM:: @ 82100FF + msgbox MauvilleCity_GameCorner_Text_NotEnoughCoins, MSGBOX_DEFAULT + goto MauvilleCity_GameCorner_EventScript_ReturnToChooseTMPrize end -MauvilleCity_GameCorner_EventScript_21010D:: @ 821010D +MauvilleCity_GameCorner_EventScript_NoRoomForTM:: @ 821010D call Common_EventScript_BagIsFull - goto MauvilleCity_GameCorner_EventScript_20FECE + goto MauvilleCity_GameCorner_EventScript_ReturnToChooseTMPrize end -MauvilleCity_GameCorner_EventScript_210118:: @ 8210118 - msgbox MauvilleCity_GameCorner_Text_2106BF, MSGBOX_DEFAULT +MauvilleCity_GameCorner_EventScript_CancelTMSelect:: @ 8210118 + msgbox MauvilleCity_GameCorner_Text_OhIsThatSo, MSGBOX_DEFAULT hidecoinsbox 0, 0 release end -MauvilleCity_GameCorner_EventScript_210125:: @ 8210125 - msgbox MauvilleCity_GameCorner_Text_2109D3, MSGBOX_NPC +MauvilleCity_GameCorner_EventScript_Woman2:: @ 8210125 + msgbox MauvilleCity_GameCorner_Text_CoinsAreNeededToPlay, MSGBOX_NPC end -MauvilleCity_GameCorner_EventScript_21012E:: @ 821012E - msgbox MauvilleCity_GameCorner_Text_210A05, MSGBOX_NPC +MauvilleCity_GameCorner_EventScript_Gentleman:: @ 821012E + msgbox MauvilleCity_GameCorner_Text_RouletteOnlyLuck, MSGBOX_NPC end -MauvilleCity_GameCorner_EventScript_210137:: @ 8210137 +MauvilleCity_GameCorner_EventScript_Girl:: @ 8210137 lock faceplayer - goto_if_set FLAG_RECEIVED_STARTER_DOLL, MauvilleCity_GameCorner_EventScript_210213 - msgbox MauvilleCity_GameCorner_Text_210750, MSGBOX_YESNO + goto_if_set FLAG_RECEIVED_STARTER_DOLL, MauvilleCity_GameCorner_EventScript_ReceivedStarterDoll + msgbox MauvilleCity_GameCorner_Text_GotTwoOfSameDollWantOne, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq MauvilleCity_GameCorner_EventScript_210209 + goto_if_eq MauvilleCity_GameCorner_EventScript_DeclineStarterDoll switch VAR_STARTER_MON - case 0, MauvilleCity_GameCorner_EventScript_21017C - case 1, MauvilleCity_GameCorner_EventScript_2101A6 - case 2, MauvilleCity_GameCorner_EventScript_2101D0 + case 0, MauvilleCity_GameCorner_EventScript_GiveTreeckoDoll + case 1, MauvilleCity_GameCorner_EventScript_GiveTorchicDoll + case 2, MauvilleCity_GameCorner_EventScript_GiveMudkipDoll end -MauvilleCity_GameCorner_EventScript_21017C:: @ 821017C +MauvilleCity_GameCorner_EventScript_GiveTreeckoDoll:: @ 821017C bufferdecorationname 1, DECOR_TREECKO_DOLL checkdecorspace DECOR_TREECKO_DOLL - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_2101FA - msgbox MauvilleCity_GameCorner_Text_21079C, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForStarterDoll + msgbox MauvilleCity_GameCorner_Text_HereYouGo2, MSGBOX_DEFAULT givedecoration_std DECOR_TREECKO_DOLL setflag FLAG_RECEIVED_STARTER_DOLL - goto MauvilleCity_GameCorner_EventScript_210213 + goto MauvilleCity_GameCorner_EventScript_ReceivedStarterDoll end -MauvilleCity_GameCorner_EventScript_2101A6:: @ 82101A6 +MauvilleCity_GameCorner_EventScript_GiveTorchicDoll:: @ 82101A6 bufferdecorationname 1, DECOR_TORCHIC_DOLL checkdecorspace DECOR_TORCHIC_DOLL - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_2101FA - msgbox MauvilleCity_GameCorner_Text_21079C, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForStarterDoll + msgbox MauvilleCity_GameCorner_Text_HereYouGo2, MSGBOX_DEFAULT givedecoration_std DECOR_TORCHIC_DOLL setflag FLAG_RECEIVED_STARTER_DOLL - goto MauvilleCity_GameCorner_EventScript_210213 + goto MauvilleCity_GameCorner_EventScript_ReceivedStarterDoll end -MauvilleCity_GameCorner_EventScript_2101D0:: @ 82101D0 +MauvilleCity_GameCorner_EventScript_GiveMudkipDoll:: @ 82101D0 bufferdecorationname 1, DECOR_MUDKIP_DOLL checkdecorspace DECOR_MUDKIP_DOLL - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_2101FA - msgbox MauvilleCity_GameCorner_Text_21079C, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForStarterDoll + msgbox MauvilleCity_GameCorner_Text_HereYouGo2, MSGBOX_DEFAULT givedecoration_std DECOR_MUDKIP_DOLL setflag FLAG_RECEIVED_STARTER_DOLL - goto MauvilleCity_GameCorner_EventScript_210213 + goto MauvilleCity_GameCorner_EventScript_ReceivedStarterDoll end -MauvilleCity_GameCorner_EventScript_2101FA:: @ 82101FA +MauvilleCity_GameCorner_EventScript_NoRoomForStarterDoll:: @ 82101FA call Common_EventScript_NoRoomForDecor - msgbox MauvilleCity_GameCorner_Text_2107A9, MSGBOX_DEFAULT + msgbox MauvilleCity_GameCorner_Text_YouWantItButNotNow, MSGBOX_DEFAULT release end -MauvilleCity_GameCorner_EventScript_210209:: @ 8210209 - msgbox MauvilleCity_GameCorner_Text_2107CE, MSGBOX_DEFAULT +MauvilleCity_GameCorner_EventScript_DeclineStarterDoll:: @ 8210209 + msgbox MauvilleCity_GameCorner_Text_DontBeNegative, MSGBOX_DEFAULT release end -MauvilleCity_GameCorner_EventScript_210213:: @ 8210213 - msgbox MauvilleCity_GameCorner_Text_2107FB, MSGBOX_DEFAULT +MauvilleCity_GameCorner_EventScript_ReceivedStarterDoll:: @ 8210213 + msgbox MauvilleCity_GameCorner_Text_CantWinJackpot, MSGBOX_DEFAULT release end -MauvilleCity_GameCorner_EventScript_21021D:: @ 821021D +MauvilleCity_GameCorner_EventScript_PokefanM:: @ 821021D lock faceplayer checkitem ITEM_COIN_CASE, 1 - compare VAR_RESULT, 1 - goto_if_eq MauvilleCity_GameCorner_EventScript_21023D - msgbox MauvilleCity_GameCorner_Text_210830, MSGBOX_DEFAULT - goto MauvilleCity_GameCorner_EventScript_2102A9 + compare VAR_RESULT, TRUE + goto_if_eq MauvilleCity_GameCorner_EventScript_TryGive20Coins + msgbox MauvilleCity_GameCorner_Text_NeedCoinCaseGoNextDoor, MSGBOX_DEFAULT + goto MauvilleCity_GameCorner_EventScript_NPCReturnToSlots end -MauvilleCity_GameCorner_EventScript_21023D:: @ 821023D - goto_if_set FLAG_RECEIVED_20_COINS, MauvilleCity_GameCorner_EventScript_21026B +MauvilleCity_GameCorner_EventScript_TryGive20Coins:: @ 821023D + goto_if_set FLAG_RECEIVED_20_COINS, MauvilleCity_GameCorner_EventScript_PokefanMNormal checkcoins VAR_TEMP_1 - compare VAR_TEMP_1, 1 - goto_if_ge MauvilleCity_GameCorner_EventScript_21026B + compare VAR_TEMP_1, 1 @ Only give 20 coins if player has no coins + goto_if_ge MauvilleCity_GameCorner_EventScript_PokefanMNormal setflag FLAG_RECEIVED_20_COINS givecoins 20 - msgbox MauvilleCity_GameCorner_Text_2108A0, MSGBOX_DEFAULT + msgbox MauvilleCity_GameCorner_Text_LuckOnlyLastSoLongTakeCoins, MSGBOX_DEFAULT playse SE_REGI - goto MauvilleCity_GameCorner_EventScript_21026B + goto MauvilleCity_GameCorner_EventScript_PokefanMNormal end -MauvilleCity_GameCorner_EventScript_21026B:: @ 821026B - msgbox MauvilleCity_GameCorner_Text_2108EF, MSGBOX_DEFAULT - goto MauvilleCity_GameCorner_EventScript_2102A9 +MauvilleCity_GameCorner_EventScript_PokefanMNormal:: @ 821026B + msgbox MauvilleCity_GameCorner_Text_MauvilleSomethingForEveryone, MSGBOX_DEFAULT + goto MauvilleCity_GameCorner_EventScript_NPCReturnToSlots end -MauvilleCity_GameCorner_EventScript_210279:: @ 8210279 +MauvilleCity_GameCorner_EventScript_OldMan:: @ 8210279 lock faceplayer - msgbox MauvilleCity_GameCorner_Text_210932, MSGBOX_DEFAULT - goto MauvilleCity_GameCorner_EventScript_2102A9 + msgbox MauvilleCity_GameCorner_Text_RouletteTablesDifferentRates, MSGBOX_DEFAULT + goto MauvilleCity_GameCorner_EventScript_NPCReturnToSlots end -MauvilleCity_GameCorner_EventScript_210289:: @ 8210289 +MauvilleCity_GameCorner_EventScript_Cook:: @ 8210289 lock faceplayer - msgbox MauvilleCity_GameCorner_Text_21098E, MSGBOX_DEFAULT - goto MauvilleCity_GameCorner_EventScript_2102A9 + msgbox MauvilleCity_GameCorner_Text_EasyToLoseTrackOfTime, MSGBOX_DEFAULT + goto MauvilleCity_GameCorner_EventScript_NPCReturnToSlots end -MauvilleCity_GameCorner_EventScript_210299:: @ 8210299 +MauvilleCity_GameCorner_EventScript_Man:: @ 8210299 lock faceplayer - msgbox MauvilleCity_GameCorner_Text_210A51, MSGBOX_DEFAULT - goto MauvilleCity_GameCorner_EventScript_2102A9 + msgbox MauvilleCity_GameCorner_Text_UpTo3CoinsCanBeUsed, MSGBOX_DEFAULT + goto MauvilleCity_GameCorner_EventScript_NPCReturnToSlots end -MauvilleCity_GameCorner_EventScript_2102A9:: @ 82102A9 +MauvilleCity_GameCorner_EventScript_NPCReturnToSlots:: @ 82102A9 closemessage applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end -MauvilleCity_GameCorner_EventScript_2102B6:: @ 82102B6 +MauvilleCity_GameCorner_EventScript_Maniac:: @ 82102B6 lock faceplayer - msgbox MauvilleCity_GameCorner_Text_210A82, MSGBOX_DEFAULT - goto MauvilleCity_GameCorner_EventScript_2102A9 + msgbox MauvilleCity_GameCorner_Text_DifficultToStopOn7, MSGBOX_DEFAULT + goto MauvilleCity_GameCorner_EventScript_NPCReturnToSlots end -MauvilleCity_GameCorner_EventScript_2102C6:: @ 82102C6 +MauvilleCity_GameCorner_EventScript_Woman:: @ 82102C6 lock faceplayer - msgbox MauvilleCity_GameCorner_Text_210B04, MSGBOX_DEFAULT - goto MauvilleCity_GameCorner_EventScript_2102A9 + msgbox MauvilleCity_GameCorner_Text_HeresSomeSlotsInfo, MSGBOX_DEFAULT + goto MauvilleCity_GameCorner_EventScript_NPCReturnToSlots end -MauvilleCity_GameCorner_EventScript_2102D6:: @ 82102D6 +MauvilleCity_GameCorner_EventScript_SlotMachine0:: @ 82102D6 lockall checkitem ITEM_COIN_CASE, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 0 specialvar VAR_RESULT, GetSlotMachineId @@ -541,10 +553,10 @@ MauvilleCity_GameCorner_EventScript_2102D6:: @ 82102D6 releaseall end -MauvilleCity_GameCorner_EventScript_2102F6:: @ 82102F6 +MauvilleCity_GameCorner_EventScript_SlotMachine1:: @ 82102F6 lockall checkitem ITEM_COIN_CASE, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 1 specialvar VAR_RESULT, GetSlotMachineId @@ -552,10 +564,10 @@ MauvilleCity_GameCorner_EventScript_2102F6:: @ 82102F6 releaseall end -MauvilleCity_GameCorner_EventScript_210316:: @ 8210316 +MauvilleCity_GameCorner_EventScript_SlotMachine2:: @ 8210316 lockall checkitem ITEM_COIN_CASE, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 2 specialvar VAR_RESULT, GetSlotMachineId @@ -563,10 +575,10 @@ MauvilleCity_GameCorner_EventScript_210316:: @ 8210316 releaseall end -MauvilleCity_GameCorner_EventScript_210336:: @ 8210336 +MauvilleCity_GameCorner_EventScript_SlotMachine3:: @ 8210336 lockall checkitem ITEM_COIN_CASE, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 3 specialvar VAR_RESULT, GetSlotMachineId @@ -574,10 +586,10 @@ MauvilleCity_GameCorner_EventScript_210336:: @ 8210336 releaseall end -MauvilleCity_GameCorner_EventScript_210356:: @ 8210356 +MauvilleCity_GameCorner_EventScript_SlotMachine4:: @ 8210356 lockall checkitem ITEM_COIN_CASE, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 4 specialvar VAR_RESULT, GetSlotMachineId @@ -585,10 +597,10 @@ MauvilleCity_GameCorner_EventScript_210356:: @ 8210356 releaseall end -MauvilleCity_GameCorner_EventScript_210376:: @ 8210376 +MauvilleCity_GameCorner_EventScript_SlotMachine5:: @ 8210376 lockall checkitem ITEM_COIN_CASE, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 5 specialvar VAR_RESULT, GetSlotMachineId @@ -596,10 +608,10 @@ MauvilleCity_GameCorner_EventScript_210376:: @ 8210376 releaseall end -MauvilleCity_GameCorner_EventScript_210396:: @ 8210396 +MauvilleCity_GameCorner_EventScript_SlotMachine6:: @ 8210396 lockall checkitem ITEM_COIN_CASE, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 6 specialvar VAR_RESULT, GetSlotMachineId @@ -607,10 +619,10 @@ MauvilleCity_GameCorner_EventScript_210396:: @ 8210396 releaseall end -MauvilleCity_GameCorner_EventScript_2103B6:: @ 82103B6 +MauvilleCity_GameCorner_EventScript_SlotMachine7:: @ 82103B6 lockall checkitem ITEM_COIN_CASE, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 7 specialvar VAR_RESULT, GetSlotMachineId @@ -618,10 +630,10 @@ MauvilleCity_GameCorner_EventScript_2103B6:: @ 82103B6 releaseall end -MauvilleCity_GameCorner_EventScript_2103D6:: @ 82103D6 +MauvilleCity_GameCorner_EventScript_SlotMachine8:: @ 82103D6 lockall checkitem ITEM_COIN_CASE, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 8 specialvar VAR_RESULT, GetSlotMachineId @@ -629,10 +641,10 @@ MauvilleCity_GameCorner_EventScript_2103D6:: @ 82103D6 releaseall end -MauvilleCity_GameCorner_EventScript_2103F6:: @ 82103F6 +MauvilleCity_GameCorner_EventScript_SlotMachine9:: @ 82103F6 lockall checkitem ITEM_COIN_CASE, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 9 specialvar VAR_RESULT, GetSlotMachineId @@ -640,10 +652,10 @@ MauvilleCity_GameCorner_EventScript_2103F6:: @ 82103F6 releaseall end -MauvilleCity_GameCorner_EventScript_210416:: @ 8210416 +MauvilleCity_GameCorner_EventScript_SlotMachine10:: @ 8210416 lockall checkitem ITEM_COIN_CASE, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 10 specialvar VAR_RESULT, GetSlotMachineId @@ -651,10 +663,10 @@ MauvilleCity_GameCorner_EventScript_210416:: @ 8210416 releaseall end -MauvilleCity_GameCorner_EventScript_210436:: @ 8210436 +MauvilleCity_GameCorner_EventScript_SlotMachine11:: @ 8210436 lockall checkitem ITEM_COIN_CASE, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 11 specialvar VAR_RESULT, GetSlotMachineId @@ -667,139 +679,141 @@ MauvilleCity_GameCorner_EventScript_NoCoinCase:: @ 8210456 releaseall end -MauvilleCity_GameCorner_Text_210460: @ 8210460 +MauvilleCity_GameCorner_Text_ThisIsMauvilleGameCorner: @ 8210460 .string "This is MAUVILLE GAME CORNER.$" -MauvilleCity_GameCorner_Text_21047E: @ 821047E +MauvilleCity_GameCorner_Text_NeedCoinCaseForCoins: @ 821047E .string "Okay, you wanted some COINS for\n" .string "the games?\p" .string "But you don't have a COIN CASE for\n" .string "stowing the COINS.$" -MauvilleCity_GameCorner_Text_2104DF: @ 82104DF +MauvilleCity_GameCorner_Text_WereYouLookingForCoins: @ 82104DF .string "Were you looking for COINS?\p" .string "It's ¥1000 for 50 COINS.\n" .string "Would you like some?$" -MauvilleCity_GameCorner_Text_210529: @ 8210529 +MauvilleCity_GameCorner_Text_ThankYouHereAreYourCoins: @ 8210529 .string "Thank you very much!\n" .string "Here are your COINS!$" -MauvilleCity_GameCorner_Text_210553: @ 8210553 +MauvilleCity_GameCorner_Text_DontHaveEnoughMoney: @ 8210553 .string "Um… You don't appear to have\n" .string "enough money…$" -MauvilleCity_GameCorner_Text_21057E: @ 821057E +MauvilleCity_GameCorner_Text_CoinCaseIsFull: @ 821057E .string "Oh?\n" .string "Your COIN CASE is full.$" -MauvilleCity_GameCorner_Text_21059A: @ 821059A +MauvilleCity_GameCorner_Text_DontNeedCoinsThen: @ 821059A .string "Oh… You don't need COINS, then?\n" .string "Good luck on your adventure!$" -MauvilleCity_GameCorner_Text_2105D7: @ 82105D7 +MauvilleCity_GameCorner_Text_ExchangeCoinsForPrizes: @ 82105D7 .string "Welcome.\p" .string "You can exchange your COINS for\n" .string "prizes here.$" -MauvilleCity_GameCorner_Text_21060D: @ 821060D +MauvilleCity_GameCorner_Text_WhichPrize: @ 821060D .string "Which prize would you like?$" -MauvilleCity_GameCorner_Text_210629: @ 8210629 +MauvilleCity_GameCorner_Text_SoYourChoiceIsTheTMX: @ 8210629 .string "So your choice is\n" .string "the {STR_VAR_1} {STR_VAR_2}?$" -MauvilleCity_GameCorner_Text_210646: @ 8210646 +MauvilleCity_GameCorner_Text_SendToYourHomePC: @ 8210646 .string "Thank you!\n" .string "We'll send it to your PC at home.$" -MauvilleCity_GameCorner_Text_210673: @ 8210673 +MauvilleCity_GameCorner_Text_NotEnoughCoins: @ 8210673 .string "You don't have enough COINS.$" -MauvilleCity_GameCorner_Text_210690: @ 8210690 +@ Unused +MauvilleCity_GameCorner_Text_NoRoomForPlacingDecor: @ 8210690 .string "There isn't any room available for\n" .string "placing {STR_VAR_1}.$" -MauvilleCity_GameCorner_Text_2106BF: @ 82106BF +MauvilleCity_GameCorner_Text_OhIsThatSo: @ 82106BF .string "Oh, is that so? \n" .string "You need to save some COINS before\l" .string "coming back here.$" -MauvilleCity_GameCorner_Text_210705: @ 8210705 +MauvilleCity_GameCorner_Text_SoYourChoiceIsX: @ 8210705 .string "So your choice is {STR_VAR_1}?$" -MauvilleCity_GameCorner_Text_21071B: @ 821071B +MauvilleCity_GameCorner_Text_HereYouGo: @ 821071B .string "Here you go!$" -MauvilleCity_GameCorner_Text_210728: @ 8210728 +@ Unused +MauvilleCity_GameCorner_Text_CantCarryAnyMore: @ 8210728 .string "Oh, you can't carry any more than that.$" -MauvilleCity_GameCorner_Text_210750: @ 8210750 +MauvilleCity_GameCorner_Text_GotTwoOfSameDollWantOne: @ 8210750 .string "I made a mistake and got two of\n" .string "the same DOLLS.\p" .string "Would you like one of them?$" -MauvilleCity_GameCorner_Text_21079C: @ 821079C +MauvilleCity_GameCorner_Text_HereYouGo2: @ 821079C .string "Here you go!$" -MauvilleCity_GameCorner_Text_2107A9: @ 82107A9 +MauvilleCity_GameCorner_Text_YouWantItButNotNow: @ 82107A9 .string "Huh?\n" .string "You want it, but not right now?$" -MauvilleCity_GameCorner_Text_2107CE: @ 82107CE +MauvilleCity_GameCorner_Text_DontBeNegative: @ 82107CE .string "Oh, don't be so negative!\n" .string "You can have this!$" -MauvilleCity_GameCorner_Text_2107FB: @ 82107FB +MauvilleCity_GameCorner_Text_CantWinJackpot: @ 82107FB .string "There's a prize I want, but I can't win\n" .string "the jackpot.$" -MauvilleCity_GameCorner_Text_210830: @ 8210830 +MauvilleCity_GameCorner_Text_NeedCoinCaseGoNextDoor: @ 8210830 .string "Hey, kid, if you want to play here,\n" .string "you need a COIN CASE.\p" .string "I think the young lady next door\n" .string "had one. Go see her!$" -MauvilleCity_GameCorner_Text_2108A0: @ 82108A0 +MauvilleCity_GameCorner_Text_LuckOnlyLastSoLongTakeCoins: @ 82108A0 .string "My luck can only last so long.\n" .string "This is too much for me.\l" .string "Here, take some COINS!$" -MauvilleCity_GameCorner_Text_2108EF: @ 82108EF +MauvilleCity_GameCorner_Text_MauvilleSomethingForEveryone: @ 82108EF .string "MAUVILLE has something for\n" .string "everyone.\p" .string "For me, it's the GAME CORNER.$" -MauvilleCity_GameCorner_Text_210932: @ 8210932 +MauvilleCity_GameCorner_Text_RouletteTablesDifferentRates: @ 8210932 .string "The ROULETTE tables have different\n" .string "rates.\p" .string "Check your COINS if you're going to\n" .string "pick a table.$" -MauvilleCity_GameCorner_Text_21098E: @ 821098E +MauvilleCity_GameCorner_Text_EasyToLoseTrackOfTime: @ 821098E .string "It's easy to lose track of time in here. \n" .string "I should get back to work.$" -MauvilleCity_GameCorner_Text_2109D3: @ 82109D3 +MauvilleCity_GameCorner_Text_CoinsAreNeededToPlay: @ 82109D3 .string "COINS are needed to play here\n" .string "in the GAME CORNER.$" -MauvilleCity_GameCorner_Text_210A05: @ 8210A05 +MauvilleCity_GameCorner_Text_RouletteOnlyLuck: @ 8210A05 .string "This ROULETTE thing…\n" .string "It's rather demanding.\p" .string "Win or lose, it's only by luck.$" -MauvilleCity_GameCorner_Text_210A51: @ 8210A51 +MauvilleCity_GameCorner_Text_UpTo3CoinsCanBeUsed: @ 8210A51 .string "Up to three COINS can be used to play\n" .string "the SLOTS.$" -MauvilleCity_GameCorner_Text_210A82: @ 8210A82 +MauvilleCity_GameCorner_Text_DifficultToStopOn7: @ 8210A82 .string "It's very difficult to make it stop\n" .string "right on “7.”\p" .string "If it stops on “7” during the REEL TIME\n" .string "bonus game, you'll receive extra COINS.$" -MauvilleCity_GameCorner_Text_210B04: @ 8210B04 +MauvilleCity_GameCorner_Text_HeresSomeSlotsInfo: @ 8210B04 .string "Here's some information for you\n" .string "about the SLOTS.\p" .string "The more lightning bolts you stock,\n" diff --git a/data/maps/MauvilleCity_House1/map.json b/data/maps/MauvilleCity_House1/map.json index d7e148b31..9df540885 100644 --- a/data/maps/MauvilleCity_House1/map.json +++ b/data/maps/MauvilleCity_House1/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_House1_EventScript_20F976", + "script": "MauvilleCity_House1_EventScript_RockSmashDude", "flag": "0" } ], diff --git a/data/maps/MauvilleCity_House1/scripts.inc b/data/maps/MauvilleCity_House1/scripts.inc index 50f84d87c..eff01eb94 100644 --- a/data/maps/MauvilleCity_House1/scripts.inc +++ b/data/maps/MauvilleCity_House1/scripts.inc @@ -1,24 +1,24 @@ MauvilleCity_House1_MapScripts:: @ 820F975 .byte 0 -MauvilleCity_House1_EventScript_20F976:: @ 820F976 +MauvilleCity_House1_EventScript_RockSmashDude:: @ 820F976 lock faceplayer - goto_if_set FLAG_RECEIVED_HM06, MauvilleCity_House1_EventScript_20F9A5 - msgbox MauvilleCity_House1_Text_20F9AF, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_HM06, MauvilleCity_House1_EventScript_ReceivedRockSmash + msgbox MauvilleCity_House1_Text_ImRockSmashDudeTakeThis, MSGBOX_DEFAULT giveitem_std ITEM_HM06 setflag FLAG_RECEIVED_HM06 setflag FLAG_HIDE_ROUTE_111_ROCK_SMASH_TIP_GUY - msgbox MauvilleCity_House1_Text_20FAA9, MSGBOX_DEFAULT + msgbox MauvilleCity_House1_Text_ExplainRockSmash, MSGBOX_DEFAULT release end -MauvilleCity_House1_EventScript_20F9A5:: @ 820F9A5 - msgbox MauvilleCity_House1_Text_20FB67, MSGBOX_DEFAULT +MauvilleCity_House1_EventScript_ReceivedRockSmash:: @ 820F9A5 + msgbox MauvilleCity_House1_Text_MonCanFlyOutOfSmashedRock, MSGBOX_DEFAULT release end -MauvilleCity_House1_Text_20F9AF: @ 820F9AF +MauvilleCity_House1_Text_ImRockSmashDudeTakeThis: @ 820F9AF .string "Woohoo!\p" .string "I hear people call me the ROCK SMASH\n" .string "GUY, but I find that sort of degrading.\p" @@ -30,7 +30,7 @@ MauvilleCity_House1_Text_20F9AF: @ 820F9AF .string "I like that!\n" .string "Here, take this HIDDEN MACHINE!$" -MauvilleCity_House1_Text_20FAA9: @ 820FAA9 +MauvilleCity_House1_Text_ExplainRockSmash: @ 820FAA9 .string "That HM contains ROCK SMASH.\p" .string "If you come across large boulders\n" .string "that block your path…\p" @@ -39,7 +39,7 @@ MauvilleCity_House1_Text_20FAA9: @ 820FAA9 .string "Yes, sir! Smash rocks aside, I say!\n" .string "Woohoo!$" -MauvilleCity_House1_Text_20FB67: @ 820FB67 +MauvilleCity_House1_Text_MonCanFlyOutOfSmashedRock: @ 820FB67 .string "Oh, yes, if you smash a rock, a POKéMON\n" .string "could come flying out of hiding.\p" .string "Woohoo!$" diff --git a/data/maps/MauvilleCity_House2/map.json b/data/maps/MauvilleCity_House2/map.json index 272b60f0f..acdb4f504 100644 --- a/data/maps/MauvilleCity_House2/map.json +++ b/data/maps/MauvilleCity_House2/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_House2_EventScript_210C5D", + "script": "MauvilleCity_House2_EventScript_Woman", "flag": "0" } ], diff --git a/data/maps/MauvilleCity_House2/scripts.inc b/data/maps/MauvilleCity_House2/scripts.inc index e0b6a404f..5dbf5d411 100644 --- a/data/maps/MauvilleCity_House2/scripts.inc +++ b/data/maps/MauvilleCity_House2/scripts.inc @@ -1,67 +1,67 @@ MauvilleCity_House2_MapScripts:: @ 8210C5C .byte 0 -MauvilleCity_House2_EventScript_210C5D:: @ 8210C5D +MauvilleCity_House2_EventScript_Woman:: @ 8210C5D lock faceplayer - goto_if_set FLAG_RECEIVED_COIN_CASE, MauvilleCity_House2_EventScript_210CDA - msgbox MauvilleCity_House2_Text_210CEE, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_COIN_CASE, MauvilleCity_House2_EventScript_ReceivedCoinCase + msgbox MauvilleCity_House2_Text_BuyHarborMailAtSlateport, MSGBOX_DEFAULT checkitem ITEM_HARBOR_MAIL, 1 - compare VAR_RESULT, 1 - goto_if_eq MauvilleCity_House2_EventScript_210C82 + compare VAR_RESULT, TRUE + goto_if_eq MauvilleCity_House2_EventScript_AskToTradeForHarborMail release end -MauvilleCity_House2_EventScript_210C82:: @ 8210C82 +MauvilleCity_House2_EventScript_AskToTradeForHarborMail:: @ 8210C82 playse SE_PIN applymovement VAR_LAST_TALKED, Common_Movement_ExclamationMark waitmovement 0 applymovement VAR_LAST_TALKED, Common_Movement_Delay48 waitmovement 0 - msgbox MauvilleCity_House2_Text_210D76, MSGBOX_YESNO + msgbox MauvilleCity_House2_Text_TradeHarborMailForCoinCase, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq MauvilleCity_House2_EventScript_210CB8 + goto_if_eq MauvilleCity_House2_EventScript_AcceptTrade compare VAR_RESULT, NO - goto_if_eq MauvilleCity_House2_EventScript_210CE4 + goto_if_eq MauvilleCity_House2_EventScript_DeclineTrade end -MauvilleCity_House2_EventScript_210CB8:: @ 8210CB8 - msgbox MauvilleCity_House2_Text_210DB3, MSGBOX_DEFAULT +MauvilleCity_House2_EventScript_AcceptTrade:: @ 8210CB8 + msgbox MauvilleCity_House2_Text_IllTradeYouCoinCase, MSGBOX_DEFAULT takeitem ITEM_HARBOR_MAIL, 1 giveitem_std ITEM_COIN_CASE setflag FLAG_RECEIVED_COIN_CASE - goto MauvilleCity_House2_EventScript_210CDA + goto MauvilleCity_House2_EventScript_ReceivedCoinCase end -MauvilleCity_House2_EventScript_210CDA:: @ 8210CDA - msgbox MauvilleCity_House2_Text_210DE7, MSGBOX_DEFAULT +MauvilleCity_House2_EventScript_ReceivedCoinCase:: @ 8210CDA + msgbox MauvilleCity_House2_Text_UseCoinCaseAtGameCorner, MSGBOX_DEFAULT release end -MauvilleCity_House2_EventScript_210CE4:: @ 8210CE4 - msgbox MauvilleCity_House2_Text_210E16, MSGBOX_DEFAULT +MauvilleCity_House2_EventScript_DeclineTrade:: @ 8210CE4 + msgbox MauvilleCity_House2_Text_ThatsDisappointing, MSGBOX_DEFAULT release end -MauvilleCity_House2_Text_210CEE: @ 8210CEE +MauvilleCity_House2_Text_BuyHarborMailAtSlateport: @ 8210CEE .string "If I had a BIKE, it'd be easy to cycle to\n" .string "SLATEPORT for some shopping.\p" .string "I'd be able to buy HARBOR MAIL at the\n" .string "POKéMON MART in SLATEPORT…$" -MauvilleCity_House2_Text_210D76: @ 8210D76 +MauvilleCity_House2_Text_TradeHarborMailForCoinCase: @ 8210D76 .string "Oh! You have HARBOR MAIL?\n" .string "Will you trade it for a COIN CASE?$" -MauvilleCity_House2_Text_210DB3: @ 8210DB3 +MauvilleCity_House2_Text_IllTradeYouCoinCase: @ 8210DB3 .string "Oh, I'm so happy!\n" .string "Okay, I'll trade you a COIN CASE!$" -MauvilleCity_House2_Text_210DE7: @ 8210DE7 +MauvilleCity_House2_Text_UseCoinCaseAtGameCorner: @ 8210DE7 .string "That COIN CASE can be used\n" .string "at the GAME CORNER.$" -MauvilleCity_House2_Text_210E16: @ 8210E16 +MauvilleCity_House2_Text_ThatsDisappointing: @ 8210E16 .string "Oh, that's disappointing.\p" .string "A COIN CASE is needed for the\n" .string "GAME CORNER.$" diff --git a/include/constants/coins.h b/include/constants/coins.h new file mode 100644 index 000000000..fd68f3f9e --- /dev/null +++ b/include/constants/coins.h @@ -0,0 +1,6 @@ +#ifndef GUARD_CONSTANTS_COINS_H +#define GUARD_CONSTANTS_COINS_H + +#define MAX_COINS 9999 + +#endif // GUARD_CONSTANTS_COINS_H \ No newline at end of file diff --git a/src/coins.c b/src/coins.c index b838c303e..1b9656abd 100644 --- a/src/coins.c +++ b/src/coins.c @@ -6,8 +6,7 @@ #include "string_util.h" #include "menu.h" #include "international_string_util.h" - -#define MAX_COINS 9999 +#include "constants/coins.h" EWRAM_DATA u8 sCoinsWindowId = 0; From c132989679709304efaa6e245f48a8d0497c4326 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 7 Nov 2019 10:18:56 -0500 Subject: [PATCH 17/40] Document Mauville scripts --- data/maps/MauvilleCity/map.json | 24 +-- data/maps/MauvilleCity/scripts.inc | 314 ++++++++++++++--------------- include/event_scripts.h | 2 +- src/field_control_avatar.c | 2 +- 4 files changed, 171 insertions(+), 171 deletions(-) diff --git a/data/maps/MauvilleCity/map.json b/data/maps/MauvilleCity/map.json index d5dc8ae99..1708008bd 100644 --- a/data/maps/MauvilleCity/map.json +++ b/data/maps/MauvilleCity/map.json @@ -45,7 +45,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_EventScript_1DF3B3", + "script": "MauvilleCity_EventScript_Boy", "flag": "0" }, { @@ -58,7 +58,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_EventScript_1DF3CE", + "script": "MauvilleCity_EventScript_RichBoy", "flag": "0" }, { @@ -71,7 +71,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_EventScript_1DF3BC", + "script": "MauvilleCity_EventScript_Maniac", "flag": "0" }, { @@ -84,7 +84,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_EventScript_1DF3C5", + "script": "MauvilleCity_EventScript_Woman", "flag": "0" }, { @@ -97,7 +97,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_EventScript_1DF3FB", + "script": "MauvilleCity_EventScript_SchoolKidM", "flag": "0" }, { @@ -110,7 +110,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_EventScript_1DF452", + "script": "MauvilleCity_EventScript_Wally", "flag": "FLAG_HIDE_MAUVILLE_CITY_WALLY" }, { @@ -123,7 +123,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_EventScript_1DF41D", + "script": "MauvilleCity_EventScript_WallysUncle", "flag": "FLAG_HIDE_MAUVILLE_CITY_WALLYS_UNCLE" }, { @@ -136,7 +136,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_EventScript_1DF73A", + "script": "MauvilleCity_EventScript_Wattson", "flag": "FLAG_HIDE_MAUVILLE_CITY_WATTSON" }, { @@ -246,7 +246,7 @@ "y": 6, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MauvilleCity_EventScript_1DF3E0" + "script": "MauvilleCity_EventScript_GymSign" }, { "type": "sign", @@ -278,7 +278,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MauvilleCity_EventScript_1DF3D7" + "script": "MauvilleCity_EventScript_CitySign" }, { "type": "sign", @@ -286,7 +286,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MauvilleCity_EventScript_1DF3E9" + "script": "MauvilleCity_EventScript_BikeShopSign" }, { "type": "sign", @@ -294,7 +294,7 @@ "y": 15, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MauvilleCity_EventScript_1DF3F2" + "script": "MauvilleCity_EventScript_GameCornerSign" } ] } \ No newline at end of file diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc index 7b853d596..3410664a1 100644 --- a/data/maps/MauvilleCity/scripts.inc +++ b/data/maps/MauvilleCity/scripts.inc @@ -9,88 +9,88 @@ MauvilleCity_OnTransition: @ 81DF38B setflag FLAG_SYS_TV_START clearflag FLAG_MAUVILLE_GYM_BARRIERS_STATE setvar VAR_MAUVILLE_GYM_STATE, 0 - call_if_set FLAG_GOT_TM24_FROM_WATTSON, MauvilleCity_EventScript_1DF3A9 + call_if_set FLAG_GOT_TM24_FROM_WATTSON, MauvilleCity_EventScript_MoveWattsonBackToGym end -MauvilleCity_EventScript_1DF3A9:: @ 81DF3A9 +MauvilleCity_EventScript_MoveWattsonBackToGym:: @ 81DF3A9 clearflag FLAG_HIDE_MAUVILLE_GYM_WATTSON setflag FLAG_HIDE_MAUVILLE_CITY_WATTSON setflag FLAG_WATTSON_REMATCH_AVAILABLE return -MauvilleCity_EventScript_1DF3B3:: @ 81DF3B3 - msgbox MauvilleCity_Text_1E0301, MSGBOX_NPC +MauvilleCity_EventScript_Boy:: @ 81DF3B3 + msgbox MauvilleCity_Text_NurseHurtMonBackToHealth, MSGBOX_NPC end -MauvilleCity_EventScript_1DF3BC:: @ 81DF3BC - msgbox MauvilleCity_Text_1E037C, MSGBOX_NPC +MauvilleCity_EventScript_Maniac:: @ 81DF3BC + msgbox MauvilleCity_Text_AllSortsOfPeopleComeThrough, MSGBOX_NPC end -MauvilleCity_EventScript_1DF3C5:: @ 81DF3C5 - msgbox MauvilleCity_Text_1E03FB, MSGBOX_NPC +MauvilleCity_EventScript_Woman:: @ 81DF3C5 + msgbox MauvilleCity_Text_RydelVeryGenerous, MSGBOX_NPC end -MauvilleCity_EventScript_1DF3CE:: @ 81DF3CE - msgbox MauvilleCity_Text_1E044A, MSGBOX_NPC +MauvilleCity_EventScript_RichBoy:: @ 81DF3CE + msgbox MauvilleCity_Text_PokemonCanJumpYouOnBike, MSGBOX_NPC end -MauvilleCity_EventScript_1DF3D7:: @ 81DF3D7 - msgbox MauvilleCity_Text_1E0485, MSGBOX_SIGN +MauvilleCity_EventScript_CitySign:: @ 81DF3D7 + msgbox MauvilleCity_Text_CitySign, MSGBOX_SIGN end -MauvilleCity_EventScript_1DF3E0:: @ 81DF3E0 - msgbox MauvilleCity_Text_1E04B7, MSGBOX_SIGN +MauvilleCity_EventScript_GymSign:: @ 81DF3E0 + msgbox MauvilleCity_Text_GymSign, MSGBOX_SIGN end -MauvilleCity_EventScript_1DF3E9:: @ 81DF3E9 - msgbox MauvilleCity_Text_1E0504, MSGBOX_SIGN +MauvilleCity_EventScript_BikeShopSign:: @ 81DF3E9 + msgbox MauvilleCity_Text_BikeShopSign, MSGBOX_SIGN end -MauvilleCity_EventScript_1DF3F2:: @ 81DF3F2 - msgbox MauvilleCity_Text_1E053C, MSGBOX_SIGN +MauvilleCity_EventScript_GameCornerSign:: @ 81DF3F2 + msgbox MauvilleCity_Text_GameCornerSign, MSGBOX_SIGN end -MauvilleCity_EventScript_1DF3FB:: @ 81DF3FB +MauvilleCity_EventScript_SchoolKidM:: @ 81DF3FB lock faceplayer - goto_if_set FLAG_TV_EXPLAINED, MauvilleCity_EventScript_1DF413 - msgbox MauvilleCity_Text_1E056A, MSGBOX_DEFAULT + goto_if_set FLAG_TV_EXPLAINED, MauvilleCity_EventScript_TVExplained + msgbox MauvilleCity_Text_ExplainTV, MSGBOX_DEFAULT setflag FLAG_TV_EXPLAINED release end -MauvilleCity_EventScript_1DF413:: @ 81DF413 - msgbox MauvilleCity_Text_1E0699, MSGBOX_DEFAULT +MauvilleCity_EventScript_TVExplained:: @ 81DF413 + msgbox MauvilleCity_Text_BeenCheckingOutTV, MSGBOX_DEFAULT release end -MauvilleCity_EventScript_1DF41D:: @ 81DF41D +MauvilleCity_EventScript_WallysUncle:: @ 81DF41D lock faceplayer - goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_1DF43D - msgbox MauvilleCity_Text_1DF7DC, MSGBOX_DEFAULT + goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_UncleAskPlayerToBattleWally + msgbox MauvilleCity_Text_UncleHesTooPeppy, MSGBOX_DEFAULT closemessage applymovement 7, Common_Movement_FaceOriginalDirection waitmovement 0 release end -MauvilleCity_EventScript_1DF43D:: @ 81DF43D - msgbox MauvilleCity_Text_1DFAA5, MSGBOX_DEFAULT +MauvilleCity_EventScript_UncleAskPlayerToBattleWally:: @ 81DF43D + msgbox MauvilleCity_Text_UncleCanYouBattleWally, MSGBOX_DEFAULT closemessage applymovement 7, Common_Movement_FaceOriginalDirection waitmovement 0 release end -MauvilleCity_EventScript_1DF452:: @ 81DF452 +MauvilleCity_EventScript_Wally:: @ 81DF452 lockall - goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_1DF690 + goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_WallyRequestBattleAgain applymovement 6, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - msgbox MauvilleCity_Text_1DF845, MSGBOX_DEFAULT - msgbox MauvilleCity_Text_1DF8B9, MSGBOX_DEFAULT - msgbox MauvilleCity_Text_1DF963, MSGBOX_DEFAULT + msgbox MauvilleCity_Text_WallyWantToChallengeGym, MSGBOX_DEFAULT + msgbox MauvilleCity_Text_UncleYourePushingIt, MSGBOX_DEFAULT + msgbox MauvilleCity_Text_WallyWeCanBeatAnyone, MSGBOX_DEFAULT applymovement 6, Common_Movement_FacePlayer waitmovement 0 playse SE_PIN @@ -98,61 +98,61 @@ MauvilleCity_EventScript_1DF452:: @ 81DF452 waitmovement 0 applymovement 6, Common_Movement_Delay48 waitmovement 0 - msgbox MauvilleCity_Text_1DF9B2, MSGBOX_YESNO - goto MauvilleCity_EventScript_1DF4AD + msgbox MauvilleCity_Text_WallyWillYouBattleMe, MSGBOX_YESNO + goto MauvilleCity_EventScript_BattleWallyPrompt end -MauvilleCity_EventScript_1DF4AD:: @ 81DF4AD +MauvilleCity_EventScript_BattleWallyPrompt:: @ 81DF4AD compare VAR_RESULT, YES - call_if_eq MauvilleCity_EventScript_1DF63A + call_if_eq MauvilleCity_EventScript_BattleWally compare VAR_RESULT, NO - goto_if_eq MauvilleCity_EventScript_1DF683 + goto_if_eq MauvilleCity_EventScript_DeclineWallyBattle closemessage switch VAR_FACING - case DIR_NORTH, MauvilleCity_EventScript_1DF4E0 - case DIR_EAST, MauvilleCity_EventScript_1DF53D + case DIR_NORTH, MauvilleCity_EventScript_WallyAndUncleExitNorth + case DIR_EAST, MauvilleCity_EventScript_WallyAndUncleExitEast end -MauvilleCity_EventScript_1DF4E0:: @ 81DF4E0 - applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6DF - applymovement 6, MauvilleCity_Movement_1DF6A8 - applymovement 7, MauvilleCity_Movement_1DF6E2 +MauvilleCity_EventScript_WallyAndUncleExitNorth:: @ 81DF4E0 + applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_PlayerWatchWallyExitNorth1 + applymovement 6, MauvilleCity_Movement_WallyExitNorth1 + applymovement 7, MauvilleCity_Movement_WallysUncleExitNorth1 waitmovement 0 applymovement 6, Common_Movement_WalkInPlaceFastestRight waitmovement 0 delay 30 - applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6EE - applymovement 7, MauvilleCity_Movement_1DF6F3 + applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_PlayerFaceUncleNorth + applymovement 7, MauvilleCity_Movement_WallysUncleApproachPlayerNorth waitmovement 0 - msgbox MauvilleCity_Text_1DFD34, MSGBOX_DEFAULT + msgbox MauvilleCity_Text_UncleVisitUsSometime, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6CC - applymovement 7, MauvilleCity_Movement_1DF6FA - applymovement 6, MauvilleCity_Movement_1DF6B4 + applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_PlayerWatchWallyExitNorth2 + applymovement 7, MauvilleCity_Movement_WallysUncleExitNorth2 + applymovement 6, MauvilleCity_Movement_WallyExitNorth2 waitmovement 0 - goto MauvilleCity_EventScript_1DF593 + goto MauvilleCity_EventScript_DefeatedWally end -MauvilleCity_EventScript_1DF53D:: @ 81DF53D - applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6DC - applymovement 6, MauvilleCity_Movement_1DF6AE - applymovement 7, MauvilleCity_Movement_1DF6E8 +MauvilleCity_EventScript_WallyAndUncleExitEast:: @ 81DF53D + applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_PlayerWatchWallyExitEast1 + applymovement 6, MauvilleCity_Movement_WallyExitEast1 + applymovement 7, MauvilleCity_Movement_WallysUncleExitEast1 waitmovement 0 applymovement 6, Common_Movement_WalkInPlaceFastestRight waitmovement 0 delay 30 - applymovement 7, MauvilleCity_Movement_1DF6F7 + applymovement 7, MauvilleCity_Movement_WallysUncleApproachPlayerEast waitmovement 0 - msgbox MauvilleCity_Text_1DFD34, MSGBOX_DEFAULT + msgbox MauvilleCity_Text_UncleVisitUsSometime, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6D0 - applymovement 7, MauvilleCity_Movement_1DF703 - applymovement 6, MauvilleCity_Movement_1DF6C0 + applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_PlayerWatchWallyExitEast2 + applymovement 7, MauvilleCity_Movement_WallysUncleExitEast2 + applymovement 6, MauvilleCity_Movement_WallyExitEast2 waitmovement 0 - goto MauvilleCity_EventScript_1DF593 + goto MauvilleCity_EventScript_DefeatedWally end -MauvilleCity_EventScript_1DF593:: @ 81DF593 +MauvilleCity_EventScript_DefeatedWally:: @ 81DF593 removeobject 6 removeobject 7 clearflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY @@ -161,75 +161,75 @@ MauvilleCity_EventScript_1DF593:: @ 81DF593 setvar VAR_WALLY_CALL_STEP_COUNTER, 0 setflag FLAG_ENABLE_FIRST_WALLY_POKENAV_CALL compare VAR_FACING, DIR_NORTH - call_if_eq MauvilleCity_EventScript_1DF5F3 + call_if_eq MauvilleCity_EventScript_ScottApproachPlayerNorth compare VAR_FACING, DIR_EAST - call_if_eq MauvilleCity_EventScript_1DF601 + call_if_eq MauvilleCity_EventScript_ScottApproachPlayerEast applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 - msgbox MauvilleCity_Text_1DFED5, MSGBOX_DEFAULT + msgbox MauvilleCity_Text_ScottYouDidntHoldBack, MSGBOX_DEFAULT closemessage addvar VAR_SCOTT_STATE, 1 compare VAR_FACING, DIR_NORTH - call_if_eq MauvilleCity_EventScript_1DF616 + call_if_eq MauvilleCity_EventScript_ScottExitNorth compare VAR_FACING, DIR_EAST - call_if_eq MauvilleCity_EventScript_1DF628 + call_if_eq MauvilleCity_EventScript_ScottExitEast removeobject 11 releaseall end -MauvilleCity_EventScript_1DF5F3:: @ 81DF5F3 +MauvilleCity_EventScript_ScottApproachPlayerNorth:: @ 81DF5F3 addobject 11 - applymovement 11, MauvilleCity_Movement_1DF70D + applymovement 11, MauvilleCity_Movement_ScottApproachPlayerNorth waitmovement 0 return -MauvilleCity_EventScript_1DF601:: @ 81DF601 +MauvilleCity_EventScript_ScottApproachPlayerEast:: @ 81DF601 setobjectxyperm 11, 12, 13 addobject 11 - applymovement 11, MauvilleCity_Movement_1DF719 + applymovement 11, MauvilleCity_Movement_ScottApproachPlayerEast waitmovement 0 return -MauvilleCity_EventScript_1DF616:: @ 81DF616 - applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6D5 - applymovement 11, MauvilleCity_Movement_1DF725 +MauvilleCity_EventScript_ScottExitNorth:: @ 81DF616 + applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_PlayerWatchScottExitNorth + applymovement 11, MauvilleCity_Movement_ScottExitNorth waitmovement 0 return -MauvilleCity_EventScript_1DF628:: @ 81DF628 - applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6D8 - applymovement 11, MauvilleCity_Movement_1DF72F +MauvilleCity_EventScript_ScottExitEast:: @ 81DF628 + applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_PlayerWatchScottExitEast + applymovement 11, MauvilleCity_Movement_ScottExitEast waitmovement 0 return -MauvilleCity_EventScript_1DF63A:: @ 81DF63A - msgbox MauvilleCity_Text_1DFB6D, MSGBOX_DEFAULT - trainerbattle_no_intro TRAINER_WALLY_2, MauvilleCity_Text_1DFB96 +MauvilleCity_EventScript_BattleWally:: @ 81DF63A + msgbox MauvilleCity_Text_WallyHereICome, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_WALLY_2, MauvilleCity_Text_WallyDefeat applymovement 6, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - msgbox MauvilleCity_Text_1DFBC3, MSGBOX_DEFAULT + msgbox MauvilleCity_Text_WallyIllGoBackToVerdanturf, MSGBOX_DEFAULT applymovement 6, Common_Movement_FacePlayer waitmovement 0 - msgbox MauvilleCity_Text_1DFBED, MSGBOX_DEFAULT + msgbox MauvilleCity_Text_ThankYouNotEnoughToBattle, MSGBOX_DEFAULT applymovement 6, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - msgbox MauvilleCity_Text_1DFC8A, MSGBOX_DEFAULT + msgbox MauvilleCity_Text_UncleNoNeedToBeDown, MSGBOX_DEFAULT return -MauvilleCity_EventScript_1DF683:: @ 81DF683 +MauvilleCity_EventScript_DeclineWallyBattle:: @ 81DF683 setflag FLAG_DECLINED_WALLY_BATTLE_MAUVILLE - msgbox MauvilleCity_Text_1DFA4A, MSGBOX_DEFAULT + msgbox MauvilleCity_Text_WallyMyUncleWontKnowImStrong, MSGBOX_DEFAULT release end -MauvilleCity_EventScript_1DF690:: @ 81DF690 +MauvilleCity_EventScript_WallyRequestBattleAgain:: @ 81DF690 applymovement 6, Common_Movement_FacePlayer waitmovement 0 - msgbox MauvilleCity_Text_1DFB42, MSGBOX_YESNO - goto MauvilleCity_EventScript_1DF4AD + msgbox MauvilleCity_Text_WallyPleaseBattleMe, MSGBOX_YESNO + goto MauvilleCity_EventScript_BattleWallyPrompt end -MauvilleCity_Movement_1DF6A8: @ 81DF6A8 +MauvilleCity_Movement_WallyExitNorth1: @ 81DF6A8 walk_left walk_left walk_down @@ -237,7 +237,7 @@ MauvilleCity_Movement_1DF6A8: @ 81DF6A8 walk_left step_end -MauvilleCity_Movement_1DF6AE: @ 81DF6AE +MauvilleCity_Movement_WallyExitEast1: @ 81DF6AE walk_down walk_down walk_left @@ -245,7 +245,7 @@ MauvilleCity_Movement_1DF6AE: @ 81DF6AE walk_left step_end -MauvilleCity_Movement_1DF6B4: @ 81DF6B4 +MauvilleCity_Movement_WallyExitNorth2: @ 81DF6B4 delay_16 delay_16 walk_left @@ -259,7 +259,7 @@ MauvilleCity_Movement_1DF6B4: @ 81DF6B4 delay_8 step_end -MauvilleCity_Movement_1DF6C0: @ 81DF6C0 +MauvilleCity_Movement_WallyExitEast2: @ 81DF6C0 delay_16 delay_16 walk_left @@ -273,41 +273,41 @@ MauvilleCity_Movement_1DF6C0: @ 81DF6C0 delay_8 step_end -MauvilleCity_Movement_1DF6CC: @ 81DF6CC +MauvilleCity_Movement_PlayerWatchWallyExitNorth2: @ 81DF6CC delay_16 delay_8 walk_in_place_fastest_left step_end -MauvilleCity_Movement_1DF6D0: @ 81DF6D0 +MauvilleCity_Movement_PlayerWatchWallyExitEast2: @ 81DF6D0 delay_16 delay_16 delay_16 walk_in_place_fastest_left step_end -MauvilleCity_Movement_1DF6D5: @ 81DF6D5 +MauvilleCity_Movement_PlayerWatchScottExitNorth: @ 81DF6D5 delay_16 walk_in_place_fastest_left step_end -MauvilleCity_Movement_1DF6D8: @ 81DF6D8 +MauvilleCity_Movement_PlayerWatchScottExitEast: @ 81DF6D8 delay_16 delay_16 walk_in_place_fastest_left step_end -MauvilleCity_Movement_1DF6DC: @ 81DF6DC +MauvilleCity_Movement_PlayerWatchWallyExitEast1: @ 81DF6DC delay_16 walk_in_place_fastest_down step_end -MauvilleCity_Movement_1DF6DF: @ 81DF6DF +MauvilleCity_Movement_PlayerWatchWallyExitNorth1: @ 81DF6DF delay_16 walk_in_place_fastest_left step_end -MauvilleCity_Movement_1DF6E2: @ 81DF6E2 +MauvilleCity_Movement_WallysUncleExitNorth1: @ 81DF6E2 walk_left walk_left walk_left @@ -315,7 +315,7 @@ MauvilleCity_Movement_1DF6E2: @ 81DF6E2 walk_down step_end -MauvilleCity_Movement_1DF6E8: @ 81DF6E8 +MauvilleCity_Movement_WallysUncleExitEast1: @ 81DF6E8 walk_left walk_down walk_down @@ -323,25 +323,25 @@ MauvilleCity_Movement_1DF6E8: @ 81DF6E8 walk_left step_end -MauvilleCity_Movement_1DF6EE: @ 81DF6EE +MauvilleCity_Movement_PlayerFaceUncleNorth: @ 81DF6EE delay_16 delay_8 delay_4 walk_in_place_fastest_down step_end -MauvilleCity_Movement_1DF6F3: @ 81DF6F3 +MauvilleCity_Movement_WallysUncleApproachPlayerNorth: @ 81DF6F3 walk_right walk_right walk_in_place_fastest_up step_end -MauvilleCity_Movement_1DF6F7: @ 81DF6F7 +MauvilleCity_Movement_WallysUncleApproachPlayerEast: @ 81DF6F7 walk_right walk_up step_end -MauvilleCity_Movement_1DF6FA: @ 81DF6FA +MauvilleCity_Movement_WallysUncleExitNorth2: @ 81DF6FA walk_left walk_left walk_left @@ -352,7 +352,7 @@ MauvilleCity_Movement_1DF6FA: @ 81DF6FA walk_left step_end -MauvilleCity_Movement_1DF703: @ 81DF703 +MauvilleCity_Movement_WallysUncleExitEast2: @ 81DF703 walk_down walk_left walk_left @@ -364,7 +364,7 @@ MauvilleCity_Movement_1DF703: @ 81DF703 walk_left step_end -MauvilleCity_Movement_1DF70D: @ 81DF70D +MauvilleCity_Movement_ScottApproachPlayerNorth: @ 81DF70D walk_up walk_up walk_up @@ -378,7 +378,7 @@ MauvilleCity_Movement_1DF70D: @ 81DF70D walk_in_place_fastest_up step_end -MauvilleCity_Movement_1DF719: @ 81DF719 +MauvilleCity_Movement_ScottApproachPlayerEast: @ 81DF719 walk_up walk_up walk_up @@ -392,7 +392,7 @@ MauvilleCity_Movement_1DF719: @ 81DF719 walk_up step_end -MauvilleCity_Movement_1DF725: @ 81DF725 +MauvilleCity_Movement_ScottExitNorth: @ 81DF725 walk_left walk_left walk_left @@ -404,7 +404,7 @@ MauvilleCity_Movement_1DF725: @ 81DF725 walk_left step_end -MauvilleCity_Movement_1DF72F: @ 81DF72F +MauvilleCity_Movement_ScottExitEast: @ 81DF72F walk_down walk_left walk_left @@ -417,47 +417,47 @@ MauvilleCity_Movement_1DF72F: @ 81DF72F walk_left step_end -MauvilleCity_EventScript_1DF73A:: @ 81DF73A +MauvilleCity_EventScript_Wattson:: @ 81DF73A lock faceplayer - goto_if_set FLAG_GOT_TM24_FROM_WATTSON, MauvilleCity_EventScript_1DF7B0 + goto_if_set FLAG_GOT_TM24_FROM_WATTSON, MauvilleCity_EventScript_ReceivedThunderbolt compare VAR_NEW_MAUVILLE_STATE, 2 - goto_if_eq MauvilleCity_EventScript_1DF784 - goto_if_set FLAG_GOT_BASEMENT_KEY_FROM_WATTSON, MauvilleCity_EventScript_1DF77A - msgbox MauvilleCity_Text_1DFFE4, MSGBOX_DEFAULT + goto_if_eq MauvilleCity_EventScript_CompletedNewMauville + goto_if_set FLAG_GOT_BASEMENT_KEY_FROM_WATTSON, MauvilleCity_EventScript_BegunNewMauville + msgbox MauvilleCity_Text_WattsonNeedFavorTakeKey, MSGBOX_DEFAULT giveitem_std ITEM_BASEMENT_KEY setflag FLAG_GOT_BASEMENT_KEY_FROM_WATTSON - msgbox MauvilleCity_Text_1E0154, MSGBOX_DEFAULT + msgbox MauvilleCity_Text_WattsonWontBeChallenge, MSGBOX_DEFAULT release end -MauvilleCity_EventScript_1DF77A:: @ 81DF77A - msgbox MauvilleCity_Text_1E0154, MSGBOX_DEFAULT +MauvilleCity_EventScript_BegunNewMauville:: @ 81DF77A + msgbox MauvilleCity_Text_WattsonWontBeChallenge, MSGBOX_DEFAULT release end -MauvilleCity_EventScript_1DF784:: @ 81DF784 - msgbox MauvilleCity_Text_1E020E, MSGBOX_DEFAULT +MauvilleCity_EventScript_CompletedNewMauville:: @ 81DF784 + msgbox MauvilleCity_Text_WattsonThanksTakeTM, MSGBOX_DEFAULT giveitem_std ITEM_TM24 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_GOT_TM24_FROM_WATTSON - msgbox MauvilleCity_Text_1E02AA, MSGBOX_DEFAULT + msgbox MauvilleCity_Text_WattsonYoungTakeCharge, MSGBOX_DEFAULT release end -MauvilleCity_EventScript_1DF7B0:: @ 81DF7B0 - msgbox MauvilleCity_Text_1E02AA, MSGBOX_DEFAULT +MauvilleCity_EventScript_ReceivedThunderbolt:: @ 81DF7B0 + msgbox MauvilleCity_Text_WattsonYoungTakeCharge, MSGBOX_DEFAULT release end -MauvilleCity_EventScript_1DF7BA:: @ 81DF7BA +MauvilleCity_EventScript_RegisterWallyCall:: @ 81DF7BA lockall - pokenavcall MauvilleCity_Text_1DFDFB + pokenavcall MauvilleCity_Text_WallyPokenavCall waitmessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox MauvilleCity_Text_1DFEB4, MSGBOX_DEFAULT + msgbox MauvilleCity_Text_RegisteredWally, MSGBOX_DEFAULT waitfanfare closemessage delay 30 @@ -466,30 +466,30 @@ MauvilleCity_EventScript_1DF7BA:: @ 81DF7BA releaseall end -MauvilleCity_Text_1DF7DC: @ 81DF7DC +MauvilleCity_Text_UncleHesTooPeppy: @ 81DF7DC .string "UNCLE: It's because of POKéMON that\n" .string "this boy's got more pep, I suppose…\l" .string "But he's become a bit too peppy…$" -MauvilleCity_Text_1DF845: @ 81DF845 +MauvilleCity_Text_WallyWantToChallengeGym: @ 81DF845 .string "WALLY: Aww, UNCLE, please?\p" .string "I want to challenge this GYM and see\n" .string "how much better I've become.\p" .string "Please? May I, please?$" -MauvilleCity_Text_1DF8B9: @ 81DF8B9 +MauvilleCity_Text_UncleYourePushingIt: @ 81DF8B9 .string "UNCLE: Now hold on, WALLY.\p" .string "Since you started living with POKéMON,\n" .string "you have grown quite a lot stronger.\p" .string "But don't you think you're pushing it\n" .string "to suddenly challenge a GYM?$" -MauvilleCity_Text_1DF963: @ 81DF963 +MauvilleCity_Text_WallyWeCanBeatAnyone: @ 81DF963 .string "WALLY: I'm not pushing it.\p" .string "If I combine forces with RALTS,\n" .string "we can beat anyone!$" -MauvilleCity_Text_1DF9B2: @ 81DF9B2 +MauvilleCity_Text_WallyWillYouBattleMe: @ 81DF9B2 .string "WALLY: Oh! Hi, {PLAYER}!\p" .string "I've gotten a lot stronger since\n" .string "we met.\p" @@ -498,43 +498,43 @@ MauvilleCity_Text_1DF9B2: @ 81DF9B2 .string "{PLAYER}, please, will you have\n" .string "a battle with me?$" -MauvilleCity_Text_1DFA4A: @ 81DFA4A +MauvilleCity_Text_WallyMyUncleWontKnowImStrong: @ 81DFA4A .string "WALLY: Oh… If you won't battle me,\n" .string "{PLAYER}, my UNCLE won't know that I've\l" .string "become really strong.$" -MauvilleCity_Text_1DFAA5: @ 81DFAA5 +MauvilleCity_Text_UncleCanYouBattleWally: @ 81DFAA5 .string "UNCLE: {PLAYER}{KUN}, was it?\n" .string "On WALLY's behalf, can I ask you to\l" .string "battle with him just this once?\p" .string "I don't think he's going to listen to\n" .string "any reason the way he is now.$" -MauvilleCity_Text_1DFB42: @ 81DFB42 +MauvilleCity_Text_WallyPleaseBattleMe: @ 81DFB42 .string "WALLY: {PLAYER}, please!\n" .string "Battle with me, please.$" -MauvilleCity_Text_1DFB6D: @ 81DFB6D +MauvilleCity_Text_WallyHereICome: @ 81DFB6D .string "WALLY: {PLAYER}, thank you.\p" .string "Okay… Here I come!$" -MauvilleCity_Text_1DFB96: @ 81DFB96 +MauvilleCity_Text_WallyDefeat: @ 81DFB96 .string "WALLY: … … … … … … …\p" .string "… … … … … … … …\p" .string "I lost…$" -MauvilleCity_Text_1DFBC3: @ 81DFBC3 +MauvilleCity_Text_WallyIllGoBackToVerdanturf: @ 81DFBC3 .string "WALLY: UNCLE…\n" .string "I'll go back to VERDANTURF…$" -MauvilleCity_Text_1DFBED: @ 81DFBED +MauvilleCity_Text_ThankYouNotEnoughToBattle: @ 81DFBED .string "{PLAYER}, thank you.\n" .string "Being a TRAINER is tough, isn't it?\p" .string "It's not enough just to have POKéMON\n" .string "and make them battle. That isn't what\l" .string "being a real TRAINER is about.$" -MauvilleCity_Text_1DFC8A: @ 81DFC8A +MauvilleCity_Text_UncleNoNeedToBeDown: @ 81DFC8A .string "UNCLE: WALLY, there's no need to be so\n" .string "down on yourself.\p" .string "Why, what's keeping you from becoming\n" @@ -542,7 +542,7 @@ MauvilleCity_Text_1DFC8A: @ 81DFC8A .string "Come on, let's go home.\n" .string "Everyone's waiting for you.$" -MauvilleCity_Text_1DFD34: @ 81DFD34 +MauvilleCity_Text_UncleVisitUsSometime: @ 81DFD34 .string "UNCLE: {PLAYER}{KUN}, it just dawned on me\n" .string "that you must be the TRAINER who kept\l" .string "an eye out for WALLY when he caught\l" @@ -552,7 +552,7 @@ MauvilleCity_Text_1DFD34: @ 81DFD34 .string "I'm sure WALLY would enjoy it.$" -MauvilleCity_Text_1DFDFB: @ 81DFDFB +MauvilleCity_Text_WallyPokenavCall: @ 81DFDFB .string "… … … … … …\n" .string "… … … … … Beep!\p" .string "WALLY: Oh, hello, {PLAYER}!\p" @@ -563,11 +563,11 @@ MauvilleCity_Text_1DFDFB: @ 81DFDFB .string "… … … … … …\n" .string "… … … … … Click!$" -MauvilleCity_Text_1DFEB4: @ 81DFEB4 +MauvilleCity_Text_RegisteredWally: @ 81DFEB4 .string "Registered WALLY\n" .string "in the POKéNAV.$" -MauvilleCity_Text_1DFED5: @ 81DFED5 +MauvilleCity_Text_ScottYouDidntHoldBack: @ 81DFED5 .string "SCOTT: Hehe…\n" .string "I was watching that match!\p" .string "You're friends with that boy WALLY,\n" @@ -580,7 +580,7 @@ MauvilleCity_Text_1DFED5: @ 81DFED5 .string "… … … … … …\n" .string "I'll be cheering for you!$" -MauvilleCity_Text_1DFFE4: @ 81DFFE4 +MauvilleCity_Text_WattsonNeedFavorTakeKey: @ 81DFFE4 .string "WATTSON: Oh, {PLAYER}{KUN}!\n" .string "You look like you have a lot of zip!\l" .string "That's a good thing, wahahahaha!\p" @@ -595,7 +595,7 @@ MauvilleCity_Text_1DFFE4: @ 81DFFE4 .string "Here, this is the KEY to get into\n" .string "NEW MAUVILLE.$" -MauvilleCity_Text_1E0154: @ 81E0154 +MauvilleCity_Text_WattsonWontBeChallenge: @ 81E0154 .string "WATTSON: Don't you worry about it.\n" .string "It won't be a challenge to you.\p" .string "The entrance to NEW MAUVILLE is just\n" @@ -603,7 +603,7 @@ MauvilleCity_Text_1E0154: @ 81E0154 .string "That's it, then, you have my trust!\n" .string "Wahahahaha!$" -MauvilleCity_Text_1E020E: @ 81E020E +MauvilleCity_Text_WattsonThanksTakeTM: @ 81E020E .string "WATTSON: Wahahahaha!\p" .string "I knew it, {PLAYER}{KUN}! I knew I'd made\n" .string "the right choice asking you!\p" @@ -611,51 +611,51 @@ MauvilleCity_Text_1E020E: @ 81E020E .string "THUNDERBOLT!\p" .string "Go on, you've earned it!$" -MauvilleCity_Text_1E02AA: @ 81E02AA +MauvilleCity_Text_WattsonYoungTakeCharge: @ 81E02AA .string "WATTSON: Wahahahaha!\p" .string "It pleases me to no end to see\n" .string "the young step up and take charge!$" -MauvilleCity_Text_1E0301: @ 81E0301 +MauvilleCity_Text_NurseHurtMonBackToHealth: @ 81E0301 .string "You know, it's cool to have POKéMON\n" .string "battles and stuff…\p" .string "But if your POKéMON gets hurt,\n" .string "you have to nurse it back to health.$" -MauvilleCity_Text_1E037C: @ 81E037C +MauvilleCity_Text_AllSortsOfPeopleComeThrough: @ 81E037C .string "The roads of this town stretch north\n" .string "and south, and east and west.\p" .string "Because of that, we get all sorts of\n" .string "people coming through.$" -MauvilleCity_Text_1E03FB: @ 81E03FB +MauvilleCity_Text_RydelVeryGenerous: @ 81E03FB .string "Have you been to RYDEL'S CYCLES yet?\p" .string "RYDEL, the owner, is a very generous\n" .string "man.$" -MauvilleCity_Text_1E044A: @ 81E044A +MauvilleCity_Text_PokemonCanJumpYouOnBike: @ 81E044A .string "Even if you're riding a BIKE,\n" .string "wild POKéMON could jump you.$" -MauvilleCity_Text_1E0485: @ 81E0485 +MauvilleCity_Text_CitySign: @ 81E0485 .string "MAUVILLE CITY\n" .string "“The bright and shiny city of fun!”$" -MauvilleCity_Text_1E04B7: @ 81E04B7 +MauvilleCity_Text_GymSign: @ 81E04B7 .string "MAUVILLE CITY POKéMON GYM\n" .string "LEADER: WATTSON\l" .string "“The cheerfully electrifying man!”$" -MauvilleCity_Text_1E0504: @ 81E0504 +MauvilleCity_Text_BikeShopSign: @ 81E0504 .string "“Ride in gravel and shake up your\n" .string "soul!”\l" .string "RYDEL'S CYCLES$" -MauvilleCity_Text_1E053C: @ 81E053C +MauvilleCity_Text_GameCornerSign: @ 81E053C .string "“The play spot for all!”\n" .string "MAUVILLE GAME CORNER$" -MauvilleCity_Text_1E056A: @ 81E056A +MauvilleCity_Text_ExplainTV: @ 81E056A .string "Hi, do you check out TV at all?\p" .string "They've added a bunch of cool new\n" .string "shows recently.\p" @@ -667,5 +667,5 @@ MauvilleCity_Text_1E056A: @ 81E056A .string "That's why I think you should check\n" .string "out TVs whenever you can.$" -MauvilleCity_Text_1E0699: @ 81E0699 +MauvilleCity_Text_BeenCheckingOutTV: @ 81E0699 .string "Hi, have you been checking out TVs?$" diff --git a/include/event_scripts.h b/include/event_scripts.h index b86c46df0..6410907d7 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -552,7 +552,7 @@ extern const u8 EventScript_FieldPoison[]; extern const u8 EventScript_EggHatch[]; extern const u8 UnusualWeather_EventScript_EndEventAndCleanup_1[]; extern const u8 IslandCave_EventScript_OpenRegiEntrance[]; -extern const u8 MauvilleCity_EventScript_1DF7BA[]; +extern const u8 MauvilleCity_EventScript_RegisterWallyCall[]; extern const u8 Route119_EventScript_1F49EC[]; extern const u8 LittlerootTown_ProfessorBirchsLab_EventScript_1FA4D6[]; extern const u8 RustboroCity_Gym_EventScript_RegisterRoxanne[]; diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index bbd2ebda9..0e8b2619f 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -568,7 +568,7 @@ static bool8 TryStartStepCountScript(u16 metatileBehavior) } if (ShouldDoWallyCall() == TRUE) { - ScriptContext1_SetupScript(MauvilleCity_EventScript_1DF7BA); + ScriptContext1_SetupScript(MauvilleCity_EventScript_RegisterWallyCall); return TRUE; } if (ShouldDoWinonaCall() == TRUE) From 0b5c2c2721ed7b996626b54835d2724677bf5b49 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 7 Nov 2019 10:32:21 -0500 Subject: [PATCH 18/40] Document New Mauville scripts --- data/maps/NewMauville_Entrance/map.json | 2 +- data/maps/NewMauville_Entrance/scripts.inc | 30 +++---- data/maps/NewMauville_Inside/map.json | 42 +++++----- data/maps/NewMauville_Inside/scripts.inc | 96 +++++++++++----------- include/constants/metatile_labels.h | 2 +- 5 files changed, 86 insertions(+), 86 deletions(-) diff --git a/data/maps/NewMauville_Entrance/map.json b/data/maps/NewMauville_Entrance/map.json index d36763350..593e23a62 100644 --- a/data/maps/NewMauville_Entrance/map.json +++ b/data/maps/NewMauville_Entrance/map.json @@ -38,7 +38,7 @@ "elevation": 3, "var": "VAR_NEW_MAUVILLE_STATE", "var_value": "0", - "script": "NewMauville_Entrance_EventScript_2372FF" + "script": "NewMauville_Entrance_EventScript_Door" } ], "bg_events": [] diff --git a/data/maps/NewMauville_Entrance/scripts.inc b/data/maps/NewMauville_Entrance/scripts.inc index e9dd09c27..e9369b7ea 100644 --- a/data/maps/NewMauville_Entrance/scripts.inc +++ b/data/maps/NewMauville_Entrance/scripts.inc @@ -1,14 +1,14 @@ NewMauville_Entrance_MapScripts:: @ 82372AD - map_script MAP_SCRIPT_ON_LOAD, NewMauville_Entrance_MapScript1_2372B8 + map_script MAP_SCRIPT_ON_LOAD, NewMauville_Entrance_OnLoad map_script MAP_SCRIPT_ON_TRANSITION, NewMauville_Entrance_OnTransition .byte 0 -NewMauville_Entrance_MapScript1_2372B8: @ 82372B8 +NewMauville_Entrance_OnLoad: @ 82372B8 compare VAR_NEW_MAUVILLE_STATE, 0 - call_if_eq NewMauville_Entrance_EventScript_2372C4 + call_if_eq NewMauville_Entrance_EventScript_CloseDoor end -NewMauville_Entrance_EventScript_2372C4:: @ 82372C4 +NewMauville_Entrance_EventScript_CloseDoor:: @ 82372C4 setmetatile 3, 0, METATILE_Facility_NewMauvilleDoor_Closed_Tile0, 1 setmetatile 4, 0, METATILE_Facility_NewMauvilleDoor_Closed_Tile1, 1 setmetatile 5, 0, METATILE_Facility_NewMauvilleDoor_Closed_Tile2, 1 @@ -21,18 +21,18 @@ NewMauville_Entrance_OnTransition: @ 82372FB setflag FLAG_LANDMARK_NEW_MAUVILLE end -NewMauville_Entrance_EventScript_2372FF:: @ 82372FF +NewMauville_Entrance_EventScript_Door:: @ 82372FF lockall applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - msgbox NewMauville_Entrance_Text_237382, MSGBOX_DEFAULT + msgbox NewMauville_Entrance_Text_DoorIsLocked, MSGBOX_DEFAULT checkitem ITEM_BASEMENT_KEY, 1 - compare VAR_RESULT, 0 - goto_if_eq NewMauville_Entrance_EventScript_237380 - msgbox NewMauville_Entrance_Text_237396, MSGBOX_YESNO + compare VAR_RESULT, FALSE + goto_if_eq NewMauville_Entrance_EventScript_DontOpenDoor + msgbox NewMauville_Entrance_Text_UseBasementKey, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq NewMauville_Entrance_EventScript_237380 - msgbox NewMauville_Entrance_Text_2373AC, MSGBOX_DEFAULT + goto_if_eq NewMauville_Entrance_EventScript_DontOpenDoor + msgbox NewMauville_Entrance_Text_UsedBasementKey, MSGBOX_DEFAULT setmetatile 3, 0, METATILE_Facility_NewMauvilleDoor_Open_Tile0, 0 setmetatile 4, 0, METATILE_Facility_NewMauvilleDoor_Open_Tile1, 0 setmetatile 5, 0, METATILE_Facility_NewMauvilleDoor_Open_Tile2, 0 @@ -45,17 +45,17 @@ NewMauville_Entrance_EventScript_2372FF:: @ 82372FF releaseall end -NewMauville_Entrance_EventScript_237380:: @ 8237380 +NewMauville_Entrance_EventScript_DontOpenDoor:: @ 8237380 releaseall end -NewMauville_Entrance_Text_237382: @ 8237382 +NewMauville_Entrance_Text_DoorIsLocked: @ 8237382 .string "The door is locked.$" -NewMauville_Entrance_Text_237396: @ 8237396 +NewMauville_Entrance_Text_UseBasementKey: @ 8237396 .string "Use the BASEMENT KEY?$" -NewMauville_Entrance_Text_2373AC: @ 82373AC +NewMauville_Entrance_Text_UsedBasementKey: @ 82373AC .string "{PLAYER} used the BASEMENT KEY.\p" .string "The door opened!$" diff --git a/data/maps/NewMauville_Inside/map.json b/data/maps/NewMauville_Inside/map.json index e58588a47..8909fcbaa 100644 --- a/data/maps/NewMauville_Inside/map.json +++ b/data/maps/NewMauville_Inside/map.json @@ -89,7 +89,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "NewMauville_Inside_EventScript_2377AF", + "script": "NewMauville_Inside_EventScript_Voltorb1", "flag": "FLAG_HIDE_NEW_MAUVILLE_VOLTORB_1" }, { @@ -102,7 +102,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "NewMauville_Inside_EventScript_2377FC", + "script": "NewMauville_Inside_EventScript_Voltorb2", "flag": "FLAG_HIDE_NEW_MAUVILLE_VOLTORB_2" }, { @@ -115,7 +115,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "NewMauville_Inside_EventScript_237849", + "script": "NewMauville_Inside_EventScript_Voltorb3", "flag": "FLAG_HIDE_NEW_MAUVILLE_VOLTORB_3" } ], @@ -136,7 +136,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "NewMauville_Inside_EventScript_237459" + "script": "NewMauville_Inside_EventScript_BlueButton" }, { "type": "trigger", @@ -145,7 +145,7 @@ "elevation": 3, "var": "VAR_TEMP_2", "var_value": "0", - "script": "NewMauville_Inside_EventScript_237471" + "script": "NewMauville_Inside_EventScript_GreenButton" }, { "type": "trigger", @@ -154,7 +154,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "NewMauville_Inside_EventScript_237459" + "script": "NewMauville_Inside_EventScript_BlueButton" }, { "type": "trigger", @@ -163,7 +163,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "NewMauville_Inside_EventScript_237459" + "script": "NewMauville_Inside_EventScript_BlueButton" }, { "type": "trigger", @@ -172,7 +172,7 @@ "elevation": 3, "var": "VAR_TEMP_2", "var_value": "0", - "script": "NewMauville_Inside_EventScript_237471" + "script": "NewMauville_Inside_EventScript_GreenButton" }, { "type": "trigger", @@ -181,7 +181,7 @@ "elevation": 3, "var": "VAR_TEMP_2", "var_value": "0", - "script": "NewMauville_Inside_EventScript_237471" + "script": "NewMauville_Inside_EventScript_GreenButton" }, { "type": "trigger", @@ -190,7 +190,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "NewMauville_Inside_EventScript_237459" + "script": "NewMauville_Inside_EventScript_BlueButton" }, { "type": "trigger", @@ -199,7 +199,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "NewMauville_Inside_EventScript_237459" + "script": "NewMauville_Inside_EventScript_BlueButton" }, { "type": "trigger", @@ -208,7 +208,7 @@ "elevation": 3, "var": "VAR_TEMP_2", "var_value": "0", - "script": "NewMauville_Inside_EventScript_237471" + "script": "NewMauville_Inside_EventScript_GreenButton" }, { "type": "trigger", @@ -217,7 +217,7 @@ "elevation": 3, "var": "VAR_NEW_MAUVILLE_STATE", "var_value": "1", - "script": "NewMauville_Inside_EventScript_237725" + "script": "NewMauville_Inside_EventScript_RedButton" } ], "bg_events": [ @@ -227,7 +227,7 @@ "y": 4, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "NewMauville_Inside_EventScript_23778F" + "script": "NewMauville_Inside_EventScript_Generator" }, { "type": "sign", @@ -235,7 +235,7 @@ "y": 3, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "NewMauville_Inside_EventScript_23778F" + "script": "NewMauville_Inside_EventScript_Generator" }, { "type": "sign", @@ -243,7 +243,7 @@ "y": 2, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "NewMauville_Inside_EventScript_23778F" + "script": "NewMauville_Inside_EventScript_Generator" }, { "type": "sign", @@ -251,7 +251,7 @@ "y": 4, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "NewMauville_Inside_EventScript_23778F" + "script": "NewMauville_Inside_EventScript_Generator" }, { "type": "sign", @@ -259,7 +259,7 @@ "y": 4, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "NewMauville_Inside_EventScript_23778F" + "script": "NewMauville_Inside_EventScript_Generator" }, { "type": "sign", @@ -267,7 +267,7 @@ "y": 4, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "NewMauville_Inside_EventScript_23778F" + "script": "NewMauville_Inside_EventScript_Generator" }, { "type": "sign", @@ -275,7 +275,7 @@ "y": 3, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "NewMauville_Inside_EventScript_23778F" + "script": "NewMauville_Inside_EventScript_Generator" }, { "type": "sign", @@ -283,7 +283,7 @@ "y": 2, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "NewMauville_Inside_EventScript_23778F" + "script": "NewMauville_Inside_EventScript_Generator" } ] } \ No newline at end of file diff --git a/data/maps/NewMauville_Inside/scripts.inc b/data/maps/NewMauville_Inside/scripts.inc index be4e846eb..7675799eb 100644 --- a/data/maps/NewMauville_Inside/scripts.inc +++ b/data/maps/NewMauville_Inside/scripts.inc @@ -1,18 +1,18 @@ NewMauville_Inside_MapScripts:: @ 82373D7 - map_script MAP_SCRIPT_ON_RESUME, NewMauville_Inside_MapScript1_2373E7 + map_script MAP_SCRIPT_ON_RESUME, NewMauville_Inside_OnResume map_script MAP_SCRIPT_ON_TRANSITION, NewMauville_Inside_OnTransition - map_script MAP_SCRIPT_ON_LOAD, NewMauville_Inside_MapScript1_23744D + map_script MAP_SCRIPT_ON_LOAD, NewMauville_Inside_OnLoad .byte 0 -NewMauville_Inside_MapScript1_2373E7: @ 82373E7 +NewMauville_Inside_OnResume: @ 82373E7 compare VAR_TEMP_1, 1 - call_if_eq NewMauville_Inside_EventScript_237489 + call_if_eq NewMauville_Inside_EventScript_SetBarrierStateBlueButton compare VAR_TEMP_2, 1 - call_if_eq NewMauville_Inside_EventScript_2375D7 - call_if_set FLAG_SYS_CTRL_OBJ_DELETE, NewMauville_Inside_EventScript_237407 + call_if_eq NewMauville_Inside_EventScript_SetBarrierStateGreenButton + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, NewMauville_Inside_EventScript_TryRemoveVoltorb end -NewMauville_Inside_EventScript_237407:: @ 8237407 +NewMauville_Inside_EventScript_TryRemoveVoltorb:: @ 8237407 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne Common_EventScript_NopReturn @@ -22,49 +22,49 @@ NewMauville_Inside_EventScript_237407:: @ 8237407 NewMauville_Inside_OnTransition: @ 823741B setvar VAR_TEMP_1, 0 setvar VAR_TEMP_2, 0 - call_if_unset FLAG_DEFEATED_VOLTORB_1_NEW_MAUVILLE, NewMauville_Inside_EventScript_237441 - call_if_unset FLAG_DEFEATED_VOLTORB_2_NEW_MAUVILLE, NewMauville_Inside_EventScript_237445 - call_if_unset FLAG_DEFEATED_VOLTORB_3_NEW_MAUVILLE, NewMauville_Inside_EventScript_237449 + call_if_unset FLAG_DEFEATED_VOLTORB_1_NEW_MAUVILLE, NewMauville_Inside_EventScript_ShowVoltorb1 + call_if_unset FLAG_DEFEATED_VOLTORB_2_NEW_MAUVILLE, NewMauville_Inside_EventScript_ShowVoltorb2 + call_if_unset FLAG_DEFEATED_VOLTORB_3_NEW_MAUVILLE, NewMauville_Inside_EventScript_ShowVoltorb3 end -NewMauville_Inside_EventScript_237441:: @ 8237441 +NewMauville_Inside_EventScript_ShowVoltorb1:: @ 8237441 clearflag FLAG_HIDE_NEW_MAUVILLE_VOLTORB_1 return -NewMauville_Inside_EventScript_237445:: @ 8237445 +NewMauville_Inside_EventScript_ShowVoltorb2:: @ 8237445 clearflag FLAG_HIDE_NEW_MAUVILLE_VOLTORB_2 return -NewMauville_Inside_EventScript_237449:: @ 8237449 +NewMauville_Inside_EventScript_ShowVoltorb3:: @ 8237449 clearflag FLAG_HIDE_NEW_MAUVILLE_VOLTORB_3 return -NewMauville_Inside_MapScript1_23744D: @ 823744D +NewMauville_Inside_OnLoad: @ 823744D compare VAR_NEW_MAUVILLE_STATE, 2 - call_if_eq NewMauville_Inside_EventScript_23773A + call_if_eq NewMauville_Inside_EventScript_SetGeneratorOffMetatiles end -NewMauville_Inside_EventScript_237459:: @ 8237459 +NewMauville_Inside_EventScript_BlueButton:: @ 8237459 lockall setvar VAR_TEMP_1, 1 setvar VAR_TEMP_2, 0 playse SE_PIN - call NewMauville_Inside_EventScript_237489 + call NewMauville_Inside_EventScript_SetBarrierStateBlueButton special DrawWholeMapView releaseall end -NewMauville_Inside_EventScript_237471:: @ 8237471 +NewMauville_Inside_EventScript_GreenButton:: @ 8237471 lockall setvar VAR_TEMP_1, 0 setvar VAR_TEMP_2, 1 playse SE_PIN - call NewMauville_Inside_EventScript_2375D7 + call NewMauville_Inside_EventScript_SetBarrierStateGreenButton special DrawWholeMapView releaseall end -NewMauville_Inside_EventScript_237489:: @ 8237489 +NewMauville_Inside_EventScript_SetBarrierStateBlueButton:: @ 8237489 setmetatile 23, 34, METATILE_BikeShop_Barrier_Hidden_Top, 1 setmetatile 23, 35, METATILE_BikeShop_Barrier_Hidden_Bottom, 1 setmetatile 23, 36, METATILE_BikeShop_Floor_Shadow_Top, 0 @@ -104,7 +104,7 @@ NewMauville_Inside_EventScript_237489:: @ 8237489 setmetatile 18, 36, METATILE_BikeShop_Button_Green, 0 return -NewMauville_Inside_EventScript_2375D7:: @ 82375D7 +NewMauville_Inside_EventScript_SetBarrierStateGreenButton:: @ 82375D7 setmetatile 23, 34, METATILE_BikeShop_Barrier_Blue_Top, 1 setmetatile 23, 35, METATILE_BikeShop_Barrier_Blue_TopMid, 1 setmetatile 23, 36, METATILE_BikeShop_Barrier_Blue_BottomMid, 1 @@ -144,15 +144,15 @@ NewMauville_Inside_EventScript_2375D7:: @ 82375D7 setmetatile 30, 38, METATILE_BikeShop_Button_Blue, 0 return -NewMauville_Inside_EventScript_237725:: @ 8237725 +NewMauville_Inside_EventScript_RedButton:: @ 8237725 lockall - msgbox NewMauville_Inside_Text_237932, MSGBOX_DEFAULT - call NewMauville_Inside_EventScript_23773A + msgbox NewMauville_Inside_Text_SteppedOnSwitchGeneratorStopped, MSGBOX_DEFAULT + call NewMauville_Inside_EventScript_SetGeneratorOffMetatiles setvar VAR_NEW_MAUVILLE_STATE, 2 releaseall end -NewMauville_Inside_EventScript_23773A:: @ 823773A +NewMauville_Inside_EventScript_SetGeneratorOffMetatiles:: @ 823773A setmetatile 33, 6, METATILE_BikeShop_Button_Pressed, 0 setmetatile 32, 2, METATILE_BikeShop_Generator_Off_Tile0, 1 setmetatile 33, 2, METATILE_BikeShop_Generator_Off_Tile1, 1 @@ -165,20 +165,20 @@ NewMauville_Inside_EventScript_23773A:: @ 823773A special DrawWholeMapView return -NewMauville_Inside_EventScript_23778F:: @ 823778F +NewMauville_Inside_EventScript_Generator:: @ 823778F lockall compare VAR_NEW_MAUVILLE_STATE, 2 - goto_if_eq NewMauville_Inside_EventScript_2377A5 - msgbox NewMauville_Inside_Text_237896, MSGBOX_DEFAULT + goto_if_eq NewMauville_Inside_EventScript_GeneratorOff + msgbox NewMauville_Inside_Text_GeneratorRadiatingHeat, MSGBOX_DEFAULT releaseall end -NewMauville_Inside_EventScript_2377A5:: @ 82377A5 - msgbox NewMauville_Inside_Text_237916, MSGBOX_DEFAULT +NewMauville_Inside_EventScript_GeneratorOff:: @ 82377A5 + msgbox NewMauville_Inside_Text_GeneratorQuietedDown, MSGBOX_DEFAULT releaseall end -NewMauville_Inside_EventScript_2377AF:: @ 82377AF +NewMauville_Inside_EventScript_Voltorb1:: @ 82377AF lock faceplayer setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE @@ -191,21 +191,21 @@ NewMauville_Inside_EventScript_2377AF:: @ 82377AF clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON - goto_if_eq NewMauville_Inside_EventScript_2377F3 + goto_if_eq NewMauville_Inside_EventScript_DefeatedVoltorb1 compare VAR_RESULT, B_OUTCOME_RAN - goto_if_eq NewMauville_Inside_EventScript_2377F3 + goto_if_eq NewMauville_Inside_EventScript_DefeatedVoltorb1 compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED - goto_if_eq NewMauville_Inside_EventScript_2377F3 + goto_if_eq NewMauville_Inside_EventScript_DefeatedVoltorb1 setflag FLAG_DEFEATED_VOLTORB_1_NEW_MAUVILLE release end -NewMauville_Inside_EventScript_2377F3:: @ 82377F3 +NewMauville_Inside_EventScript_DefeatedVoltorb1:: @ 82377F3 setflag FLAG_DEFEATED_VOLTORB_1_NEW_MAUVILLE goto Common_EventScript_RemoveStaticPokemon end -NewMauville_Inside_EventScript_2377FC:: @ 82377FC +NewMauville_Inside_EventScript_Voltorb2:: @ 82377FC lock faceplayer setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE @@ -218,21 +218,21 @@ NewMauville_Inside_EventScript_2377FC:: @ 82377FC clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON - goto_if_eq NewMauville_Inside_EventScript_237840 + goto_if_eq NewMauville_Inside_EventScript_DefeatedVoltorb2 compare VAR_RESULT, B_OUTCOME_RAN - goto_if_eq NewMauville_Inside_EventScript_237840 + goto_if_eq NewMauville_Inside_EventScript_DefeatedVoltorb2 compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED - goto_if_eq NewMauville_Inside_EventScript_237840 + goto_if_eq NewMauville_Inside_EventScript_DefeatedVoltorb2 setflag FLAG_DEFEATED_VOLTORB_2_NEW_MAUVILLE release end -NewMauville_Inside_EventScript_237840:: @ 8237840 +NewMauville_Inside_EventScript_DefeatedVoltorb2:: @ 8237840 setflag FLAG_DEFEATED_VOLTORB_2_NEW_MAUVILLE goto Common_EventScript_RemoveStaticPokemon end -NewMauville_Inside_EventScript_237849:: @ 8237849 +NewMauville_Inside_EventScript_Voltorb3:: @ 8237849 lock faceplayer setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE @@ -245,30 +245,30 @@ NewMauville_Inside_EventScript_237849:: @ 8237849 clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON - goto_if_eq NewMauville_Inside_EventScript_23788D + goto_if_eq NewMauville_Inside_EventScript_DefeatedVoltorb3 compare VAR_RESULT, B_OUTCOME_RAN - goto_if_eq NewMauville_Inside_EventScript_23788D + goto_if_eq NewMauville_Inside_EventScript_DefeatedVoltorb3 compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED - goto_if_eq NewMauville_Inside_EventScript_23788D + goto_if_eq NewMauville_Inside_EventScript_DefeatedVoltorb3 setflag FLAG_DEFEATED_VOLTORB_3_NEW_MAUVILLE release end -NewMauville_Inside_EventScript_23788D:: @ 823788D +NewMauville_Inside_EventScript_DefeatedVoltorb3:: @ 823788D setflag FLAG_DEFEATED_VOLTORB_3_NEW_MAUVILLE goto Common_EventScript_RemoveStaticPokemon end -NewMauville_Inside_Text_237896: @ 8237896 +NewMauville_Inside_Text_GeneratorRadiatingHeat: @ 8237896 .string "The generator is radiating heat that\n" .string "can be felt even at a distance.\p" .string "It looks like it should be turned off\n" .string "as soon as possible.$" -NewMauville_Inside_Text_237916: @ 8237916 +NewMauville_Inside_Text_GeneratorQuietedDown: @ 8237916 .string "The generator quieted down.$" -NewMauville_Inside_Text_237932: @ 8237932 +NewMauville_Inside_Text_SteppedOnSwitchGeneratorStopped: @ 8237932 .string "{PLAYER} stepped on the switch.\p" .string "Click…\p" .string "… … … … … … … …\n" diff --git a/include/constants/metatile_labels.h b/include/constants/metatile_labels.h index 6d17fc047..c3ec28406 100644 --- a/include/constants/metatile_labels.h +++ b/include/constants/metatile_labels.h @@ -381,7 +381,7 @@ #define METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Right_Alt 0x27C #define METATILE_TrickHousePuzzle_Arrow_YellowOnWhite_Right 0x298 -// gTileset_BikeShop +// gTileset_BikeShop (also used by New Mauville) #define METATILE_BikeShop_Barrier_Hidden_Top 0x269 #define METATILE_BikeShop_Barrier_Hidden_Bottom 0x271 #define METATILE_BikeShop_Floor_Shadow_Top 0x26D From d5685db19a98657492d5d99541f266c26a52619a Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 7 Nov 2019 10:37:15 -0500 Subject: [PATCH 19/40] Fold nops into hidemoneybox --- asm/macros/event.inc | 2 ++ .../LilycoveCity_DepartmentStoreRooftop/scripts.inc | 2 -- data/maps/MauvilleCity_GameCorner/scripts.inc | 10 ---------- data/maps/MtChimney/scripts.inc | 8 -------- data/maps/Route109_SeashoreHouse/scripts.inc | 8 -------- data/maps/Route121_SafariZoneEntrance/scripts.inc | 4 ---- data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc | 8 -------- 7 files changed, 2 insertions(+), 40 deletions(-) diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 40430fe53..de98d6fa3 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -1083,6 +1083,8 @@ @ Hides the secondary box spawned by showmoney. .macro hidemoneybox .byte 0x94 + nop + nop .endm @ Updates the secondary box spawned by showmoney. Consumes but does not use arguments. diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc index 0cb3e79fe..906286bc7 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc @@ -196,8 +196,6 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_NoRoomForDrink:: @ 8220450 LilycoveCity_DepartmentStoreRooftop_EventScript_ExitVendingMachine:: @ 822045E hidemoneybox - nop - nop releaseall end diff --git a/data/maps/MauvilleCity_GameCorner/scripts.inc b/data/maps/MauvilleCity_GameCorner/scripts.inc index 2a77c010f..2bafd056e 100644 --- a/data/maps/MauvilleCity_GameCorner/scripts.inc +++ b/data/maps/MauvilleCity_GameCorner/scripts.inc @@ -56,8 +56,6 @@ MauvilleCity_GameCorner_EventScript_Buy50Coins:: @ 820FC33 playse SE_REGI msgbox MauvilleCity_GameCorner_Text_ThankYouHereAreYourCoins, MSGBOX_DEFAULT hidemoneybox - nop - nop hidecoinsbox 0, 5 release end @@ -76,8 +74,6 @@ MauvilleCity_GameCorner_EventScript_Buy500Coins:: @ 820FC75 playse SE_REGI msgbox MauvilleCity_GameCorner_Text_ThankYouHereAreYourCoins, MSGBOX_DEFAULT hidemoneybox - nop - nop hidecoinsbox 0, 5 release end @@ -90,8 +86,6 @@ MauvilleCity_GameCorner_EventScript_NeedCoinCase:: @ 820FCB7 MauvilleCity_GameCorner_EventScript_NotEnoughMoney:: @ 820FCC1 msgbox MauvilleCity_GameCorner_Text_DontHaveEnoughMoney, MSGBOX_DEFAULT hidemoneybox - nop - nop hidecoinsbox 0, 5 release end @@ -99,8 +93,6 @@ MauvilleCity_GameCorner_EventScript_NotEnoughMoney:: @ 820FCC1 MauvilleCity_GameCorner_EventScript_CancelBuyCoins:: @ 820FCD1 msgbox MauvilleCity_GameCorner_Text_DontNeedCoinsThen, MSGBOX_DEFAULT hidemoneybox - nop - nop hidecoinsbox 0, 5 release end @@ -108,8 +100,6 @@ MauvilleCity_GameCorner_EventScript_CancelBuyCoins:: @ 820FCD1 MauvilleCity_GameCorner_EventScript_NoRoomForCoins:: @ 820FCE1 msgbox MauvilleCity_GameCorner_Text_CoinCaseIsFull, MSGBOX_DEFAULT hidemoneybox - nop - nop hidecoinsbox 0, 5 release end diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc index c7283ef0f..a70d7e3ae 100644 --- a/data/maps/MtChimney/scripts.inc +++ b/data/maps/MtChimney/scripts.inc @@ -115,16 +115,12 @@ MtChimney_EventScript_LavaCookieLady:: @ 822EEF3 compare VAR_RESULT, FALSE goto_if_eq MtChimney_EventScript_BagIsFull hidemoneybox - nop - nop release end MtChimney_EventScript_BagIsFull:: @ 822EF51 msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT hidemoneybox - nop - nop release end @@ -136,16 +132,12 @@ MtChimney_EventScript_TakeMoney:: @ 822EF5E MtChimney_EventScript_DeclineLavaCookie:: @ 822EF69 msgbox MtChimney_Text_OhFineThen, MSGBOX_DEFAULT hidemoneybox - nop - nop release end MtChimney_EventScript_NotEnoughMoney:: @ 822EF76 msgbox MtChimney_Text_YouveNotGotTheMoney, MSGBOX_DEFAULT hidemoneybox - nop - nop release end diff --git a/data/maps/Route109_SeashoreHouse/scripts.inc b/data/maps/Route109_SeashoreHouse/scripts.inc index bc018c2f0..dc54ab491 100644 --- a/data/maps/Route109_SeashoreHouse/scripts.inc +++ b/data/maps/Route109_SeashoreHouse/scripts.inc @@ -43,8 +43,6 @@ Route109_SeashoreHouse_EventScript_AlreadyReceivedSodaPop:: @ 8269460 goto_if_eq Route109_SeashoreHouse_EventScript_BuySodaPop msgbox Route109_SeashoreHouse_Text_ThatsTooBad, MSGBOX_DEFAULT hidemoneybox - nop - nop release end @@ -60,24 +58,18 @@ Route109_SeashoreHouse_EventScript_BuySodaPop:: @ 8269484 updatemoneybox 0, 0 giveitem_std ITEM_SODA_POP hidemoneybox - nop - nop release end Route109_SeashoreHouse_EventScript_NotEnoughMoney:: @ 82694C8 msgbox Route109_SeashoreHouse_Text_NotEnoughMoney, MSGBOX_DEFAULT hidemoneybox - nop - nop release end Route109_SeashoreHouse_EventScript_NotEnoughSpace:: @ 82694D5 msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT hidemoneybox - nop - nop release end diff --git a/data/maps/Route121_SafariZoneEntrance/scripts.inc b/data/maps/Route121_SafariZoneEntrance/scripts.inc index 5f64957cb..6da6396be 100644 --- a/data/maps/Route121_SafariZoneEntrance/scripts.inc +++ b/data/maps/Route121_SafariZoneEntrance/scripts.inc @@ -75,8 +75,6 @@ Route121_SafariZoneEntrance_EventScript_TryEnterSafariZone:: @ 822BC48 msgbox Route121_SafariZoneEntrance_Text_PleaseEnjoyYourself, MSGBOX_DEFAULT closemessage hidemoneybox - nop - nop applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_EnterSafariZone waitmovement 0 special EnterSafariMode @@ -113,8 +111,6 @@ Route121_SafariZoneEntrance_EventScript_NotEnoughMoney:: @ 822BCF8 Route121_SafariZoneEntrance_EventScript_MovePlayerBackFromCounter:: @ 822BD06 closemessage hidemoneybox - nop - nop applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_BackAwayFromCounter waitmovement 0 releaseall diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc index dcf92fe2d..a6e6541da 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc @@ -26,8 +26,6 @@ SlateportCity_OceanicMuseum_1F_EventScript_PayEntranceFee:: @ 820ADC1 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_CheckMoneyForFee closemessage hidemoneybox - nop - nop applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_PushPlayerBackFromCounter waitmovement 0 releaseall @@ -43,8 +41,6 @@ SlateportCity_OceanicMuseum_1F_EventScript_CheckMoneyForFee:: @ 820ADE8 msgbox SlateportCity_OceanicMuseum_1F_Text_PleaseEnjoyYourself, MSGBOX_DEFAULT setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 1 hidemoneybox - nop - nop releaseall end @@ -53,8 +49,6 @@ SlateportCity_OceanicMuseum_1F_EventScript_NotEnoughMoney:: @ 820AE18 msgbox SlateportCity_OceanicMuseum_1F_Text_NotEnoughMoney, MSGBOX_DEFAULT closemessage hidemoneybox - nop - nop applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_PushPlayerBackFromCounter waitmovement 0 releaseall @@ -64,8 +58,6 @@ SlateportCity_OceanicMuseum_1F_EventScript_AllowEntranceAnyway:: @ 820AE39 msgbox SlateportCity_OceanicMuseum_1F_Text_CatchUpWithYourGroup, MSGBOX_DEFAULT setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 1 hidemoneybox - nop - nop releaseall end From 702ef745d97dcdeae03e1c47fb1f2f7fc1be6dd0 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 7 Nov 2019 11:07:49 -0500 Subject: [PATCH 20/40] Add comments to hidemoneybox macro --- asm/macros/event.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/asm/macros/event.inc b/asm/macros/event.inc index de98d6fa3..20b5f3e60 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -1080,11 +1080,11 @@ .byte \check .endm - @ Hides the secondary box spawned by showmoney. + @ Hides the secondary box spawned by showmoney. Consumption of the x and y arguments was dummied out. .macro hidemoneybox .byte 0x94 - nop - nop + .byte 0 @ \x + .byte 0 @ \y .endm @ Updates the secondary box spawned by showmoney. Consumes but does not use arguments. From 09afa7992da104c4d88de05719507f72ae862750 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 7 Nov 2019 12:17:28 -0500 Subject: [PATCH 21/40] Document Shoal Cave --- .../ShoalCave_LowTideEntranceRoom/map.json | 2 +- .../ShoalCave_LowTideEntranceRoom/scripts.inc | 77 ++++++++------- data/maps/ShoalCave_LowTideInnerRoom/map.json | 12 +-- .../ShoalCave_LowTideInnerRoom/scripts.inc | 98 +++++++++---------- data/maps/ShoalCave_LowTideLowerRoom/map.json | 4 +- .../ShoalCave_LowTideLowerRoom/scripts.inc | 42 ++++---- .../maps/ShoalCave_LowTideStairsRoom/map.json | 2 +- .../ShoalCave_LowTideStairsRoom/scripts.inc | 26 ++--- data/text/shoal_cave.inc | 20 ++-- 9 files changed, 141 insertions(+), 142 deletions(-) diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/map.json b/data/maps/ShoalCave_LowTideEntranceRoom/map.json index 4b5d23110..984537594 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/map.json +++ b/data/maps/ShoalCave_LowTideEntranceRoom/map.json @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "ShoalCave_LowTideEntranceRoom_EventScript_236DD9", + "script": "ShoalCave_LowTideEntranceRoom_EventScript_ShellBellExpert", "flag": "0" } ], diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc index f5c487ab3..8713578cf 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc @@ -4,90 +4,91 @@ ShoalCave_LowTideEntranceRoom_MapScripts:: @ 8236DBA ShoalCave_LowTideEntranceRoom_OnTransition: @ 8236DC0 special UpdateShoalTideFlag - goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideEntranceRoom_EventScript_236DD1 - goto ShoalCave_LowTideEntranceRoom_EventScript_236DD5 + goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideEntranceRoom_EventScript_SetHighTide + goto ShoalCave_LowTideEntranceRoom_EventScript_SetLowTide -ShoalCave_LowTideEntranceRoom_EventScript_236DD1:: @ 8236DD1 +ShoalCave_LowTideEntranceRoom_EventScript_SetHighTide:: @ 8236DD1 setmaplayoutindex LAYOUT_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM end -ShoalCave_LowTideEntranceRoom_EventScript_236DD5:: @ 8236DD5 +ShoalCave_LowTideEntranceRoom_EventScript_SetLowTide:: @ 8236DD5 setmaplayoutindex LAYOUT_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM end -ShoalCave_LowTideEntranceRoom_EventScript_236DD9:: @ 8236DD9 +ShoalCave_LowTideEntranceRoom_EventScript_ShellBellExpert:: @ 8236DD9 lock faceplayer dotimebasedevents - call_if_set FLAG_SYS_SHOAL_ITEM, ShoalCave_LowTideEntranceRoom_EventScript_236ED9 + call_if_set FLAG_SYS_SHOAL_ITEM, ShoalCave_LowTideEntranceRoom_EventScript_ResetShoalItems checkitem ITEM_SHOAL_SALT, 4 - compare VAR_RESULT, 0 - goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236E9B + compare VAR_RESULT, FALSE + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_NotEnoughShoalSaltOrShells checkitem ITEM_SHOAL_SHELL, 4 - compare VAR_RESULT, 0 - goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236E9B - msgbox ShoalCave_LowTideEntranceRoom_Text_2A7F37, MSGBOX_YESNO + compare VAR_RESULT, FALSE + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_NotEnoughShoalSaltOrShells + msgbox ShoalCave_LowTideEntranceRoom_Text_WouldYouLikeShellBell, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236ECF + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_DeclineShellBell checkitemspace ITEM_SHELL_BELL, 1 - compare VAR_RESULT, 0 - call_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236E69 + compare VAR_RESULT, FALSE + call_if_eq ShoalCave_LowTideEntranceRoom_EventScript_CheckSpaceWillBeFreed compare VAR_RESULT, 2 - goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236E91 - msgbox ShoalCave_LowTideEntranceRoom_Text_2A7FAC, MSGBOX_DEFAULT + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_NoRoomForShellBell + msgbox ShoalCave_LowTideEntranceRoom_Text_MakeShellBellRightAway, MSGBOX_DEFAULT takeitem ITEM_SHOAL_SALT, 4 takeitem ITEM_SHOAL_SHELL, 4 giveitem_std ITEM_SHELL_BELL - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull - msgbox ShoalCave_LowTideEntranceRoom_Text_2A8012, MSGBOX_DEFAULT + msgbox ShoalCave_LowTideEntranceRoom_Text_ExplainShellBell, MSGBOX_DEFAULT setflag FLAG_TEMP_2 release end -ShoalCave_LowTideEntranceRoom_EventScript_236E69:: @ 8236E69 +@ If the bag is full, check if a slot will be freed when 4 Shoal Salt or Shells are given +ShoalCave_LowTideEntranceRoom_EventScript_CheckSpaceWillBeFreed:: @ 8236E69 checkitem ITEM_SHOAL_SALT, 5 - compare VAR_RESULT, 1 - goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236E7A + compare VAR_RESULT, TRUE + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_CheckSpaceWillBeFreedShells return -ShoalCave_LowTideEntranceRoom_EventScript_236E7A:: @ 8236E7A +ShoalCave_LowTideEntranceRoom_EventScript_CheckSpaceWillBeFreedShells:: @ 8236E7A checkitem ITEM_SHOAL_SHELL, 5 - compare VAR_RESULT, 1 - goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236E8B + compare VAR_RESULT, TRUE + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_NoSpaceWillBeFreed return -ShoalCave_LowTideEntranceRoom_EventScript_236E8B:: @ 8236E8B +ShoalCave_LowTideEntranceRoom_EventScript_NoSpaceWillBeFreed:: @ 8236E8B setvar VAR_RESULT, 2 return -ShoalCave_LowTideEntranceRoom_EventScript_236E91:: @ 8236E91 - msgbox ShoalCave_LowTideEntranceRoom_Text_2A80F5, MSGBOX_DEFAULT +ShoalCave_LowTideEntranceRoom_EventScript_NoRoomForShellBell:: @ 8236E91 + msgbox ShoalCave_LowTideEntranceRoom_Text_NoSpaceInYourBag, MSGBOX_DEFAULT release end -ShoalCave_LowTideEntranceRoom_EventScript_236E9B:: @ 8236E9B +ShoalCave_LowTideEntranceRoom_EventScript_NotEnoughShoalSaltOrShells:: @ 8236E9B checkitem ITEM_SHOAL_SALT, 1 - compare VAR_RESULT, 1 - goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236EC5 + compare VAR_RESULT, TRUE + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_HasSomeShoalSaltOrShell checkitem ITEM_SHOAL_SHELL, 1 - compare VAR_RESULT, 1 - goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236EC5 - msgbox ShoalCave_LowTideEntranceRoom_Text_2A7E0E, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_HasSomeShoalSaltOrShell + msgbox ShoalCave_LowTideEntranceRoom_Text_AreYouPlanningOnGoingInThere, MSGBOX_DEFAULT release end -ShoalCave_LowTideEntranceRoom_EventScript_236EC5:: @ 8236EC5 - msgbox ShoalCave_LowTideEntranceRoom_Text_2A7EB3, MSGBOX_DEFAULT +ShoalCave_LowTideEntranceRoom_EventScript_HasSomeShoalSaltOrShell:: @ 8236EC5 + msgbox ShoalCave_LowTideEntranceRoom_Text_BringMe4ShoalSaltAndShells, MSGBOX_DEFAULT release end -ShoalCave_LowTideEntranceRoom_EventScript_236ECF:: @ 8236ECF - msgbox ShoalCave_LowTideEntranceRoom_Text_2A80C6, MSGBOX_DEFAULT +ShoalCave_LowTideEntranceRoom_EventScript_DeclineShellBell:: @ 8236ECF + msgbox ShoalCave_LowTideEntranceRoom_Text_WantedToMakeShellBell, MSGBOX_DEFAULT release end -ShoalCave_LowTideEntranceRoom_EventScript_236ED9:: @ 8236ED9 +ShoalCave_LowTideEntranceRoom_EventScript_ResetShoalItems:: @ 8236ED9 clearflag FLAG_RECEIVED_SHOAL_SALT_1 clearflag FLAG_RECEIVED_SHOAL_SALT_2 clearflag FLAG_RECEIVED_SHOAL_SALT_3 diff --git a/data/maps/ShoalCave_LowTideInnerRoom/map.json b/data/maps/ShoalCave_LowTideInnerRoom/map.json index f9eec06c4..5bc7ef756 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/map.json +++ b/data/maps/ShoalCave_LowTideInnerRoom/map.json @@ -94,7 +94,7 @@ "y": 8, "elevation": 5, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "ShoalCave_LowTideInnerRoom_EventScript_23708C" + "script": "ShoalCave_LowTideInnerRoom_EventScript_ShoalSalt1" }, { "type": "sign", @@ -102,7 +102,7 @@ "y": 26, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "ShoalCave_LowTideInnerRoom_EventScript_2370C8" + "script": "ShoalCave_LowTideInnerRoom_EventScript_ShoalSalt2" }, { "type": "sign", @@ -110,7 +110,7 @@ "y": 20, "elevation": 5, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "ShoalCave_LowTideInnerRoom_EventScript_236FBA" + "script": "ShoalCave_LowTideInnerRoom_EventScript_ShoalShell1" }, { "type": "sign", @@ -118,7 +118,7 @@ "y": 10, "elevation": 5, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "ShoalCave_LowTideInnerRoom_EventScript_236FF6" + "script": "ShoalCave_LowTideInnerRoom_EventScript_ShoalShell2" }, { "type": "sign", @@ -126,7 +126,7 @@ "y": 9, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "ShoalCave_LowTideInnerRoom_EventScript_237028" + "script": "ShoalCave_LowTideInnerRoom_EventScript_ShoalShell3" }, { "type": "sign", @@ -134,7 +134,7 @@ "y": 13, "elevation": 5, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "ShoalCave_LowTideInnerRoom_EventScript_23705A" + "script": "ShoalCave_LowTideInnerRoom_EventScript_ShoalShell4" } ] } \ No newline at end of file diff --git a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc index c7f296319..089d38458 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc @@ -1,69 +1,69 @@ ShoalCave_LowTideInnerRoom_MapScripts:: @ 8236EF5 - map_script MAP_SCRIPT_ON_LOAD, ShoalCave_LowTideInnerRoom_MapScript1_236F16 + map_script MAP_SCRIPT_ON_LOAD, ShoalCave_LowTideInnerRoom_OnLoad map_script MAP_SCRIPT_ON_TRANSITION, ShoalCave_LowTideInnerRoom_OnTransition .byte 0 ShoalCave_LowTideInnerRoom_OnTransition: @ 8236F00 - goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_236F0E - goto ShoalCave_LowTideInnerRoom_EventScript_236F12 + goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_SetHighTide + goto ShoalCave_LowTideInnerRoom_EventScript_SetLowTide -ShoalCave_LowTideInnerRoom_EventScript_236F0E:: @ 8236F0E +ShoalCave_LowTideInnerRoom_EventScript_SetHighTide:: @ 8236F0E setmaplayoutindex LAYOUT_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM end -ShoalCave_LowTideInnerRoom_EventScript_236F12:: @ 8236F12 +ShoalCave_LowTideInnerRoom_EventScript_SetLowTide:: @ 8236F12 setmaplayoutindex LAYOUT_SHOAL_CAVE_LOW_TIDE_INNER_ROOM end -ShoalCave_LowTideInnerRoom_MapScript1_236F16: @ 8236F16 - call ShoalCave_LowTideInnerRoom_EventScript_236F1C +ShoalCave_LowTideInnerRoom_OnLoad: @ 8236F16 + call ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles end -ShoalCave_LowTideInnerRoom_EventScript_236F1C:: @ 8236F1C - goto_if_set FLAG_RECEIVED_SHOAL_SALT_1, ShoalCave_LowTideInnerRoom_EventScript_236F3D - goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_236F3D +ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles:: @ 8236F1C + goto_if_set FLAG_RECEIVED_SHOAL_SALT_1, ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles2 + goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles2 setmetatile 31, 8, METATILE_Cave_ShoalCave_DirtPile_Large, 1 - goto ShoalCave_LowTideInnerRoom_EventScript_236F3D + goto ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles2 end -ShoalCave_LowTideInnerRoom_EventScript_236F3D:: @ 8236F3D - goto_if_set FLAG_RECEIVED_SHOAL_SALT_2, ShoalCave_LowTideInnerRoom_EventScript_236F5E - goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_236F5E +ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles2:: @ 8236F3D + goto_if_set FLAG_RECEIVED_SHOAL_SALT_2, ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles3 + goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles3 setmetatile 14, 26, METATILE_Cave_ShoalCave_DirtPile_Large, 1 - goto ShoalCave_LowTideInnerRoom_EventScript_236F5E + goto ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles3 end -ShoalCave_LowTideInnerRoom_EventScript_236F5E:: @ 8236F5E - goto_if_set FLAG_RECEIVED_SHOAL_SHELL_1, ShoalCave_LowTideInnerRoom_EventScript_236F76 +ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles3:: @ 8236F5E + goto_if_set FLAG_RECEIVED_SHOAL_SHELL_1, ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles4 setmetatile 41, 20, METATILE_Cave_ShoalCave_BlueStone_Large, 1 - goto ShoalCave_LowTideInnerRoom_EventScript_236F76 + goto ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles4 end -ShoalCave_LowTideInnerRoom_EventScript_236F76:: @ 8236F76 - goto_if_set FLAG_RECEIVED_SHOAL_SHELL_2, ShoalCave_LowTideInnerRoom_EventScript_236F8E +ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles4:: @ 8236F76 + goto_if_set FLAG_RECEIVED_SHOAL_SHELL_2, ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles5 setmetatile 41, 10, METATILE_Cave_ShoalCave_BlueStone_Large, 1 - goto ShoalCave_LowTideInnerRoom_EventScript_236F8E + goto ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles5 end -ShoalCave_LowTideInnerRoom_EventScript_236F8E:: @ 8236F8E - goto_if_set FLAG_RECEIVED_SHOAL_SHELL_3, ShoalCave_LowTideInnerRoom_EventScript_236FA6 +ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles5:: @ 8236F8E + goto_if_set FLAG_RECEIVED_SHOAL_SHELL_3, ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles6 setmetatile 6, 9, METATILE_Cave_ShoalCave_BlueStone_Large, 1 - goto ShoalCave_LowTideInnerRoom_EventScript_236FA6 + goto ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles6 end -ShoalCave_LowTideInnerRoom_EventScript_236FA6:: @ 8236FA6 - goto_if_set FLAG_RECEIVED_SHOAL_SHELL_4, ShoalCave_LowTideInnerRoom_EventScript_236FB9 +ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles6:: @ 8236FA6 + goto_if_set FLAG_RECEIVED_SHOAL_SHELL_4, ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatilesEnd setmetatile 16, 13, METATILE_Cave_ShoalCave_BlueStone_Large, 1 return -ShoalCave_LowTideInnerRoom_EventScript_236FB9:: @ 8236FB9 +ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatilesEnd:: @ 8236FB9 return -ShoalCave_LowTideInnerRoom_EventScript_236FBA:: @ 8236FBA +ShoalCave_LowTideInnerRoom_EventScript_ShoalShell1:: @ 8236FBA lockall - goto_if_set FLAG_RECEIVED_SHOAL_SHELL_1, ShoalCave_LowTideInnerRoom_EventScript_236FEC + goto_if_set FLAG_RECEIVED_SHOAL_SHELL_1, ShoalCave_LowTideInnerRoom_EventScript_ReceivedShoalShell giveitem_std ITEM_SHOAL_SHELL - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 41, 20, METATILE_Cave_ShoalCave_BlueStone_Small, 0 special DrawWholeMapView @@ -71,16 +71,16 @@ ShoalCave_LowTideInnerRoom_EventScript_236FBA:: @ 8236FBA releaseall end -ShoalCave_LowTideInnerRoom_EventScript_236FEC:: @ 8236FEC - msgbox ShoalCave_LowTideInnerRoom_Text_2A81A8, MSGBOX_DEFAULT +ShoalCave_LowTideInnerRoom_EventScript_ReceivedShoalShell:: @ 8236FEC + msgbox ShoalCave_Text_WasShoallShellNowNothing, MSGBOX_DEFAULT releaseall end -ShoalCave_LowTideInnerRoom_EventScript_236FF6:: @ 8236FF6 +ShoalCave_LowTideInnerRoom_EventScript_ShoalShell2:: @ 8236FF6 lockall - goto_if_set FLAG_RECEIVED_SHOAL_SHELL_2, ShoalCave_LowTideInnerRoom_EventScript_236FEC + goto_if_set FLAG_RECEIVED_SHOAL_SHELL_2, ShoalCave_LowTideInnerRoom_EventScript_ReceivedShoalShell giveitem_std ITEM_SHOAL_SHELL - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 41, 10, METATILE_Cave_ShoalCave_BlueStone_Small, 0 special DrawWholeMapView @@ -88,11 +88,11 @@ ShoalCave_LowTideInnerRoom_EventScript_236FF6:: @ 8236FF6 releaseall end -ShoalCave_LowTideInnerRoom_EventScript_237028:: @ 8237028 +ShoalCave_LowTideInnerRoom_EventScript_ShoalShell3:: @ 8237028 lockall - goto_if_set FLAG_RECEIVED_SHOAL_SHELL_3, ShoalCave_LowTideInnerRoom_EventScript_236FEC + goto_if_set FLAG_RECEIVED_SHOAL_SHELL_3, ShoalCave_LowTideInnerRoom_EventScript_ReceivedShoalShell giveitem_std ITEM_SHOAL_SHELL - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 6, 9, METATILE_Cave_ShoalCave_BlueStone_Small, 0 special DrawWholeMapView @@ -100,11 +100,11 @@ ShoalCave_LowTideInnerRoom_EventScript_237028:: @ 8237028 releaseall end -ShoalCave_LowTideInnerRoom_EventScript_23705A:: @ 823705A +ShoalCave_LowTideInnerRoom_EventScript_ShoalShell4:: @ 823705A lockall - goto_if_set FLAG_RECEIVED_SHOAL_SHELL_4, ShoalCave_LowTideInnerRoom_EventScript_236FEC + goto_if_set FLAG_RECEIVED_SHOAL_SHELL_4, ShoalCave_LowTideInnerRoom_EventScript_ReceivedShoalShell giveitem_std ITEM_SHOAL_SHELL - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 16, 13, METATILE_Cave_ShoalCave_BlueStone_Small, 0 special DrawWholeMapView @@ -112,11 +112,11 @@ ShoalCave_LowTideInnerRoom_EventScript_23705A:: @ 823705A releaseall end -ShoalCave_LowTideInnerRoom_EventScript_23708C:: @ 823708C +ShoalCave_LowTideInnerRoom_EventScript_ShoalSalt1:: @ 823708C lockall - goto_if_set FLAG_RECEIVED_SHOAL_SALT_1, ShoalCave_LowTideInnerRoom_EventScript_2370BE + goto_if_set FLAG_RECEIVED_SHOAL_SALT_1, ShoalCave_LowTideInnerRoom_EventScript_ReceivedShoalSalt giveitem_std ITEM_SHOAL_SALT - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 31, 8, METATILE_Cave_ShoalCave_DirtPile_Small, 0 special DrawWholeMapView @@ -124,16 +124,16 @@ ShoalCave_LowTideInnerRoom_EventScript_23708C:: @ 823708C releaseall end -ShoalCave_LowTideInnerRoom_EventScript_2370BE:: @ 82370BE - msgbox ShoalCave_LowTideInnerRoom_Text_2A8169, MSGBOX_DEFAULT +ShoalCave_LowTideInnerRoom_EventScript_ReceivedShoalSalt:: @ 82370BE + msgbox ShoalCave_Text_WasShoalSaltNowNothing, MSGBOX_DEFAULT releaseall end -ShoalCave_LowTideInnerRoom_EventScript_2370C8:: @ 82370C8 +ShoalCave_LowTideInnerRoom_EventScript_ShoalSalt2:: @ 82370C8 lockall - goto_if_set FLAG_RECEIVED_SHOAL_SALT_2, ShoalCave_LowTideInnerRoom_EventScript_2370BE + goto_if_set FLAG_RECEIVED_SHOAL_SALT_2, ShoalCave_LowTideInnerRoom_EventScript_ReceivedShoalSalt giveitem_std ITEM_SHOAL_SALT - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 14, 26, METATILE_Cave_ShoalCave_DirtPile_Small, 0 special DrawWholeMapView diff --git a/data/maps/ShoalCave_LowTideLowerRoom/map.json b/data/maps/ShoalCave_LowTideLowerRoom/map.json index fad5ddc00..6e8cbe8c9 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/map.json +++ b/data/maps/ShoalCave_LowTideLowerRoom/map.json @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "ShoalCave_LowTideLowerRoom_EventScript_2371B2", + "script": "ShoalCave_LowTideLowerRoom_EventScript_BlackBelt", "flag": "0" } ], @@ -79,7 +79,7 @@ "y": 2, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "ShoalCave_LowTideLowerRoom_EventScript_237176" + "script": "ShoalCave_LowTideLowerRoom_EventScript_ShoalSalt4" } ] } \ No newline at end of file diff --git a/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc index 8492afe5b..2cbf8138d 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc @@ -1,60 +1,60 @@ ShoalCave_LowTideLowerRoom_MapScripts:: @ 8237156 - map_script MAP_SCRIPT_ON_LOAD, ShoalCave_LowTideLowerRoom_MapScript1_23715C + map_script MAP_SCRIPT_ON_LOAD, ShoalCave_LowTideLowerRoom_OnLoad .byte 0 -ShoalCave_LowTideLowerRoom_MapScript1_23715C: @ 823715C - call ShoalCave_LowTideLowerRoom_EventScript_237162 +ShoalCave_LowTideLowerRoom_OnLoad: @ 823715C + call ShoalCave_LowTideLowerRoom_EventScript_SetShoalItemMetatiles end -ShoalCave_LowTideLowerRoom_EventScript_237162:: @ 8237162 - goto_if_set FLAG_RECEIVED_SHOAL_SALT_4, ShoalCave_LowTideLowerRoom_EventScript_237175 - setmetatile 18, 2, 856, 1 +ShoalCave_LowTideLowerRoom_EventScript_SetShoalItemMetatiles:: @ 8237162 + goto_if_set FLAG_RECEIVED_SHOAL_SALT_4, ShoalCave_LowTideLowerRoom_EventScript_SetShoalItemMetatilesEnd + setmetatile 18, 2, METATILE_Cave_ShoalCave_DirtPile_Large, 1 return -ShoalCave_LowTideLowerRoom_EventScript_237175:: @ 8237175 +ShoalCave_LowTideLowerRoom_EventScript_SetShoalItemMetatilesEnd:: @ 8237175 return -ShoalCave_LowTideLowerRoom_EventScript_237176:: @ 8237176 +ShoalCave_LowTideLowerRoom_EventScript_ShoalSalt4:: @ 8237176 lockall - goto_if_set FLAG_RECEIVED_SHOAL_SALT_4, ShoalCave_LowTideLowerRoom_EventScript_2371A8 + goto_if_set FLAG_RECEIVED_SHOAL_SALT_4, ShoalCave_LowTideLowerRoom_EventScript_ReceivedShoalSalt giveitem_std ITEM_SHOAL_SALT - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull - setmetatile 18, 2, 858, 0 + setmetatile 18, 2, METATILE_Cave_ShoalCave_DirtPile_Small, 0 special DrawWholeMapView setflag FLAG_RECEIVED_SHOAL_SALT_4 releaseall end -ShoalCave_LowTideLowerRoom_EventScript_2371A8:: @ 82371A8 - msgbox ShoalCave_LowTideLowerRoom_Text_2A8169, MSGBOX_DEFAULT +ShoalCave_LowTideLowerRoom_EventScript_ReceivedShoalSalt:: @ 82371A8 + msgbox ShoalCave_Text_WasShoalSaltNowNothing, MSGBOX_DEFAULT releaseall end -ShoalCave_LowTideLowerRoom_EventScript_2371B2:: @ 82371B2 +ShoalCave_LowTideLowerRoom_EventScript_BlackBelt:: @ 82371B2 lock faceplayer - goto_if_set FLAG_RECEIVED_FOCUS_BAND, ShoalCave_LowTideLowerRoom_EventScript_2371E1 - msgbox ShoalCave_LowTideLowerRoom_Text_2371EB, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_FOCUS_BAND, ShoalCave_LowTideLowerRoom_EventScript_ReceivedFocusBand + msgbox ShoalCave_LowTideLowerRoom_Text_CanOvercomeColdWithFocus, MSGBOX_DEFAULT giveitem_std ITEM_FOCUS_BAND - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_FOCUS_BAND release end -ShoalCave_LowTideLowerRoom_EventScript_2371E1:: @ 82371E1 - msgbox ShoalCave_LowTideLowerRoom_Text_23728D, MSGBOX_DEFAULT +ShoalCave_LowTideLowerRoom_EventScript_ReceivedFocusBand:: @ 82371E1 + msgbox ShoalCave_LowTideLowerRoom_Text_EverythingStartsWithFocus, MSGBOX_DEFAULT release end -ShoalCave_LowTideLowerRoom_Text_2371EB: @ 82371EB +ShoalCave_LowTideLowerRoom_Text_CanOvercomeColdWithFocus: @ 82371EB .string "The penetrating cold around these\n" .string "parts is an impediment to training.\p" .string "But with focus, one can overcome!\p" .string "With this FOCUS BAND, buckle down and\n" .string "withstand the cold!$" -ShoalCave_LowTideLowerRoom_Text_23728D: @ 823728D +ShoalCave_LowTideLowerRoom_Text_EverythingStartsWithFocus: @ 823728D .string "Everything starts with focus!$" diff --git a/data/maps/ShoalCave_LowTideStairsRoom/map.json b/data/maps/ShoalCave_LowTideStairsRoom/map.json index 4da33c163..7280cf140 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/map.json +++ b/data/maps/ShoalCave_LowTideStairsRoom/map.json @@ -52,7 +52,7 @@ "y": 11, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "ShoalCave_LowTideStairsRoom_EventScript_23711A" + "script": "ShoalCave_LowTideStairsRoom_EventScript_ShoalSalt3" } ] } \ No newline at end of file diff --git a/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc index 74b653a5f..32ec5b298 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc @@ -1,33 +1,33 @@ ShoalCave_LowTideStairsRoom_MapScripts:: @ 82370FA - map_script MAP_SCRIPT_ON_LOAD, ShoalCave_LowTideStairsRoom_MapScript1_237100 + map_script MAP_SCRIPT_ON_LOAD, ShoalCave_LowTideStairsRoom_OnLoad .byte 0 -ShoalCave_LowTideStairsRoom_MapScript1_237100: @ 8237100 - call ShoalCave_LowTideStairsRoom_EventScript_237106 +ShoalCave_LowTideStairsRoom_OnLoad: @ 8237100 + call ShoalCave_LowTideStairsRoom_EventScript_SetShoalItemMetatiles end -ShoalCave_LowTideStairsRoom_EventScript_237106:: @ 8237106 - goto_if_set FLAG_RECEIVED_SHOAL_SALT_3, ShoalCave_LowTideStairsRoom_EventScript_237119 - setmetatile 11, 11, 856, 1 +ShoalCave_LowTideStairsRoom_EventScript_SetShoalItemMetatiles:: @ 8237106 + goto_if_set FLAG_RECEIVED_SHOAL_SALT_3, ShoalCave_LowTideStairsRoom_EventScript_SetShoalItemMetatilesEnd + setmetatile 11, 11, METATILE_Cave_ShoalCave_DirtPile_Large, 1 return -ShoalCave_LowTideStairsRoom_EventScript_237119:: @ 8237119 +ShoalCave_LowTideStairsRoom_EventScript_SetShoalItemMetatilesEnd:: @ 8237119 return -ShoalCave_LowTideStairsRoom_EventScript_23711A:: @ 823711A +ShoalCave_LowTideStairsRoom_EventScript_ShoalSalt3:: @ 823711A lockall - goto_if_set FLAG_RECEIVED_SHOAL_SALT_3, ShoalCave_LowTideStairsRoom_EventScript_23714C + goto_if_set FLAG_RECEIVED_SHOAL_SALT_3, ShoalCave_LowTideStairsRoom_EventScript_ReceivedShoalSalt giveitem_std ITEM_SHOAL_SALT - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull - setmetatile 11, 11, 858, 0 + setmetatile 11, 11, METATILE_Cave_ShoalCave_DirtPile_Small, 0 special DrawWholeMapView setflag FLAG_RECEIVED_SHOAL_SALT_3 releaseall end -ShoalCave_LowTideStairsRoom_EventScript_23714C:: @ 823714C - msgbox ShoalCave_LowTideStairsRoom_Text_2A8169, MSGBOX_DEFAULT +ShoalCave_LowTideStairsRoom_EventScript_ReceivedShoalSalt:: @ 823714C + msgbox ShoalCave_Text_WasShoalSaltNowNothing, MSGBOX_DEFAULT releaseall end diff --git a/data/text/shoal_cave.inc b/data/text/shoal_cave.inc index 52ab9fc48..4a15e7498 100644 --- a/data/text/shoal_cave.inc +++ b/data/text/shoal_cave.inc @@ -1,4 +1,4 @@ -ShoalCave_LowTideEntranceRoom_Text_2A7E0E: @ 82A7E0E +ShoalCave_LowTideEntranceRoom_Text_AreYouPlanningOnGoingInThere: @ 82A7E0E .string "Are you planning on going deep\n" .string "in there?\p" .string "How about bringing me back some\n" @@ -6,27 +6,27 @@ ShoalCave_LowTideEntranceRoom_Text_2A7E0E: @ 82A7E0E .string "I can make you something good if\n" .string "you bring me the ingredients.$" -ShoalCave_LowTideEntranceRoom_Text_2A7EB3: @ 82A7EB3 +ShoalCave_LowTideEntranceRoom_Text_BringMe4ShoalSaltAndShells: @ 82A7EB3 .string "If you bring me four each of the\n" .string "SHOAL SALT and SHOAL SHELLS,\l" .string "I can make you a SHELL BELL…\p" .string "You can get those ingredients\n" .string "every day.$" -ShoalCave_LowTideEntranceRoom_Text_2A7F37: @ 82A7F37 +ShoalCave_LowTideEntranceRoom_Text_WouldYouLikeShellBell: @ 82A7F37 .string "Oh, hey! SHOAL SALT and SHOAL SHELLS!\n" .string "And enough of them, too!\p" .string "Would you like me to make you\n" .string "a SHELL BELL with them?$" -ShoalCave_LowTideEntranceRoom_Text_2A7FAC: @ 82A7FAC +ShoalCave_LowTideEntranceRoom_Text_MakeShellBellRightAway: @ 82A7FAC .string "All righty, then! I'll make you\n" .string "a SHELL BELL right away.\p" .string "… … … … … … … …\n" .string "… … … … … … … …\p" .string "There! Done!$" -ShoalCave_LowTideEntranceRoom_Text_2A8012: @ 82A8012 +ShoalCave_LowTideEntranceRoom_Text_ExplainShellBell: @ 82A8012 .string "Have a POKéMON hold on to that.\n" .string "It'll love it, that's for certain.\p" .string "Why, the SHELL BELL's chime…\n" @@ -34,22 +34,20 @@ ShoalCave_LowTideEntranceRoom_Text_2A8012: @ 82A8012 .string "You can get its ingredients every day,\n" .string "so I can make you more.$" -ShoalCave_LowTideEntranceRoom_Text_2A80C6: @ 82A80C6 +ShoalCave_LowTideEntranceRoom_Text_WantedToMakeShellBell: @ 82A80C6 .string "Oh… Is that so…\n" .string "I wanted to make a SHELL BELL…$" -ShoalCave_LowTideEntranceRoom_Text_2A80F5: @ 82A80F5 +ShoalCave_LowTideEntranceRoom_Text_NoSpaceInYourBag: @ 82A80F5 .string "You don't have space in your BAG\n" .string "if I were to make it for you.\p" .string "You should make room and come back\n" .string "for a SHELL BELL.$" -ShoalCave_LowTideInnerRoom_Text_2A8169: @ 82A8169 -ShoalCave_LowTideLowerRoom_Text_2A8169: @ 82A8169 -ShoalCave_LowTideStairsRoom_Text_2A8169: @ 82A8169 +ShoalCave_Text_WasShoalSaltNowNothing: @ 82A8169 .string "There was some SHOAL SALT here.\n" .string "But, there's nothing here now.$" -ShoalCave_LowTideInnerRoom_Text_2A81A8: @ 82A81A8 +ShoalCave_Text_WasShoallShellNowNothing: @ 82A81A8 .string "There was a SHOAL SHELL here.\n" .string "But, there's nothing here now.$" From 35ed8de51b0784e44560237248fc516f96e835df Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 7 Nov 2019 12:37:11 -0500 Subject: [PATCH 22/40] Fix Battle Colosseum names --- data/event_scripts.s | 4 +-- .../border.bin | 0 .../map.bin | 0 .../border.bin | 0 .../map.bin | 0 data/layouts/layouts.json | 16 ++++----- .../map.json | 12 +++---- data/maps/BattleColosseum2P/scripts.inc | 3 ++ .../map.json | 14 ++++---- data/maps/BattleColosseum4P/scripts.inc | 3 ++ data/maps/DoubleBattleColosseum/scripts.inc | 3 -- data/maps/SingleBattleColosseum/scripts.inc | 3 -- data/maps/map_groups.json | 4 +-- data/scripts/cable_club.inc | 34 +++++++++---------- data/text/cable_club.inc | 2 +- include/constants/layouts.h | 4 +-- include/constants/map_groups.h | 4 +-- src/field_specials.c | 4 +-- src/overworld.c | 24 ++++++------- src/save_location.c | 4 +-- src/union_room.c | 6 ++-- 21 files changed, 72 insertions(+), 72 deletions(-) rename data/layouts/{DoubleBattleColosseum => BattleColosseum2P}/border.bin (100%) rename data/layouts/{SingleBattleColosseum => BattleColosseum2P}/map.bin (100%) rename data/layouts/{SingleBattleColosseum => BattleColosseum4P}/border.bin (100%) rename data/layouts/{DoubleBattleColosseum => BattleColosseum4P}/map.bin (100%) rename data/maps/{SingleBattleColosseum => BattleColosseum2P}/map.json (80%) create mode 100644 data/maps/BattleColosseum2P/scripts.inc rename data/maps/{DoubleBattleColosseum => BattleColosseum4P}/map.json (79%) create mode 100644 data/maps/BattleColosseum4P/scripts.inc delete mode 100644 data/maps/DoubleBattleColosseum/scripts.inc delete mode 100644 data/maps/SingleBattleColosseum/scripts.inc diff --git a/data/event_scripts.s b/data/event_scripts.s index b1e637bf0..79ca1ea8e 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -436,10 +436,10 @@ gStdScripts_End:: @ 81DC2CC .include "data/maps/AlteringCave/scripts.inc" .include "data/maps/MeteorFalls_StevensCave/scripts.inc" .include "data/scripts/shared_secret_base.inc" - .include "data/maps/SingleBattleColosseum/scripts.inc" + .include "data/maps/BattleColosseum2P/scripts.inc" .include "data/maps/TradeCenter/scripts.inc" .include "data/maps/RecordCorner/scripts.inc" - .include "data/maps/DoubleBattleColosseum/scripts.inc" + .include "data/maps/BattleColosseum4P/scripts.inc" .include "data/maps/LinkContestRoom1/scripts.inc" .include "data/maps/UnknownLinkContestRoom_25_29/scripts.inc" .include "data/maps/UnknownLinkContestRoom_25_30/scripts.inc" diff --git a/data/layouts/DoubleBattleColosseum/border.bin b/data/layouts/BattleColosseum2P/border.bin similarity index 100% rename from data/layouts/DoubleBattleColosseum/border.bin rename to data/layouts/BattleColosseum2P/border.bin diff --git a/data/layouts/SingleBattleColosseum/map.bin b/data/layouts/BattleColosseum2P/map.bin similarity index 100% rename from data/layouts/SingleBattleColosseum/map.bin rename to data/layouts/BattleColosseum2P/map.bin diff --git a/data/layouts/SingleBattleColosseum/border.bin b/data/layouts/BattleColosseum4P/border.bin similarity index 100% rename from data/layouts/SingleBattleColosseum/border.bin rename to data/layouts/BattleColosseum4P/border.bin diff --git a/data/layouts/DoubleBattleColosseum/map.bin b/data/layouts/BattleColosseum4P/map.bin similarity index 100% rename from data/layouts/DoubleBattleColosseum/map.bin rename to data/layouts/BattleColosseum4P/map.bin diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json index 353b9a284..5a696d5e0 100644 --- a/data/layouts/layouts.json +++ b/data/layouts/layouts.json @@ -2202,14 +2202,14 @@ "blockdata_filepath": "data/layouts/SecretBase_Shrub4/map.bin" }, { - "id": "LAYOUT_SINGLE_BATTLE_COLOSSEUM", - "name": "SingleBattleColosseum_Layout", + "id": "LAYOUT_BATTLE_COLOSSEUM_2P", + "name": "BattleColosseum2P_Layout", "width": 14, "height": 9, "primary_tileset": "gTileset_Building", "secondary_tileset": "gTileset_CableClub", - "border_filepath": "data/layouts/SingleBattleColosseum/border.bin", - "blockdata_filepath": "data/layouts/SingleBattleColosseum/map.bin" + "border_filepath": "data/layouts/BattleColosseum2P/border.bin", + "blockdata_filepath": "data/layouts/BattleColosseum2P/map.bin" }, { "id": "LAYOUT_TRADE_CENTER", @@ -2232,14 +2232,14 @@ "blockdata_filepath": "data/layouts/RecordCorner/map.bin" }, { - "id": "LAYOUT_DOUBLE_BATTLE_COLOSSEUM", - "name": "DoubleBattleColosseum_Layout", + "id": "LAYOUT_BATTLE_COLOSSEUM_4P", + "name": "BattleColosseum4P_Layout", "width": 14, "height": 9, "primary_tileset": "gTileset_Building", "secondary_tileset": "gTileset_CableClub", - "border_filepath": "data/layouts/DoubleBattleColosseum/border.bin", - "blockdata_filepath": "data/layouts/DoubleBattleColosseum/map.bin" + "border_filepath": "data/layouts/BattleColosseum4P/border.bin", + "blockdata_filepath": "data/layouts/BattleColosseum4P/map.bin" }, { "id": "LAYOUT_LINK_CONTEST_ROOM1", diff --git a/data/maps/SingleBattleColosseum/map.json b/data/maps/BattleColosseum2P/map.json similarity index 80% rename from data/maps/SingleBattleColosseum/map.json rename to data/maps/BattleColosseum2P/map.json index f63464424..18df18491 100644 --- a/data/maps/SingleBattleColosseum/map.json +++ b/data/maps/BattleColosseum2P/map.json @@ -1,7 +1,7 @@ { - "id": "MAP_SINGLE_BATTLE_COLOSSEUM", - "name": "SingleBattleColosseum", - "layout": "LAYOUT_SINGLE_BATTLE_COLOSSEUM", + "id": "MAP_BATTLE_COLOSSEUM_2P", + "name": "BattleColosseum2P", + "layout": "LAYOUT_BATTLE_COLOSSEUM_2P", "music": "MUS_RAINBOW", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SingleBattleColosseum_EventScript_Attendant", + "script": "BattleColosseum2P_EventScript_Attendant", "flag": "0" } ], @@ -52,7 +52,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": "0", - "script": "EventScript_SingleBattleColosseum_PlayerSpot0" + "script": "EventScript_BattleColosseum2P_PlayerSpot0" }, { "type": "trigger", @@ -61,7 +61,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": "0", - "script": "EventScript_SingleBattleColosseum_PlayerSpot1" + "script": "EventScript_BattleColosseum2P_PlayerSpot1" } ], "bg_events": [] diff --git a/data/maps/BattleColosseum2P/scripts.inc b/data/maps/BattleColosseum2P/scripts.inc new file mode 100644 index 000000000..efa01af6c --- /dev/null +++ b/data/maps/BattleColosseum2P/scripts.inc @@ -0,0 +1,3 @@ +BattleColosseum2P_MapScripts:: @ 823B77D + .byte 0 + diff --git a/data/maps/DoubleBattleColosseum/map.json b/data/maps/BattleColosseum4P/map.json similarity index 79% rename from data/maps/DoubleBattleColosseum/map.json rename to data/maps/BattleColosseum4P/map.json index 172bb3fdc..d17851aaf 100644 --- a/data/maps/DoubleBattleColosseum/map.json +++ b/data/maps/BattleColosseum4P/map.json @@ -1,7 +1,7 @@ { - "id": "MAP_DOUBLE_BATTLE_COLOSSEUM", - "name": "DoubleBattleColosseum", - "layout": "LAYOUT_DOUBLE_BATTLE_COLOSSEUM", + "id": "MAP_BATTLE_COLOSSEUM_4P", + "name": "BattleColosseum4P", + "layout": "LAYOUT_BATTLE_COLOSSEUM_4P", "music": "MUS_RAINBOW", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, @@ -52,7 +52,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": "0", - "script": "EventScript_DoubleBattleColosseum_PlayerSpot0" + "script": "EventScript_BattleColosseum4P_PlayerSpot0" }, { "type": "trigger", @@ -61,7 +61,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": "0", - "script": "EventScript_DoubleBattleColosseum_PlayerSpot2" + "script": "EventScript_BattleColosseum4P_PlayerSpot2" }, { "type": "trigger", @@ -70,7 +70,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": "0", - "script": "EventScript_DoubleBattleColosseum_PlayerSpot1" + "script": "EventScript_BattleColosseum4P_PlayerSpot1" }, { "type": "trigger", @@ -79,7 +79,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": "0", - "script": "EventScript_DoubleBattleColosseum_PlayerSpot3" + "script": "EventScript_BattleColosseum4P_PlayerSpot3" } ], "bg_events": [] diff --git a/data/maps/BattleColosseum4P/scripts.inc b/data/maps/BattleColosseum4P/scripts.inc new file mode 100644 index 000000000..b1733aecd --- /dev/null +++ b/data/maps/BattleColosseum4P/scripts.inc @@ -0,0 +1,3 @@ +BattleColosseum4P_MapScripts:: @ 823B780 + .byte 0 + diff --git a/data/maps/DoubleBattleColosseum/scripts.inc b/data/maps/DoubleBattleColosseum/scripts.inc deleted file mode 100644 index ac64377ae..000000000 --- a/data/maps/DoubleBattleColosseum/scripts.inc +++ /dev/null @@ -1,3 +0,0 @@ -DoubleBattleColosseum_MapScripts:: @ 823B780 - .byte 0 - diff --git a/data/maps/SingleBattleColosseum/scripts.inc b/data/maps/SingleBattleColosseum/scripts.inc deleted file mode 100644 index 06ed3ef16..000000000 --- a/data/maps/SingleBattleColosseum/scripts.inc +++ /dev/null @@ -1,3 +0,0 @@ -SingleBattleColosseum_MapScripts:: @ 823B77D - .byte 0 - diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json index 7b78a80db..74746e0c4 100644 --- a/data/maps/map_groups.json +++ b/data/maps/map_groups.json @@ -456,10 +456,10 @@ "SecretBase_YellowCave4", "SecretBase_Tree4", "SecretBase_Shrub4", - "SingleBattleColosseum", + "BattleColosseum2P", "TradeCenter", "RecordCorner", - "DoubleBattleColosseum", + "BattleColosseum4P", "LinkContestRoom1", "UnknownLinkContestRoom_25_29", "UnknownLinkContestRoom_25_30", diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index ebb2e6ef0..9d3bccaf9 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -388,9 +388,9 @@ CableClub_EventScript_EnterColosseum:: @ 8276FBD waitdooranim release compare VAR_0x8004, USING_MULTI_BATTLE - goto_if_eq CableClub_EventScript_WarpToDoubleColosseum + goto_if_eq CableClub_EventScript_WarpTo4PColosseum special SetCableClubWarp - warp MAP_SINGLE_BATTLE_COLOSSEUM, 255, 6, 8 + warp MAP_BATTLE_COLOSSEUM_2P, 255, 6, 8 special sub_80AF948 waitstate end @@ -401,9 +401,9 @@ CableClub_EventScript_PlayerApproachLinkRoomRight:: @ 827702B waitmovement 0 return -CableClub_EventScript_WarpToDoubleColosseum:: @ 8277036 +CableClub_EventScript_WarpTo4PColosseum:: @ 8277036 special SetCableClubWarp - warp MAP_DOUBLE_BATTLE_COLOSSEUM, 255, 5, 8 + warp MAP_BATTLE_COLOSSEUM_4P, 255, 5, 8 special sub_80AF948 waitstate end @@ -710,63 +710,63 @@ EventScript_CableBoxResults:: @ 8277365 releaseall end -EventScript_SingleBattleColosseum_PlayerSpot0:: @ 8277374 +EventScript_BattleColosseum2P_PlayerSpot0:: @ 8277374 setvar VAR_0x8005, 0 special ColosseumPlayerSpotTriggered waitstate end -EventScript_SingleBattleColosseum_PlayerSpot1:: @ 827737E +EventScript_BattleColosseum2P_PlayerSpot1:: @ 827737E setvar VAR_0x8005, 1 special ColosseumPlayerSpotTriggered waitstate end -EventScript_DoubleBattleColosseum_PlayerSpot0:: @ 8277388 +EventScript_BattleColosseum4P_PlayerSpot0:: @ 8277388 fadescreen 1 special ChooseHalfPartyForBattle waitstate compare VAR_RESULT, 0 - goto_if_eq EventScript_DoubleBattleColosseum_CancelSpotTrigger + goto_if_eq EventScript_BattleColosseum4P_CancelSpotTrigger setvar VAR_0x8005, 0 special ColosseumPlayerSpotTriggered waitstate end -EventScript_DoubleBattleColosseum_PlayerSpot1:: @ 82773A3 +EventScript_BattleColosseum4P_PlayerSpot1:: @ 82773A3 fadescreen 1 special ChooseHalfPartyForBattle waitstate compare VAR_RESULT, 0 - goto_if_eq EventScript_DoubleBattleColosseum_CancelSpotTrigger + goto_if_eq EventScript_BattleColosseum4P_CancelSpotTrigger setvar VAR_0x8005, 1 special ColosseumPlayerSpotTriggered waitstate end -EventScript_DoubleBattleColosseum_PlayerSpot2:: @ 82773BE +EventScript_BattleColosseum4P_PlayerSpot2:: @ 82773BE fadescreen 1 special ChooseHalfPartyForBattle waitstate compare VAR_RESULT, 0 - goto_if_eq EventScript_DoubleBattleColosseum_CancelSpotTrigger + goto_if_eq EventScript_BattleColosseum4P_CancelSpotTrigger setvar VAR_0x8005, 2 special ColosseumPlayerSpotTriggered waitstate end -EventScript_DoubleBattleColosseum_PlayerSpot3:: @ 82773D9 +EventScript_BattleColosseum4P_PlayerSpot3:: @ 82773D9 fadescreen 1 special ChooseHalfPartyForBattle waitstate compare VAR_RESULT, 0 - goto_if_eq EventScript_DoubleBattleColosseum_CancelSpotTrigger + goto_if_eq EventScript_BattleColosseum4P_CancelSpotTrigger setvar VAR_0x8005, 3 special ColosseumPlayerSpotTriggered waitstate end -EventScript_DoubleBattleColosseum_CancelSpotTrigger:: @ 82773F4 +EventScript_BattleColosseum4P_CancelSpotTrigger:: @ 82773F4 end EventScript_TradeCenter_Chair0:: @ 82773F5 @@ -854,9 +854,9 @@ CableClub_EventScript_TooBusyToNotice:: @ 827749C closemessage end -SingleBattleColosseum_EventScript_Attendant:: @ 82774A6 +BattleColosseum2P_EventScript_Attendant:: @ 82774A6 special Script_FacePlayer - msgbox SingleBattleColosseum_Text_TakePlaceStartBattle, MSGBOX_DEFAULT + msgbox BattleColosseum2P_Text_TakePlaceStartBattle, MSGBOX_DEFAULT special Script_ClearHeldMovement closemessage end diff --git a/data/text/cable_club.inc b/data/text/cable_club.inc index 85e0e4edb..7e98d9fc7 100644 --- a/data/text/cable_club.inc +++ b/data/text/cable_club.inc @@ -123,7 +123,7 @@ CableClub_Text_GotToLookAtColoredTrainerCard: @ 827847B .string "TRAINER CARD!\p" .string "It's a {STR_VAR_2} card!$" -SingleBattleColosseum_Text_TakePlaceStartBattle: @ 82784B4 +BattleColosseum2P_Text_TakePlaceStartBattle: @ 82784B4 .string "Please take your place and start\n" .string "your battle.$" diff --git a/include/constants/layouts.h b/include/constants/layouts.h index d4819c46a..fd64196e0 100755 --- a/include/constants/layouts.h +++ b/include/constants/layouts.h @@ -221,10 +221,10 @@ #define LAYOUT_SECRET_BASE_YELLOW_CAVE4 218 #define LAYOUT_SECRET_BASE_TREE4 219 #define LAYOUT_SECRET_BASE_SHRUB4 220 -#define LAYOUT_SINGLE_BATTLE_COLOSSEUM 221 +#define LAYOUT_BATTLE_COLOSSEUM_2P 221 #define LAYOUT_TRADE_CENTER 222 #define LAYOUT_RECORD_CORNER 223 -#define LAYOUT_DOUBLE_BATTLE_COLOSSEUM 224 +#define LAYOUT_BATTLE_COLOSSEUM_4P 224 #define LAYOUT_LINK_CONTEST_ROOM1 225 #define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_29 226 #define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_30 227 diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h index 802c381b5..63717c92c 100755 --- a/include/constants/map_groups.h +++ b/include/constants/map_groups.h @@ -422,10 +422,10 @@ #define MAP_SECRET_BASE_YELLOW_CAVE4 (21 | (25 << 8)) #define MAP_SECRET_BASE_TREE4 (22 | (25 << 8)) #define MAP_SECRET_BASE_SHRUB4 (23 | (25 << 8)) -#define MAP_SINGLE_BATTLE_COLOSSEUM (24 | (25 << 8)) +#define MAP_BATTLE_COLOSSEUM_2P (24 | (25 << 8)) #define MAP_TRADE_CENTER (25 | (25 << 8)) #define MAP_RECORD_CORNER (26 | (25 << 8)) -#define MAP_DOUBLE_BATTLE_COLOSSEUM (27 | (25 << 8)) +#define MAP_BATTLE_COLOSSEUM_4P (27 | (25 << 8)) #define MAP_LINK_CONTEST_ROOM1 (28 | (25 << 8)) #define MAP_UNKNOWN_LINK_CONTEST_ROOM_25_29 (29 | (25 << 8)) #define MAP_UNKNOWN_LINK_CONTEST_ROOM_25_30 (30 | (25 << 8)) diff --git a/src/field_specials.c b/src/field_specials.c index 65bc3a095..08daadc4f 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -3998,10 +3998,10 @@ bool8 InPokemonCenter(void) MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F, MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F, - MAP_SINGLE_BATTLE_COLOSSEUM, + MAP_BATTLE_COLOSSEUM_2P, MAP_TRADE_CENTER, MAP_RECORD_CORNER, - MAP_DOUBLE_BATTLE_COLOSSEUM, + MAP_BATTLE_COLOSSEUM_4P, 0xFFFF }; diff --git a/src/overworld.c b/src/overworld.c index 55afe2fcf..42a39d03e 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -88,16 +88,16 @@ extern const u8 EventScript_DoLinkRoomExit[]; extern const u8 CableClub_EventScript_TooBusyToNotice[]; extern const u8 CableClub_EventScript_ReadTrainerCard[]; extern const u8 CableClub_EventScript_ReadTrainerCardColored[]; -extern const u8 EventScript_DoubleBattleColosseum_PlayerSpot0[]; -extern const u8 EventScript_DoubleBattleColosseum_PlayerSpot1[]; -extern const u8 EventScript_DoubleBattleColosseum_PlayerSpot2[]; -extern const u8 EventScript_DoubleBattleColosseum_PlayerSpot3[]; +extern const u8 EventScript_BattleColosseum4P_PlayerSpot0[]; +extern const u8 EventScript_BattleColosseum4P_PlayerSpot1[]; +extern const u8 EventScript_BattleColosseum4P_PlayerSpot2[]; +extern const u8 EventScript_BattleColosseum4P_PlayerSpot3[]; extern const u8 EventScript_RecordCenter_Spot0[]; extern const u8 EventScript_RecordCenter_Spot1[]; extern const u8 EventScript_RecordCenter_Spot2[]; extern const u8 EventScript_RecordCenter_Spot3[]; -extern const u8 EventScript_SingleBattleColosseum_PlayerSpot0[]; -extern const u8 EventScript_SingleBattleColosseum_PlayerSpot1[]; +extern const u8 EventScript_BattleColosseum2P_PlayerSpot0[]; +extern const u8 EventScript_BattleColosseum2P_PlayerSpot1[]; extern const u8 EventScript_TradeCenter_Chair1[]; extern const u8 EventScript_TradeCenter_Chair0[]; extern const u8 EventScript_ConfirmLeaveTradeRoom[]; @@ -2781,13 +2781,13 @@ static const u8 *TryInteractWithPlayer(struct TradeRoomPlayer *player) // these event scripts runs. static u16 GetDirectionForEventScript(const u8 *script) { - if (script == EventScript_DoubleBattleColosseum_PlayerSpot0) + if (script == EventScript_BattleColosseum4P_PlayerSpot0) return FACING_FORCED_RIGHT; - else if (script == EventScript_DoubleBattleColosseum_PlayerSpot1) + else if (script == EventScript_BattleColosseum4P_PlayerSpot1) return FACING_FORCED_LEFT; - else if (script == EventScript_DoubleBattleColosseum_PlayerSpot2) + else if (script == EventScript_BattleColosseum4P_PlayerSpot2) return FACING_FORCED_RIGHT; - else if (script == EventScript_DoubleBattleColosseum_PlayerSpot3) + else if (script == EventScript_BattleColosseum4P_PlayerSpot3) return FACING_FORCED_LEFT; else if (script == EventScript_RecordCenter_Spot0) return FACING_FORCED_RIGHT; @@ -2797,9 +2797,9 @@ static u16 GetDirectionForEventScript(const u8 *script) return FACING_FORCED_RIGHT; else if (script == EventScript_RecordCenter_Spot3) return FACING_FORCED_LEFT; - else if (script == EventScript_SingleBattleColosseum_PlayerSpot0) + else if (script == EventScript_BattleColosseum2P_PlayerSpot0) return FACING_FORCED_RIGHT; - else if (script == EventScript_SingleBattleColosseum_PlayerSpot1) + else if (script == EventScript_BattleColosseum2P_PlayerSpot1) return FACING_FORCED_LEFT; else if (script == EventScript_TradeCenter_Chair0) return FACING_FORCED_RIGHT; diff --git a/src/save_location.c b/src/save_location.c index 2443b3161..b3cb9b4fd 100644 --- a/src/save_location.c +++ b/src/save_location.c @@ -52,10 +52,10 @@ static const u16 sSaveLocationPokeCenterList[] = MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F, MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F, MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F, - MAP_SINGLE_BATTLE_COLOSSEUM, + MAP_BATTLE_COLOSSEUM_2P, MAP_TRADE_CENTER, MAP_RECORD_CORNER, - MAP_DOUBLE_BATTLE_COLOSSEUM, + MAP_BATTLE_COLOSSEUM_4P, 0xFFFF, }; diff --git a/src/union_room.c b/src/union_room.c index 5952b03eb..948468c00 100644 --- a/src/union_room.c +++ b/src/union_room.c @@ -1470,7 +1470,7 @@ void sub_801440C(u8 taskId) HealPlayerParty(); SavePlayerParty(); LoadPlayerBag(); - sub_8014304(MAP_GROUP(SINGLE_BATTLE_COLOSSEUM), MAP_NUM(SINGLE_BATTLE_COLOSSEUM), 6, 8, USING_SINGLE_BATTLE); + sub_8014304(MAP_GROUP(BATTLE_COLOSSEUM_2P), MAP_NUM(BATTLE_COLOSSEUM_2P), 6, 8, USING_SINGLE_BATTLE); SetMainCallback2(sub_8014384); break; case 2: @@ -1479,7 +1479,7 @@ void sub_801440C(u8 taskId) SavePlayerParty(); LoadPlayerBag(); sub_80143E4(gBlockSendBuffer, TRUE); - sub_8014304(MAP_GROUP(SINGLE_BATTLE_COLOSSEUM), MAP_NUM(SINGLE_BATTLE_COLOSSEUM), 6, 8, USING_DOUBLE_BATTLE); + sub_8014304(MAP_GROUP(BATTLE_COLOSSEUM_2P), MAP_NUM(BATTLE_COLOSSEUM_2P), 6, 8, USING_DOUBLE_BATTLE); SetMainCallback2(sub_8014384); break; case 3: @@ -1488,7 +1488,7 @@ void sub_801440C(u8 taskId) SavePlayerParty(); LoadPlayerBag(); sub_80143E4(gBlockSendBuffer, TRUE); - sub_8014304(MAP_GROUP(DOUBLE_BATTLE_COLOSSEUM), MAP_NUM(DOUBLE_BATTLE_COLOSSEUM), 5, 8, USING_MULTI_BATTLE); + sub_8014304(MAP_GROUP(BATTLE_COLOSSEUM_4P), MAP_NUM(BATTLE_COLOSSEUM_4P), 5, 8, USING_MULTI_BATTLE); SetMainCallback2(sub_8014384); break; case 4: From bae4a586d86ee432cf02dafed160747e7e4aff7e Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 7 Nov 2019 13:26:53 -0500 Subject: [PATCH 23/40] Document Hall of Fame scripts --- data/event_scripts.s | 22 ++++----- data/maps/EverGrandeCity/map.json | 28 +++++------ data/maps/EverGrandeCity/scripts.inc | 20 ++++---- data/maps/EverGrandeCity_Hall1/scripts.inc | 8 ++-- data/maps/EverGrandeCity_Hall2/scripts.inc | 8 ++-- data/maps/EverGrandeCity_Hall3/scripts.inc | 8 ++-- data/maps/EverGrandeCity_Hall4/scripts.inc | 8 ++-- data/maps/EverGrandeCity_Hall5/scripts.inc | 8 ++-- .../EverGrandeCity_HallOfFame/scripts.inc | 46 +++++++++---------- data/specials.inc | 4 +- include/save_location.h | 7 ++- src/field_specials.c | 2 +- src/save_location.c | 4 +- src/union_room.c | 3 +- 14 files changed, 91 insertions(+), 85 deletions(-) diff --git a/data/event_scripts.s b/data/event_scripts.s index b1e637bf0..b131d2cb5 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -647,12 +647,12 @@ Std_MsgboxAutoclose:: @ 8271494 .include "data/scripts/new_game.inc" @ Below seems to be hall_of_fame.inc and briney.inc together? -EverGrandeCity_HallOfFame_EventScript_2717C1:: @ 82717C1 - special sub_81AFDD0 +EverGrandeCity_HallOfFame_EventScript_SetGameClearFlags:: @ 82717C1 + special SetChampionSaveWarp setflag FLAG_IS_CHAMPION call EverGrandeCity_HallOfFame_EventScript_ResetDefeatedEventLegendaries compare VAR_FOSSIL_MANIAC_STATE, 0 - call_if_eq EverGrandeCity_HallOfFame_EventScript_271839 + call_if_eq EverGrandeCity_HallOfFame_EventScript_SetDesertUnderpassCommentReady clearflag FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS call EverGrandeCity_HallOfFame_EventScript_ResetEliteFour setflag FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY @@ -666,13 +666,13 @@ EverGrandeCity_HallOfFame_EventScript_2717C1:: @ 82717C1 setflag FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS clearflag FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION setflag FLAG_HIDE_LILYCOVE_CITY_RIVAL - special sub_813BA60 - call_if_unset FLAG_RECEIVED_SS_TICKET, EverGrandeCity_HallOfFame_EventScript_271843 - call_if_unset FLAG_RECEIVED_BELDUM, EverGrandeCity_HallOfFame_EventScript_27183F + special UpdateTrainerFanClubGameClear + call_if_unset FLAG_RECEIVED_SS_TICKET, EverGrandeCity_HallOfFame_EventScript_ReadyReceiveSSTicketEvent + call_if_unset FLAG_RECEIVED_BELDUM, EverGrandeCity_HallOfFame_EventScript_ShowStevensHouseBeldum setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 0 - call_if_eq EverGrandeCity_HallOfFame_EventScript_271851 + call_if_eq EverGrandeCity_HallOfFame_EventScript_ReadyDexUpgradeEvent return EverGrandeCity_HallOfFame_EventScript_ResetDefeatedEventLegendaries:: @ 8271829 @@ -683,21 +683,21 @@ EverGrandeCity_HallOfFame_EventScript_ResetDefeatedEventLegendaries:: @ 8271829 clearflag FLAG_DEFEATED_HO_OH return -EverGrandeCity_HallOfFame_EventScript_271839:: @ 8271839 +EverGrandeCity_HallOfFame_EventScript_SetDesertUnderpassCommentReady:: @ 8271839 setvar VAR_FOSSIL_MANIAC_STATE, 1 return -EverGrandeCity_HallOfFame_EventScript_27183F:: @ 827183F +EverGrandeCity_HallOfFame_EventScript_ShowStevensHouseBeldum:: @ 827183F clearflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL return -EverGrandeCity_HallOfFame_EventScript_271843:: @ 8271843 +EverGrandeCity_HallOfFame_EventScript_ReadyReceiveSSTicketEvent:: @ 8271843 setvar VAR_LITTLEROOT_HOUSES_STATE, 3 setvar VAR_LITTLEROOT_HOUSES_STATE_2, 3 clearflag FLAG_HIDE_PLAYERS_HOUSE_DAD return -EverGrandeCity_HallOfFame_EventScript_271851:: @ 8271851 +EverGrandeCity_HallOfFame_EventScript_ReadyDexUpgradeEvent:: @ 8271851 setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 1 return diff --git a/data/maps/EverGrandeCity/map.json b/data/maps/EverGrandeCity/map.json index 90175db1d..0fd6e9eca 100644 --- a/data/maps/EverGrandeCity/map.json +++ b/data/maps/EverGrandeCity/map.json @@ -58,7 +58,7 @@ "elevation": 1, "var": "VAR_TEMP_1", "var_value": "0", - "script": "EverGrandeCity_EventScript_1E7D46" + "script": "EverGrandeCity_EventScript_SetVisitedEverGrande" }, { "type": "trigger", @@ -67,7 +67,7 @@ "elevation": 1, "var": "VAR_TEMP_1", "var_value": "0", - "script": "EverGrandeCity_EventScript_1E7D46" + "script": "EverGrandeCity_EventScript_SetVisitedEverGrande" }, { "type": "trigger", @@ -76,7 +76,7 @@ "elevation": 1, "var": "VAR_TEMP_1", "var_value": "0", - "script": "EverGrandeCity_EventScript_1E7D46" + "script": "EverGrandeCity_EventScript_SetVisitedEverGrande" }, { "type": "trigger", @@ -85,7 +85,7 @@ "elevation": 1, "var": "VAR_TEMP_1", "var_value": "0", - "script": "EverGrandeCity_EventScript_1E7D46" + "script": "EverGrandeCity_EventScript_SetVisitedEverGrande" }, { "type": "trigger", @@ -94,7 +94,7 @@ "elevation": 1, "var": "VAR_TEMP_1", "var_value": "0", - "script": "EverGrandeCity_EventScript_1E7D46" + "script": "EverGrandeCity_EventScript_SetVisitedEverGrande" }, { "type": "trigger", @@ -103,7 +103,7 @@ "elevation": 1, "var": "VAR_TEMP_1", "var_value": "0", - "script": "EverGrandeCity_EventScript_1E7D46" + "script": "EverGrandeCity_EventScript_SetVisitedEverGrande" }, { "type": "trigger", @@ -112,7 +112,7 @@ "elevation": 1, "var": "VAR_TEMP_1", "var_value": "0", - "script": "EverGrandeCity_EventScript_1E7D46" + "script": "EverGrandeCity_EventScript_SetVisitedEverGrande" }, { "type": "trigger", @@ -121,7 +121,7 @@ "elevation": 1, "var": "VAR_TEMP_1", "var_value": "0", - "script": "EverGrandeCity_EventScript_1E7D46" + "script": "EverGrandeCity_EventScript_SetVisitedEverGrande" }, { "type": "trigger", @@ -130,7 +130,7 @@ "elevation": 1, "var": "VAR_TEMP_1", "var_value": "0", - "script": "EverGrandeCity_EventScript_1E7D46" + "script": "EverGrandeCity_EventScript_SetVisitedEverGrande" }, { "type": "trigger", @@ -139,7 +139,7 @@ "elevation": 1, "var": "VAR_TEMP_1", "var_value": "0", - "script": "EverGrandeCity_EventScript_1E7D46" + "script": "EverGrandeCity_EventScript_SetVisitedEverGrande" }, { "type": "trigger", @@ -148,7 +148,7 @@ "elevation": 1, "var": "VAR_TEMP_1", "var_value": "0", - "script": "EverGrandeCity_EventScript_1E7D46" + "script": "EverGrandeCity_EventScript_SetVisitedEverGrande" } ], "bg_events": [ @@ -158,7 +158,7 @@ "y": 43, "elevation": 5, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "EverGrandeCity_EventScript_1E7D2B" + "script": "EverGrandeCity_EventScript_VictoryRoadSign" }, { "type": "sign", @@ -174,7 +174,7 @@ "y": 52, "elevation": 5, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "EverGrandeCity_EventScript_1E7D34" + "script": "EverGrandeCity_EventScript_CitySign" }, { "type": "sign", @@ -182,7 +182,7 @@ "y": 15, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "EverGrandeCity_EventScript_1E7D3D" + "script": "EverGrandeCity_EventScript_PokemonLeagueSign" }, { "type": "sign", diff --git a/data/maps/EverGrandeCity/scripts.inc b/data/maps/EverGrandeCity/scripts.inc index 39e57f563..93e047dd0 100644 --- a/data/maps/EverGrandeCity/scripts.inc +++ b/data/maps/EverGrandeCity/scripts.inc @@ -6,31 +6,31 @@ EverGrandeCity_OnTransition: @ 81E7D21 call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 end -EverGrandeCity_EventScript_1E7D2B:: @ 81E7D2B - msgbox EverGrandeCity_Text_1E7D4F, MSGBOX_SIGN +EverGrandeCity_EventScript_VictoryRoadSign:: @ 81E7D2B + msgbox EverGrandeCity_Text_EnteringVictoryRoad, MSGBOX_SIGN end -EverGrandeCity_EventScript_1E7D34:: @ 81E7D34 - msgbox EverGrandeCity_Text_1E7D89, MSGBOX_SIGN +EverGrandeCity_EventScript_CitySign:: @ 81E7D34 + msgbox EverGrandeCity_Text_CitySign, MSGBOX_SIGN end -EverGrandeCity_EventScript_1E7D3D:: @ 81E7D3D - msgbox EverGrandeCity_Text_1E7D65, MSGBOX_SIGN +EverGrandeCity_EventScript_PokemonLeagueSign:: @ 81E7D3D + msgbox EverGrandeCity_Text_EnteringPokemonLeague, MSGBOX_SIGN end -EverGrandeCity_EventScript_1E7D46:: @ 81E7D46 +EverGrandeCity_EventScript_SetVisitedEverGrande:: @ 81E7D46 setflag FLAG_VISITED_EVER_GRANDE_CITY setvar VAR_TEMP_1, 1 end -EverGrandeCity_Text_1E7D4F: @ 81E7D4F +EverGrandeCity_Text_EnteringVictoryRoad: @ 81E7D4F .string "ENTERING VICTORY ROAD$" -EverGrandeCity_Text_1E7D65: @ 81E7D65 +EverGrandeCity_Text_EnteringPokemonLeague: @ 81E7D65 .string "ENTERING POKéMON LEAGUE\n" .string "CENTER GATE$" -EverGrandeCity_Text_1E7D89: @ 81E7D89 +EverGrandeCity_Text_CitySign: @ 81E7D89 .string "EVER GRANDE CITY\p" .string "“The paradise of flowers, the sea,\n" .string "and POKéMON.”$" diff --git a/data/maps/EverGrandeCity_Hall1/scripts.inc b/data/maps/EverGrandeCity_Hall1/scripts.inc index c2ffaca47..cd9bd27c1 100644 --- a/data/maps/EverGrandeCity_Hall1/scripts.inc +++ b/data/maps/EverGrandeCity_Hall1/scripts.inc @@ -1,12 +1,12 @@ EverGrandeCity_Hall1_MapScripts:: @ 8229569 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall1_MapScript2_22956F + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall1_OnWarp .byte 0 -EverGrandeCity_Hall1_MapScript2_22956F: @ 822956F - map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall1_EventScript_229579 +EverGrandeCity_Hall1_OnWarp: @ 822956F + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall1_EventScript_TurnPlayerNorth .2byte 0 -EverGrandeCity_Hall1_EventScript_229579:: @ 8229579 +EverGrandeCity_Hall1_EventScript_TurnPlayerNorth:: @ 8229579 turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH end diff --git a/data/maps/EverGrandeCity_Hall2/scripts.inc b/data/maps/EverGrandeCity_Hall2/scripts.inc index be19992ef..4591aa111 100644 --- a/data/maps/EverGrandeCity_Hall2/scripts.inc +++ b/data/maps/EverGrandeCity_Hall2/scripts.inc @@ -1,12 +1,12 @@ EverGrandeCity_Hall2_MapScripts:: @ 822957E - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall2_MapScript2_229584 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall2_OnWarp .byte 0 -EverGrandeCity_Hall2_MapScript2_229584: @ 8229584 - map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall2_EventScript_22958E +EverGrandeCity_Hall2_OnWarp: @ 8229584 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall2_EventScript_TurnPlayerNorth .2byte 0 -EverGrandeCity_Hall2_EventScript_22958E:: @ 822958E +EverGrandeCity_Hall2_EventScript_TurnPlayerNorth:: @ 822958E turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH end diff --git a/data/maps/EverGrandeCity_Hall3/scripts.inc b/data/maps/EverGrandeCity_Hall3/scripts.inc index eaf2f4e5a..7bd895fd0 100644 --- a/data/maps/EverGrandeCity_Hall3/scripts.inc +++ b/data/maps/EverGrandeCity_Hall3/scripts.inc @@ -1,12 +1,12 @@ EverGrandeCity_Hall3_MapScripts:: @ 8229593 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall3_MapScript2_229599 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall3_OnWarp .byte 0 -EverGrandeCity_Hall3_MapScript2_229599: @ 8229599 - map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall3_EventScript_2295A3 +EverGrandeCity_Hall3_OnWarp: @ 8229599 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall3_EventScript_TurnPlayerNorth .2byte 0 -EverGrandeCity_Hall3_EventScript_2295A3:: @ 82295A3 +EverGrandeCity_Hall3_EventScript_TurnPlayerNorth:: @ 82295A3 turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH end diff --git a/data/maps/EverGrandeCity_Hall4/scripts.inc b/data/maps/EverGrandeCity_Hall4/scripts.inc index e36890874..54d7adfc3 100644 --- a/data/maps/EverGrandeCity_Hall4/scripts.inc +++ b/data/maps/EverGrandeCity_Hall4/scripts.inc @@ -1,12 +1,12 @@ EverGrandeCity_Hall4_MapScripts:: @ 82295A8 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall4_MapScript2_2295AE + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall4_OnWarp .byte 0 -EverGrandeCity_Hall4_MapScript2_2295AE: @ 82295AE - map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall4_EventScript_2295B8 +EverGrandeCity_Hall4_OnWarp: @ 82295AE + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall4_EventScript_TurnPlayerNorth .2byte 0 -EverGrandeCity_Hall4_EventScript_2295B8:: @ 82295B8 +EverGrandeCity_Hall4_EventScript_TurnPlayerNorth:: @ 82295B8 turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH end diff --git a/data/maps/EverGrandeCity_Hall5/scripts.inc b/data/maps/EverGrandeCity_Hall5/scripts.inc index 6079bbd42..1ba85b999 100644 --- a/data/maps/EverGrandeCity_Hall5/scripts.inc +++ b/data/maps/EverGrandeCity_Hall5/scripts.inc @@ -1,12 +1,12 @@ EverGrandeCity_Hall5_MapScripts:: @ 82295BD - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall5_MapScript2_2295C3 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall5_OnWarp .byte 0 -EverGrandeCity_Hall5_MapScript2_2295C3: @ 82295C3 - map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall5_EventScript_2295CD +EverGrandeCity_Hall5_OnWarp: @ 82295C3 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall5_EventScript_TurnPlayerNorth .2byte 0 -EverGrandeCity_Hall5_EventScript_2295CD:: @ 82295CD +EverGrandeCity_Hall5_EventScript_TurnPlayerNorth:: @ 82295CD turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH end diff --git a/data/maps/EverGrandeCity_HallOfFame/scripts.inc b/data/maps/EverGrandeCity_HallOfFame/scripts.inc index 638e18eb5..3fe146f99 100644 --- a/data/maps/EverGrandeCity_HallOfFame/scripts.inc +++ b/data/maps/EverGrandeCity_HallOfFame/scripts.inc @@ -1,38 +1,38 @@ EverGrandeCity_HallOfFame_MapScripts:: @ 822982C - map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_HallOfFame_MapScript2_229846 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_HallOfFame_MapScript2_229837 + map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_HallOfFame_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_HallOfFame_OnWarp .byte 0 -EverGrandeCity_HallOfFame_MapScript2_229837: @ 8229837 - map_script_2 VAR_TEMP_1, 0, EverGrandeCity_HallOfFame_EventScript_229841 +EverGrandeCity_HallOfFame_OnWarp: @ 8229837 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_HallOfFame_EventScript_TurnPlayerNorth .2byte 0 -EverGrandeCity_HallOfFame_EventScript_229841:: @ 8229841 +EverGrandeCity_HallOfFame_EventScript_TurnPlayerNorth:: @ 8229841 turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH end -EverGrandeCity_HallOfFame_MapScript2_229846: @ 8229846 - map_script_2 VAR_TEMP_1, 0, EverGrandeCity_HallOfFame_EventScript_229850 +EverGrandeCity_HallOfFame_OnFrame: @ 8229846 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_HallOfFame_EventScript_EnterHallOfFame .2byte 0 -EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850 +EverGrandeCity_HallOfFame_EventScript_EnterHallOfFame:: @ 8229850 lockall - applymovement 1, EverGrandeCity_HallOfFame_Movement_229901 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_229901 + applymovement 1, EverGrandeCity_HallOfFame_Movement_WalkIntoHallOfFame1 + applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_WalkIntoHallOfFame1 waitmovement 0 applymovement 1, Common_Movement_WalkInPlaceFastestRight applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - msgbox EverGrandeCity_HallOfFame_Text_22990E, MSGBOX_DEFAULT + msgbox EverGrandeCity_HallOfFame_Text_HereWeHonorLeagueChampions, MSGBOX_DEFAULT closemessage - applymovement 1, EverGrandeCity_HallOfFame_Movement_229908 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_229908 + applymovement 1, EverGrandeCity_HallOfFame_Movement_WalkIntoHallOfFame2 + applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_WalkIntoHallOfFame2 waitmovement 0 delay 20 applymovement 1, Common_Movement_WalkInPlaceFastestRight applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - msgbox EverGrandeCity_HallOfFame_Text_2299A3, MSGBOX_DEFAULT + msgbox EverGrandeCity_HallOfFame_Text_LetsRecordYouAndYourPartnersNames, MSGBOX_DEFAULT closemessage applymovement 1, Common_Movement_WalkInPlaceFastestUp applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp @@ -42,15 +42,15 @@ EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850 waitfieldeffect FLDEFF_HALL_OF_FAME_RECORD delay 40 setvar VAR_TEMP_1, 1 - call EverGrandeCity_HallOfFame_EventScript_2717C1 + call EverGrandeCity_HallOfFame_EventScript_SetGameClearFlags checkplayergender compare VAR_RESULT, MALE - goto_if_eq EverGrandeCity_HallOfFame_EventScript_2298E9 + goto_if_eq EverGrandeCity_HallOfFame_EventScript_GameClearMale compare VAR_RESULT, FEMALE - goto_if_eq EverGrandeCity_HallOfFame_EventScript_2298F5 + goto_if_eq EverGrandeCity_HallOfFame_EventScript_GameClearFemale end -EverGrandeCity_HallOfFame_EventScript_2298E9:: @ 82298E9 +EverGrandeCity_HallOfFame_EventScript_GameClearMale:: @ 82298E9 setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F fadescreenspeed 1, 24 special GameClear @@ -58,7 +58,7 @@ EverGrandeCity_HallOfFame_EventScript_2298E9:: @ 82298E9 releaseall end -EverGrandeCity_HallOfFame_EventScript_2298F5:: @ 82298F5 +EverGrandeCity_HallOfFame_EventScript_GameClearFemale:: @ 82298F5 setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_MAYS_HOUSE_2F fadescreenspeed 1, 24 special GameClear @@ -66,7 +66,7 @@ EverGrandeCity_HallOfFame_EventScript_2298F5:: @ 82298F5 releaseall end -EverGrandeCity_HallOfFame_Movement_229901: @ 8229901 +EverGrandeCity_HallOfFame_Movement_WalkIntoHallOfFame1: @ 8229901 walk_up walk_up walk_up @@ -75,7 +75,7 @@ EverGrandeCity_HallOfFame_Movement_229901: @ 8229901 walk_up step_end -EverGrandeCity_HallOfFame_Movement_229908: @ 8229908 +EverGrandeCity_HallOfFame_Movement_WalkIntoHallOfFame2: @ 8229908 walk_up walk_up walk_up @@ -83,7 +83,7 @@ EverGrandeCity_HallOfFame_Movement_229908: @ 8229908 walk_up step_end -EverGrandeCity_HallOfFame_Text_22990E: @ 822990E +EverGrandeCity_HallOfFame_Text_HereWeHonorLeagueChampions: @ 822990E .string "WALLACE: This room…\p" .string "This is where we keep records of\n" .string "POKéMON that prevailed through\l" @@ -91,7 +91,7 @@ EverGrandeCity_HallOfFame_Text_22990E: @ 822990E .string "It is here that the LEAGUE CHAMPIONS\n" .string "are honored.$" -EverGrandeCity_HallOfFame_Text_2299A3: @ 82299A3 +EverGrandeCity_HallOfFame_Text_LetsRecordYouAndYourPartnersNames: @ 82299A3 .string "WALLACE: Come on, let's record your\n" .string "name as a TRAINER who triumphed over\l" .string "the POKéMON LEAGUE, and the names of\l" diff --git a/data/specials.inc b/data/specials.inc index 1ec8bb230..9954ba9dc 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -180,7 +180,7 @@ gSpecials:: @ 81DBA64 def_special sub_813BA30 def_special UpdateMovedLilycoveFanClubMembers def_special sub_813BF60 - def_special sub_813BA60 + def_special UpdateTrainerFanClubGameClear def_special sub_813BF7C def_special RockSmashWildEncounter def_special GabbyAndTyGetBattleNum @@ -351,7 +351,7 @@ gSpecials:: @ 81DBA64 def_special sub_81653CC def_special DoesPartyHaveEnigmaBerry def_special ScriptRandom - def_special sub_81AFDD0 + def_special SetChampionSaveWarp def_special TryPutTreasureInvestigatorsOnAir def_special TryPutLotteryWinnerReportOnAir def_special sub_80EE72C diff --git a/include/save_location.h b/include/save_location.h index c330124ad..6c2ae0e6b 100644 --- a/include/save_location.h +++ b/include/save_location.h @@ -6,9 +6,14 @@ #define POKECENTER_SAVEWARP (1 << 1) #define LOBBY_SAVEWARP (1 << 2) #define UNK_SPECIAL_SAVE_WARP_FLAG_3 (1 << 3) +// +// +// +// +#define CHAMPION_SAVEWARP (1 << 7) void TrySetMapSaveWarpStatus(void); void sub_81AFDA0(void); -void sub_81AFDD0(void); +void SetChampionSaveWarp(void); #endif // GUARD_SAVE_LOCATION_H diff --git a/src/field_specials.c b/src/field_specials.c index 65bc3a095..b84e4dde9 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -4033,7 +4033,7 @@ void sub_813BA30(void) } } -void sub_813BA60(void) +void UpdateTrainerFanClubGameClear(void) { if (!((gSaveBlock1Ptr->vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] >> 7) & 1)) { diff --git a/src/save_location.c b/src/save_location.c index 2443b3161..b9d852cf3 100644 --- a/src/save_location.c +++ b/src/save_location.c @@ -129,7 +129,7 @@ void sub_81AFDA0(void) gSaveBlock2Ptr->field_A8 |= 0x8; } -void sub_81AFDD0(void) +void SetChampionSaveWarp(void) { - gSaveBlock2Ptr->specialSaveWarpFlags |= 0x80; + gSaveBlock2Ptr->specialSaveWarpFlags |= CHAMPION_SAVEWARP; } diff --git a/src/union_room.c b/src/union_room.c index 5952b03eb..d22373ea0 100644 --- a/src/union_room.c +++ b/src/union_room.c @@ -30,6 +30,7 @@ #include "party_menu.h" #include "pokemon_jump.h" #include "random.h" +#include "save_location.h" #include "script.h" #include "script_pokemon_util_80F87D8.h" #include "sound.h" @@ -1078,7 +1079,7 @@ u32 sub_8013B8C(struct UnkStruct_Group *arg0, s32 id) if (gUnknown_02022C2C == 4 && structPtr->unk.field_0.unk_00.unk_01_2 != 3) { - if (!(gSaveBlock2Ptr->specialSaveWarpFlags & 0x80)) + if (!(gSaveBlock2Ptr->specialSaveWarpFlags & CHAMPION_SAVEWARP)) return 1; else if (structPtr->unk.field_0.unk_00.isChampion) return 0; From 03a7995570766b96c942c08dbc7168d9daab4dc6 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 7 Nov 2019 13:28:33 -0500 Subject: [PATCH 24/40] Move hall of fame script --- data/event_scripts.s | 56 +---------------------------------- data/scripts/hall_of_fame.inc | 53 +++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 55 deletions(-) create mode 100644 data/scripts/hall_of_fame.inc diff --git a/data/event_scripts.s b/data/event_scripts.s index b131d2cb5..7bd77505c 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -645,61 +645,7 @@ Std_MsgboxAutoclose:: @ 8271494 return .include "data/scripts/new_game.inc" - -@ Below seems to be hall_of_fame.inc and briney.inc together? -EverGrandeCity_HallOfFame_EventScript_SetGameClearFlags:: @ 82717C1 - special SetChampionSaveWarp - setflag FLAG_IS_CHAMPION - call EverGrandeCity_HallOfFame_EventScript_ResetDefeatedEventLegendaries - compare VAR_FOSSIL_MANIAC_STATE, 0 - call_if_eq EverGrandeCity_HallOfFame_EventScript_SetDesertUnderpassCommentReady - clearflag FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS - call EverGrandeCity_HallOfFame_EventScript_ResetEliteFour - setflag FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY - clearflag FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY - clearflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY - setvar VAR_STEVENS_HOUSE_STATE, 2 - setflag FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY - clearflag FLAG_HIDE_VICTORY_ROAD_EXIT_WALLY - clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL - clearflag FLAG_HIDE_LILYCOVE_HARBOR_SSTIDAL - setflag FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS - clearflag FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION - setflag FLAG_HIDE_LILYCOVE_CITY_RIVAL - special UpdateTrainerFanClubGameClear - call_if_unset FLAG_RECEIVED_SS_TICKET, EverGrandeCity_HallOfFame_EventScript_ReadyReceiveSSTicketEvent - call_if_unset FLAG_RECEIVED_BELDUM, EverGrandeCity_HallOfFame_EventScript_ShowStevensHouseBeldum - setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM - setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM - compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 0 - call_if_eq EverGrandeCity_HallOfFame_EventScript_ReadyDexUpgradeEvent - return - -EverGrandeCity_HallOfFame_EventScript_ResetDefeatedEventLegendaries:: @ 8271829 - clearflag FLAG_DEFEATED_MEW - clearflag FLAG_DEFEATED_LATIAS_OR_LATIOS - clearflag FLAG_DEFEATED_DEOXYS - clearflag FLAG_DEFEATED_LUGIA - clearflag FLAG_DEFEATED_HO_OH - return - -EverGrandeCity_HallOfFame_EventScript_SetDesertUnderpassCommentReady:: @ 8271839 - setvar VAR_FOSSIL_MANIAC_STATE, 1 - return - -EverGrandeCity_HallOfFame_EventScript_ShowStevensHouseBeldum:: @ 827183F - clearflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL - return - -EverGrandeCity_HallOfFame_EventScript_ReadyReceiveSSTicketEvent:: @ 8271843 - setvar VAR_LITTLEROOT_HOUSES_STATE, 3 - setvar VAR_LITTLEROOT_HOUSES_STATE_2, 3 - clearflag FLAG_HIDE_PLAYERS_HOUSE_DAD - return - -EverGrandeCity_HallOfFame_EventScript_ReadyDexUpgradeEvent:: @ 8271851 - setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 1 - return + .include "data/scripts/hall_of_fame.inc" EventScript_WhiteOut:: @ 8271857 call EverGrandeCity_HallOfFame_EventScript_ResetEliteFour diff --git a/data/scripts/hall_of_fame.inc b/data/scripts/hall_of_fame.inc new file mode 100644 index 000000000..c57358dd5 --- /dev/null +++ b/data/scripts/hall_of_fame.inc @@ -0,0 +1,53 @@ +EverGrandeCity_HallOfFame_EventScript_SetGameClearFlags:: @ 82717C1 + special SetChampionSaveWarp + setflag FLAG_IS_CHAMPION + call EverGrandeCity_HallOfFame_EventScript_ResetDefeatedEventLegendaries + compare VAR_FOSSIL_MANIAC_STATE, 0 + call_if_eq EverGrandeCity_HallOfFame_EventScript_SetDesertUnderpassCommentReady + clearflag FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS + call EverGrandeCity_HallOfFame_EventScript_ResetEliteFour + setflag FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY + clearflag FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY + clearflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY + setvar VAR_STEVENS_HOUSE_STATE, 2 + setflag FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY + clearflag FLAG_HIDE_VICTORY_ROAD_EXIT_WALLY + clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL + clearflag FLAG_HIDE_LILYCOVE_HARBOR_SSTIDAL + setflag FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS + clearflag FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION + setflag FLAG_HIDE_LILYCOVE_CITY_RIVAL + special UpdateTrainerFanClubGameClear + call_if_unset FLAG_RECEIVED_SS_TICKET, EverGrandeCity_HallOfFame_EventScript_ReadyReceiveSSTicketEvent + call_if_unset FLAG_RECEIVED_BELDUM, EverGrandeCity_HallOfFame_EventScript_ShowStevensHouseBeldum + setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM + setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM + compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 0 + call_if_eq EverGrandeCity_HallOfFame_EventScript_ReadyDexUpgradeEvent + return + +EverGrandeCity_HallOfFame_EventScript_ResetDefeatedEventLegendaries:: @ 8271829 + clearflag FLAG_DEFEATED_MEW + clearflag FLAG_DEFEATED_LATIAS_OR_LATIOS + clearflag FLAG_DEFEATED_DEOXYS + clearflag FLAG_DEFEATED_LUGIA + clearflag FLAG_DEFEATED_HO_OH + return + +EverGrandeCity_HallOfFame_EventScript_SetDesertUnderpassCommentReady:: @ 8271839 + setvar VAR_FOSSIL_MANIAC_STATE, 1 + return + +EverGrandeCity_HallOfFame_EventScript_ShowStevensHouseBeldum:: @ 827183F + clearflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL + return + +EverGrandeCity_HallOfFame_EventScript_ReadyReceiveSSTicketEvent:: @ 8271843 + setvar VAR_LITTLEROOT_HOUSES_STATE, 3 + setvar VAR_LITTLEROOT_HOUSES_STATE_2, 3 + clearflag FLAG_HIDE_PLAYERS_HOUSE_DAD + return + +EverGrandeCity_HallOfFame_EventScript_ReadyDexUpgradeEvent:: @ 8271851 + setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 1 + return From 979ece7d56387e72fa2938401c511be95d67601e Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 7 Nov 2019 14:49:52 -0500 Subject: [PATCH 25/40] Document Fortree scripts --- data/maps/FortreeCity/map.json | 18 ++-- data/maps/FortreeCity/scripts.inc | 88 +++++++++---------- data/maps/FortreeCity_DecorationShop/map.json | 8 +- .../FortreeCity_DecorationShop/scripts.inc | 16 ++-- data/maps/FortreeCity_House1/map.json | 6 +- data/maps/FortreeCity_House1/scripts.inc | 48 +++++----- data/maps/FortreeCity_House2/map.json | 2 +- data/maps/FortreeCity_House2/scripts.inc | 48 +++++----- data/maps/FortreeCity_House3/map.json | 4 +- data/maps/FortreeCity_House3/scripts.inc | 12 +-- data/maps/FortreeCity_House4/map.json | 6 +- data/maps/FortreeCity_House4/scripts.inc | 48 +++++----- data/maps/FortreeCity_House5/map.json | 6 +- data/maps/FortreeCity_House5/scripts.inc | 18 ++-- 14 files changed, 164 insertions(+), 164 deletions(-) diff --git a/data/maps/FortreeCity/map.json b/data/maps/FortreeCity/map.json index 454fc34d3..ce1dcee3e 100644 --- a/data/maps/FortreeCity/map.json +++ b/data/maps/FortreeCity/map.json @@ -35,7 +35,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_EventScript_1E25B6", + "script": "FortreeCity_EventScript_Man", "flag": "0" }, { @@ -48,7 +48,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_EventScript_1E25DE", + "script": "FortreeCity_EventScript_Girl", "flag": "0" }, { @@ -61,7 +61,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_EventScript_1E25BF", + "script": "FortreeCity_EventScript_Woman", "flag": "0" }, { @@ -74,7 +74,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_EventScript_1E25F0", + "script": "FortreeCity_EventScript_Boy", "flag": "0" }, { @@ -87,7 +87,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_EventScript_1E25E7", + "script": "FortreeCity_EventScript_OldMan", "flag": "0" }, { @@ -100,7 +100,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_EventScript_1E25F9", + "script": "FortreeCity_EventScript_GameboyKid", "flag": "0" }, { @@ -113,7 +113,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_EventScript_1E2614", + "script": "FortreeCity_EventScript_Kecleon", "flag": "FLAG_HIDE_FORTREE_CITY_KECLEON" } ], @@ -190,7 +190,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "FortreeCity_EventScript_1E2602" + "script": "FortreeCity_EventScript_CitySign" }, { "type": "sign", @@ -214,7 +214,7 @@ "y": 10, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "FortreeCity_EventScript_1E260B" + "script": "FortreeCity_EventScript_GymSign" }, { "type": "sign", diff --git a/data/maps/FortreeCity/scripts.inc b/data/maps/FortreeCity/scripts.inc index 716a511b0..748ed2558 100644 --- a/data/maps/FortreeCity/scripts.inc +++ b/data/maps/FortreeCity/scripts.inc @@ -1,76 +1,76 @@ FortreeCity_MapScripts:: @ 81E25A4 map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_OnTransition - map_script MAP_SCRIPT_ON_RESUME, FortreeCity_MapScript1_1E25B3 + map_script MAP_SCRIPT_ON_RESUME, FortreeCity_OnResume .byte 0 FortreeCity_OnTransition: @ 81E25AF setflag FLAG_VISITED_FORTREE_CITY end -FortreeCity_MapScript1_1E25B3: @ 81E25B3 +FortreeCity_OnResume: @ 81E25B3 setstepcallback STEP_CB_FORTREE_BRIDGE end -FortreeCity_EventScript_1E25B6:: @ 81E25B6 - msgbox FortreeCity_Text_1E2676, MSGBOX_NPC +FortreeCity_EventScript_Man:: @ 81E25B6 + msgbox FortreeCity_Text_SawGiganticPokemonInSky, MSGBOX_NPC end -FortreeCity_EventScript_1E25BF:: @ 81E25BF +FortreeCity_EventScript_Woman:: @ 81E25BF lock faceplayer - goto_if_set FLAG_KECLEON_FLED_FORTREE, FortreeCity_EventScript_1E25D4 - msgbox FortreeCity_Text_1E2738, MSGBOX_DEFAULT + goto_if_set FLAG_KECLEON_FLED_FORTREE, FortreeCity_EventScript_WomanGymAccessible + msgbox FortreeCity_Text_SomethingBlockingGym, MSGBOX_DEFAULT release end -FortreeCity_EventScript_1E25D4:: @ 81E25D4 - msgbox FortreeCity_Text_1E27B6, MSGBOX_DEFAULT +FortreeCity_EventScript_WomanGymAccessible:: @ 81E25D4 + msgbox FortreeCity_Text_ThisTimeIllBeatWinona, MSGBOX_DEFAULT release end -FortreeCity_EventScript_1E25DE:: @ 81E25DE - msgbox FortreeCity_Text_1E27FE, MSGBOX_NPC +FortreeCity_EventScript_Girl:: @ 81E25DE + msgbox FortreeCity_Text_TreesGrowByDrinkingRainwater, MSGBOX_NPC end -FortreeCity_EventScript_1E25E7:: @ 81E25E7 - msgbox FortreeCity_Text_1E2880, MSGBOX_NPC +FortreeCity_EventScript_OldMan:: @ 81E25E7 + msgbox FortreeCity_Text_EveryoneHealthyAndLively, MSGBOX_NPC end -FortreeCity_EventScript_1E25F0:: @ 81E25F0 - msgbox FortreeCity_Text_1E292E, MSGBOX_NPC +FortreeCity_EventScript_Boy:: @ 81E25F0 + msgbox FortreeCity_Text_BugPokemonComeThroughWindow, MSGBOX_NPC end -FortreeCity_EventScript_1E25F9:: @ 81E25F9 - msgbox FortreeCity_Text_1E299D, MSGBOX_NPC +FortreeCity_EventScript_GameboyKid:: @ 81E25F9 + msgbox FortreeCity_Text_PokemonThatEvolveWhenTraded, MSGBOX_NPC end -FortreeCity_EventScript_1E2602:: @ 81E2602 - msgbox FortreeCity_Text_1E2AAC, MSGBOX_SIGN +FortreeCity_EventScript_CitySign:: @ 81E2602 + msgbox FortreeCity_Text_CitySign, MSGBOX_SIGN end -FortreeCity_EventScript_1E260B:: @ 81E260B - msgbox FortreeCity_Text_1E2AE6, MSGBOX_SIGN +FortreeCity_EventScript_GymSign:: @ 81E260B + msgbox FortreeCity_Text_GymSign, MSGBOX_SIGN end -FortreeCity_EventScript_1E2614:: @ 81E2614 +FortreeCity_EventScript_Kecleon:: @ 81E2614 lock faceplayer checkitem ITEM_DEVON_SCOPE, 1 - compare VAR_RESULT, 1 - goto_if_eq FortreeCity_EventScript_1E2630 - msgbox FortreeCity_Text_1E29E5, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq FortreeCity_EventScript_AskUseDevonScope + msgbox FortreeCity_Text_SomethingUnseeable, MSGBOX_DEFAULT release end -FortreeCity_EventScript_1E2630:: @ 81E2630 - msgbox FortreeCity_Text_1E2A08, MSGBOX_YESNO +FortreeCity_EventScript_AskUseDevonScope:: @ 81E2630 + msgbox FortreeCity_Text_UnseeableUseDevonScope, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq FortreeCity_EventScript_1E2645 + goto_if_eq FortreeCity_EventScript_UseDevonScope release end -FortreeCity_EventScript_1E2645:: @ 81E2645 - msgbox FortreeCity_Text_1E2A48, MSGBOX_DEFAULT +FortreeCity_EventScript_UseDevonScope:: @ 81E2645 + msgbox FortreeCity_Text_UsedDevonScopePokemonFled, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Movement_KecleonAppears waitmovement 0 @@ -78,18 +78,18 @@ FortreeCity_EventScript_1E2645:: @ 81E2645 playmoncry SPECIES_KECLEON, 2 delay 40 waitmoncry - applymovement VAR_LAST_TALKED, FortreeCity_Movement_1E2674 + applymovement VAR_LAST_TALKED, FortreeCity_Movement_KecleonFlee waitmovement 0 removeobject VAR_LAST_TALKED setflag FLAG_KECLEON_FLED_FORTREE release end -FortreeCity_Movement_1E2674: @ 81E2674 +FortreeCity_Movement_KecleonFlee: @ 81E2674 walk_right step_end -FortreeCity_Text_1E2676: @ 81E2676 +FortreeCity_Text_SawGiganticPokemonInSky: @ 81E2676 .string "No one believes me, but I saw this\n" .string "gigantic POKéMON in the sky.\p" .string "It seemed to squirm as it flew toward\n" @@ -98,23 +98,23 @@ FortreeCity_Text_1E2676: @ 81E2676 .string "Um… You, uh…smell singed.\p" .string "Were you at a volcano or something?$" -FortreeCity_Text_1E2738: @ 81E2738 +FortreeCity_Text_SomethingBlockingGym: @ 81E2738 .string "I want to go to the POKéMON GYM,\n" .string "but something's blocking the way.\p" .string "After all the bother I went through\n" .string "training on ROUTE 120…$" -FortreeCity_Text_1E27B6: @ 81E27B6 +FortreeCity_Text_ThisTimeIllBeatWinona: @ 81E27B6 .string "I've got my pride-and-joy POKéMON\n" .string "with me. This time, I'll beat WINONA.$" -FortreeCity_Text_1E27FE: @ 81E27FE +FortreeCity_Text_TreesGrowByDrinkingRainwater: @ 81E27FE .string "The ground absorbs rainwater, and\n" .string "trees grow by drinking that water…\p" .string "Our FORTREE CITY exists because\n" .string "there's both water and soil.$" -FortreeCity_Text_1E2880: @ 81E2880 +FortreeCity_Text_EveryoneHealthyAndLively: @ 81E2880 .string "The CITY consists of homes built on\n" .string "trees.\p" .string "Perhaps because of that lifestyle,\n" @@ -122,35 +122,35 @@ FortreeCity_Text_1E2880: @ 81E2880 .string "Why, even myself--I feel as if I've\n" .string "grown thirty years younger.$" -FortreeCity_Text_1E292E: @ 81E292E +FortreeCity_Text_BugPokemonComeThroughWindow: @ 81E292E .string "Living on top of trees is okay.\p" .string "But sometimes BUG POKéMON come in\n" .string "through windows.\l" .string "It can be really startling.$" -FortreeCity_Text_1E299D: @ 81E299D +FortreeCity_Text_PokemonThatEvolveWhenTraded: @ 81E299D .string "There are POKéMON that evolve when\n" .string "you trade them! That's what I heard.$" -FortreeCity_Text_1E29E5: @ 81E29E5 +FortreeCity_Text_SomethingUnseeable: @ 81E29E5 .string "Something unseeable is in the way.$" -FortreeCity_Text_1E2A08: @ 81E2A08 +FortreeCity_Text_UnseeableUseDevonScope: @ 81E2A08 .string "Something unseeable is in the way.\p" .string "Want to use the DEVON SCOPE?$" -FortreeCity_Text_1E2A48: @ 81E2A48 +FortreeCity_Text_UsedDevonScopePokemonFled: @ 81E2A48 .string "{PLAYER} used the DEVON SCOPE.\p" .string "An invisible POKéMON became completely\n" .string "visible!\p" .string "The startled POKéMON fled!$" -FortreeCity_Text_1E2AAC: @ 81E2AAC +FortreeCity_Text_CitySign: @ 81E2AAC .string "FORTREE CITY\n" .string "“The treetop city that frolics with\l" .string "nature.”$" -FortreeCity_Text_1E2AE6: @ 81E2AE6 +FortreeCity_Text_GymSign: @ 81E2AE6 .string "FORTREE CITY POKéMON GYM\n" .string "LEADER: WINONA\p" .string "“The bird user taking flight into\n" diff --git a/data/maps/FortreeCity_DecorationShop/map.json b/data/maps/FortreeCity_DecorationShop/map.json index a8654e708..ac0ca1f89 100644 --- a/data/maps/FortreeCity_DecorationShop/map.json +++ b/data/maps/FortreeCity_DecorationShop/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_DecorationShop_EventScript_21800E", + "script": "FortreeCity_DecorationShop_EventScript_PokefanM", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_DecorationShop_EventScript_218017", + "script": "FortreeCity_DecorationShop_EventScript_Girl", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_DecorationShop_EventScript_218020", + "script": "FortreeCity_DecorationShop_EventScript_ClerkDesks", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_DecorationShop_EventScript_21804C", + "script": "FortreeCity_DecorationShop_EventScript_ClerkChairs", "flag": "0" } ], diff --git a/data/maps/FortreeCity_DecorationShop/scripts.inc b/data/maps/FortreeCity_DecorationShop/scripts.inc index 14c864ee5..4dd751b0f 100644 --- a/data/maps/FortreeCity_DecorationShop/scripts.inc +++ b/data/maps/FortreeCity_DecorationShop/scripts.inc @@ -1,15 +1,15 @@ FortreeCity_DecorationShop_MapScripts:: @ 821800D .byte 0 -FortreeCity_DecorationShop_EventScript_21800E:: @ 821800E - msgbox FortreeCity_DecorationShop_Text_218078, MSGBOX_NPC +FortreeCity_DecorationShop_EventScript_PokefanM:: @ 821800E + msgbox FortreeCity_DecorationShop_Text_MerchandiseSentToPC, MSGBOX_NPC end -FortreeCity_DecorationShop_EventScript_218017:: @ 8218017 - msgbox FortreeCity_DecorationShop_Text_2180ED, MSGBOX_NPC +FortreeCity_DecorationShop_EventScript_Girl:: @ 8218017 + msgbox FortreeCity_DecorationShop_Text_BuyingDeskForDolls, MSGBOX_NPC end -FortreeCity_DecorationShop_EventScript_218020:: @ 8218020 +FortreeCity_DecorationShop_EventScript_ClerkDesks:: @ 8218020 lock faceplayer message gText_HowMayIServeYou @@ -33,7 +33,7 @@ FortreeCity_DecorationShop_PokemartDecor_Desks: @ 8218038 release end -FortreeCity_DecorationShop_EventScript_21804C:: @ 821804C +FortreeCity_DecorationShop_EventScript_ClerkChairs:: @ 821804C lock faceplayer message gText_HowMayIServeYou @@ -57,13 +57,13 @@ FortreeCity_DecorationShop_PokemartDecor_Chairs: @ 8218064 release end -FortreeCity_DecorationShop_Text_218078: @ 8218078 +FortreeCity_DecorationShop_Text_MerchandiseSentToPC: @ 8218078 .string "Merchandise you buy here is sent to\n" .string "your own PC.\p" .string "That's fantastic! I wish they could\n" .string "also deliver me home like that.$" -FortreeCity_DecorationShop_Text_2180ED: @ 82180ED +FortreeCity_DecorationShop_Text_BuyingDeskForDolls: @ 82180ED .string "I'm buying a pretty desk and I'm\n" .string "putting my cute DOLLS on it.\p" .string "If I don't, when I decorate my\n" diff --git a/data/maps/FortreeCity_House1/map.json b/data/maps/FortreeCity_House1/map.json index 62469515a..f984e2be5 100644 --- a/data/maps/FortreeCity_House1/map.json +++ b/data/maps/FortreeCity_House1/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House1_EventScript_2162BB", + "script": "FortreeCity_House1_EventScript_Trader", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House1_EventScript_216368", + "script": "FortreeCity_House1_EventScript_Zigzagoon", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House1_EventScript_21635F", + "script": "FortreeCity_House1_EventScript_ExpertF", "flag": "0" } ], diff --git a/data/maps/FortreeCity_House1/scripts.inc b/data/maps/FortreeCity_House1/scripts.inc index 9ef94b12b..c7f4a8d5b 100644 --- a/data/maps/FortreeCity_House1/scripts.inc +++ b/data/maps/FortreeCity_House1/scripts.inc @@ -1,69 +1,69 @@ FortreeCity_House1_MapScripts:: @ 82162BA .byte 0 -FortreeCity_House1_EventScript_2162BB:: @ 82162BB +FortreeCity_House1_EventScript_Trader:: @ 82162BB lock faceplayer - goto_if_set FLAG_FORTREE_NPC_TRADE_COMPLETED, FortreeCity_House1_EventScript_216355 + goto_if_set FLAG_FORTREE_NPC_TRADE_COMPLETED, FortreeCity_House1_EventScript_TradeCompleted setvar VAR_0x8008, INGAME_TRADE_PLUSLE copyvar VAR_0x8004, VAR_0x8008 specialvar VAR_RESULT, GetInGameTradeSpeciesInfo copyvar VAR_0x8009, VAR_RESULT - msgbox FortreeCity_House1_Text_21637B, MSGBOX_YESNO + msgbox FortreeCity_House1_Text_YouWillTradeWontYou, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq FortreeCity_House1_EventScript_21633D + goto_if_eq FortreeCity_House1_EventScript_DeclineTrade special ChoosePartyMon waitstate copyvar VAR_0x800A, VAR_0x8004 compare VAR_0x8004, 255 - goto_if_eq FortreeCity_House1_EventScript_21633D + goto_if_eq FortreeCity_House1_EventScript_DeclineTrade copyvar VAR_0x8005, VAR_0x800A specialvar VAR_RESULT, GetTradeSpecies copyvar VAR_0x800B, VAR_RESULT compare VAR_RESULT, VAR_0x8009 - goto_if_ne FortreeCity_House1_EventScript_216347 + goto_if_ne FortreeCity_House1_EventScript_NotRequestedMon copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8005, VAR_0x800A special CreateInGameTradePokemon special DoInGameTradeScene waitstate bufferspeciesname 0, VAR_0x8009 - msgbox FortreeCity_House1_Text_216440, MSGBOX_DEFAULT + msgbox FortreeCity_House1_Text_MonYouTakeCare, MSGBOX_DEFAULT setflag FLAG_FORTREE_NPC_TRADE_COMPLETED release end -FortreeCity_House1_EventScript_21633D:: @ 821633D - msgbox FortreeCity_House1_Text_21649F, MSGBOX_DEFAULT +FortreeCity_House1_EventScript_DeclineTrade:: @ 821633D + msgbox FortreeCity_House1_Text_YouWontTradeMe, MSGBOX_DEFAULT release end -FortreeCity_House1_EventScript_216347:: @ 8216347 +FortreeCity_House1_EventScript_NotRequestedMon:: @ 8216347 bufferspeciesname 0, VAR_0x8009 - msgbox FortreeCity_House1_Text_216474, MSGBOX_DEFAULT + msgbox FortreeCity_House1_Text_ThisIsntAMon, MSGBOX_DEFAULT release end -FortreeCity_House1_EventScript_216355:: @ 8216355 - msgbox FortreeCity_House1_Text_2164DB, MSGBOX_DEFAULT +FortreeCity_House1_EventScript_TradeCompleted:: @ 8216355 + msgbox FortreeCity_House1_Text_GoingToMakeVolbeatStrong, MSGBOX_DEFAULT release end -FortreeCity_House1_EventScript_21635F:: @ 821635F - msgbox FortreeCity_House1_Text_21653B, MSGBOX_NPC +FortreeCity_House1_EventScript_ExpertF:: @ 821635F + msgbox FortreeCity_House1_Text_TradingMemoriesWithOthers, MSGBOX_NPC end -FortreeCity_House1_EventScript_216368:: @ 8216368 +FortreeCity_House1_EventScript_Zigzagoon:: @ 8216368 lock faceplayer waitse playmoncry SPECIES_ZIGZAGOON, 0 - msgbox FortreeCity_House1_Text_216597, MSGBOX_DEFAULT + msgbox FortreeCity_House1_Text_Zigzagoon, MSGBOX_DEFAULT waitmoncry release end -FortreeCity_House1_Text_21637B: @ 821637B +FortreeCity_House1_Text_YouWillTradeWontYou: @ 821637B .string "Wrooooaaar! I need it!\n" .string "I have to get me a {STR_VAR_1}!\l" .string "I'll do anything for it!\p" @@ -73,29 +73,29 @@ FortreeCity_House1_Text_21637B: @ 821637B .string "your {STR_VAR_1} for my {STR_VAR_2},\l" .string "won't you?$" -FortreeCity_House1_Text_216440: @ 8216440 +FortreeCity_House1_Text_MonYouTakeCare: @ 8216440 .string "Oh, yeah, right on!\p" .string "{STR_VAR_1}, welcome!\n" .string "{STR_VAR_2}, you take care!$" -FortreeCity_House1_Text_216474: @ 8216474 +FortreeCity_House1_Text_ThisIsntAMon: @ 8216474 .string "Uh, no, I don't think so.\n" .string "That isn't a {STR_VAR_1}.$" -FortreeCity_House1_Text_21649F: @ 821649F +FortreeCity_House1_Text_YouWontTradeMe: @ 821649F .string "No? You won't trade me?\n" .string "Even after I bared my heart to you?$" -FortreeCity_House1_Text_2164DB: @ 82164DB +FortreeCity_House1_Text_GoingToMakeVolbeatStrong: @ 82164DB .string "I'm going to make VOLBEAT super\n" .string "strong from this moment on!\p" .string "I hope you do the same with PLUSLE!$" -FortreeCity_House1_Text_21653B: @ 821653B +FortreeCity_House1_Text_TradingMemoriesWithOthers: @ 821653B .string "Trading POKéMON with others…\p" .string "It's as if you're trading your own\n" .string "memories with other people.$" -FortreeCity_House1_Text_216597: @ 8216597 +FortreeCity_House1_Text_Zigzagoon: @ 8216597 .string "ZIGZAGOON: Gumomoh?$" diff --git a/data/maps/FortreeCity_House2/map.json b/data/maps/FortreeCity_House2/map.json index 492590c6c..c4988e863 100644 --- a/data/maps/FortreeCity_House2/map.json +++ b/data/maps/FortreeCity_House2/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House2_EventScript_2177CB", + "script": "FortreeCity_House2_EventScript_HiddenPowerGiver", "flag": "0" }, { diff --git a/data/maps/FortreeCity_House2/scripts.inc b/data/maps/FortreeCity_House2/scripts.inc index 14ab157ed..bfbe40ff4 100644 --- a/data/maps/FortreeCity_House2/scripts.inc +++ b/data/maps/FortreeCity_House2/scripts.inc @@ -1,82 +1,82 @@ FortreeCity_House2_MapScripts:: @ 82177CA .byte 0 -FortreeCity_House2_EventScript_2177CB:: @ 82177CB +FortreeCity_House2_EventScript_HiddenPowerGiver:: @ 82177CB lock faceplayer - goto_if_set FLAG_RECEIVED_TM10, FortreeCity_House2_EventScript_21786E - call_if_unset FLAG_MET_HIDDEN_POWER_GIVER, FortreeCity_House2_EventScript_217862 - msgbox FortreeCity_House2_Text_2178D6, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_TM10, FortreeCity_House2_EventScript_ExplainHiddenPower + call_if_unset FLAG_MET_HIDDEN_POWER_GIVER, FortreeCity_House2_EventScript_Greeting + msgbox FortreeCity_House2_Text_CoinInWhichHand, MSGBOX_DEFAULT multichoice 21, 8, MULTI_RIGHTLEFT, 1 switch VAR_RESULT - case 1, FortreeCity_House2_EventScript_217878 - msgbox FortreeCity_House2_Text_21796A, MSGBOX_DEFAULT + case 1, FortreeCity_House2_EventScript_WrongGuess + msgbox FortreeCity_House2_Text_CorrectTryAgainWhichHand, MSGBOX_DEFAULT multichoice 21, 8, MULTI_RIGHTLEFT, 1 switch VAR_RESULT - case 1, FortreeCity_House2_EventScript_217878 - msgbox FortreeCity_House2_Text_2179C9, MSGBOX_DEFAULT + case 1, FortreeCity_House2_EventScript_WrongGuess + msgbox FortreeCity_House2_Text_CorrectTryAgainWhichHand2, MSGBOX_DEFAULT multichoice 21, 8, MULTI_RIGHTLEFT, 1 switch VAR_RESULT - case 0, FortreeCity_House2_EventScript_217878 - msgbox FortreeCity_House2_Text_217A28, MSGBOX_DEFAULT + case 0, FortreeCity_House2_EventScript_WrongGuess + msgbox FortreeCity_House2_Text_YourHiddenPowerHasAwoken, MSGBOX_DEFAULT giveitem_std ITEM_TM10 compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM10 - msgbox FortreeCity_House2_Text_217A91, MSGBOX_DEFAULT + msgbox FortreeCity_House2_Text_ExplainHiddenPower, MSGBOX_DEFAULT release end -FortreeCity_House2_EventScript_217862:: @ 8217862 - msgbox FortreeCity_House2_Text_217882, MSGBOX_DEFAULT +FortreeCity_House2_EventScript_Greeting:: @ 8217862 + msgbox FortreeCity_House2_Text_HiddenPowersArousedByNature, MSGBOX_DEFAULT setflag FLAG_MET_HIDDEN_POWER_GIVER return -FortreeCity_House2_EventScript_21786E:: @ 821786E - msgbox FortreeCity_House2_Text_217A91, MSGBOX_DEFAULT +FortreeCity_House2_EventScript_ExplainHiddenPower:: @ 821786E + msgbox FortreeCity_House2_Text_ExplainHiddenPower, MSGBOX_DEFAULT release end -FortreeCity_House2_EventScript_217878:: @ 8217878 - msgbox FortreeCity_House2_Text_217AC7, MSGBOX_DEFAULT +FortreeCity_House2_EventScript_WrongGuess:: @ 8217878 + msgbox FortreeCity_House2_Text_YouGuessedWrong, MSGBOX_DEFAULT release end -FortreeCity_House2_Text_217882: @ 8217882 +FortreeCity_House2_Text_HiddenPowersArousedByNature: @ 8217882 .string "People… POKéMON…\p" .string "Their hidden powers are aroused by\n" .string "living in natural environments…$" -FortreeCity_House2_Text_2178D6: @ 82178D6 +FortreeCity_House2_Text_CoinInWhichHand: @ 82178D6 .string "Let this old woman see if your hidden\n" .string "power has awoken…\p" .string "I hold a coin in my hand.\p" .string "Now, tell me, have I palmed it in\n" .string "the right hand? Or in the left?$" -FortreeCity_House2_Text_21796A: @ 821796A +FortreeCity_House2_Text_CorrectTryAgainWhichHand: @ 821796A .string "Oh! Yes, correct!\p" .string "We shall try again.\p" .string "In which hand have I palmed the coin?\n" .string "The right or left?$" -FortreeCity_House2_Text_2179C9: @ 82179C9 +FortreeCity_House2_Text_CorrectTryAgainWhichHand2: @ 82179C9 .string "Oh! Yes, correct!\p" .string "We shall try again.\p" .string "In which hand have I palmed the coin?\n" .string "The right or left?$" -FortreeCity_House2_Text_217A28: @ 8217A28 +FortreeCity_House2_Text_YourHiddenPowerHasAwoken: @ 8217A28 .string "Oh! Splendid!\n" .string "Your hidden power has awoken!\p" .string "Here, take this and awaken the hidden\n" .string "power of your POKéMON.$" -FortreeCity_House2_Text_217A91: @ 8217A91 +FortreeCity_House2_Text_ExplainHiddenPower: @ 8217A91 .string "HIDDEN POWER is a move that changes\n" .string "with the POKéMON.$" -FortreeCity_House2_Text_217AC7: @ 8217AC7 +FortreeCity_House2_Text_YouGuessedWrong: @ 8217AC7 .string "No, too bad.\n" .string "You guessed wrong.$" diff --git a/data/maps/FortreeCity_House3/map.json b/data/maps/FortreeCity_House3/map.json index 8b7e971c7..ce70f4605 100644 --- a/data/maps/FortreeCity_House3/map.json +++ b/data/maps/FortreeCity_House3/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House3_EventScript_217AE8", + "script": "FortreeCity_House3_EventScript_Maniac", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House3_EventScript_217AF1", + "script": "FortreeCity_House3_EventScript_SchoolKidM", "flag": "0" } ], diff --git a/data/maps/FortreeCity_House3/scripts.inc b/data/maps/FortreeCity_House3/scripts.inc index fe1f6cfee..396bd4b22 100644 --- a/data/maps/FortreeCity_House3/scripts.inc +++ b/data/maps/FortreeCity_House3/scripts.inc @@ -1,15 +1,15 @@ FortreeCity_House3_MapScripts:: @ 8217AE7 .byte 0 -FortreeCity_House3_EventScript_217AE8:: @ 8217AE8 - msgbox FortreeCity_House3_Text_217AFA, MSGBOX_NPC +FortreeCity_House3_EventScript_Maniac:: @ 8217AE8 + msgbox FortreeCity_House3_Text_MetStevenHadAmazingPokemon, MSGBOX_NPC end -FortreeCity_House3_EventScript_217AF1:: @ 8217AF1 - msgbox FortreeCity_House3_Text_217C22, MSGBOX_NPC +FortreeCity_House3_EventScript_SchoolKidM:: @ 8217AF1 + msgbox FortreeCity_House3_Text_OhYouHavePokedex, MSGBOX_NPC end -FortreeCity_House3_Text_217AFA: @ 8217AFA +FortreeCity_House3_Text_MetStevenHadAmazingPokemon: @ 8217AFA .string "While speaking about POKéDEXES,\n" .string "I remembered something.\p" .string "I met this TRAINER, STEVEN, when\n" @@ -21,7 +21,7 @@ FortreeCity_House3_Text_217AFA: @ 8217AFA .string "He might even be stronger than the\n" .string "GYM LEADER in this town…$" -FortreeCity_House3_Text_217C22: @ 8217C22 +FortreeCity_House3_Text_OhYouHavePokedex: @ 8217C22 .string "What's that thing you have there?\p" .string "… … … … … …\p" .string "Oh, it's called a POKéDEX?\n" diff --git a/data/maps/FortreeCity_House4/map.json b/data/maps/FortreeCity_House4/map.json index a9db995ed..01d1a99e8 100644 --- a/data/maps/FortreeCity_House4/map.json +++ b/data/maps/FortreeCity_House4/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House4_EventScript_217C81", + "script": "FortreeCity_House4_EventScript_Woman", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House4_EventScript_217C8A", + "script": "FortreeCity_House4_EventScript_Boy", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House4_EventScript_217D20", + "script": "FortreeCity_House4_EventScript_Wingull", "flag": "FLAG_HIDE_FORTREE_CITY_HOUSE_4_WINGULL" } ], diff --git a/data/maps/FortreeCity_House4/scripts.inc b/data/maps/FortreeCity_House4/scripts.inc index 5dc9d769a..b050ba3f9 100644 --- a/data/maps/FortreeCity_House4/scripts.inc +++ b/data/maps/FortreeCity_House4/scripts.inc @@ -1,51 +1,51 @@ FortreeCity_House4_MapScripts:: @ 8217C80 .byte 0 -FortreeCity_House4_EventScript_217C81:: @ 8217C81 - msgbox FortreeCity_House4_Text_217D33, MSGBOX_NPC +FortreeCity_House4_EventScript_Woman:: @ 8217C81 + msgbox FortreeCity_House4_Text_BringsWorldCloserTogether, MSGBOX_NPC end -FortreeCity_House4_EventScript_217C8A:: @ 8217C8A +FortreeCity_House4_EventScript_Boy:: @ 8217C8A lockall - goto_if_set FLAG_RECEIVED_MENTAL_HERB, FortreeCity_House4_EventScript_217D06 - goto_if_set FLAG_WINGULL_DELIVERED_MAIL, FortreeCity_House4_EventScript_217CD8 - goto_if_set FLAG_WINGULL_SENT_ON_ERRAND, FortreeCity_House4_EventScript_217CC4 - msgbox FortreeCity_House4_Text_217DB9, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_MENTAL_HERB, FortreeCity_House4_EventScript_ReceivedMentalHerb + goto_if_set FLAG_WINGULL_DELIVERED_MAIL, FortreeCity_House4_EventScript_WingullReturned + goto_if_set FLAG_WINGULL_SENT_ON_ERRAND, FortreeCity_House4_EventScript_WingullOnErrand + msgbox FortreeCity_House4_Text_GoBirdPokemon, MSGBOX_DEFAULT closemessage setflag FLAG_WINGULL_SENT_ON_ERRAND clearflag FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL - applymovement 3, FortreeCity_House4_Movement_217D1A + applymovement 3, FortreeCity_House4_Movement_WingullExit waitmovement 0 removeobject 3 releaseall end -FortreeCity_House4_EventScript_217CC4:: @ 8217CC4 +FortreeCity_House4_EventScript_WingullOnErrand:: @ 8217CC4 applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 - msgbox FortreeCity_House4_Text_217DD2, MSGBOX_DEFAULT + msgbox FortreeCity_House4_Text_AskedWingullToRunErrand, MSGBOX_DEFAULT releaseall end -FortreeCity_House4_EventScript_217CD8:: @ 8217CD8 +FortreeCity_House4_EventScript_WingullReturned:: @ 8217CD8 applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 - msgbox FortreeCity_House4_Text_217E05, MSGBOX_DEFAULT + msgbox FortreeCity_House4_Text_WelcomeWingullTakeMentalHerb, MSGBOX_DEFAULT giveitem_std ITEM_MENTAL_HERB - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_MENTAL_HERB releaseall end -FortreeCity_House4_EventScript_217D06:: @ 8217D06 +FortreeCity_House4_EventScript_ReceivedMentalHerb:: @ 8217D06 applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 - msgbox FortreeCity_House4_Text_217EA8, MSGBOX_DEFAULT + msgbox FortreeCity_House4_Text_FriendsFarAwayThanksToWingull, MSGBOX_DEFAULT releaseall end -FortreeCity_House4_Movement_217D1A: @ 8217D1A +FortreeCity_House4_Movement_WingullExit: @ 8217D1A walk_fast_down walk_fast_down walk_fast_right @@ -53,31 +53,31 @@ FortreeCity_House4_Movement_217D1A: @ 8217D1A delay_8 step_end -FortreeCity_House4_EventScript_217D20:: @ 8217D20 +FortreeCity_House4_EventScript_Wingull:: @ 8217D20 lock faceplayer waitse playmoncry SPECIES_WINGULL, 0 - msgbox FortreeCity_House4_Text_217EE0, MSGBOX_DEFAULT + msgbox FortreeCity_House4_Text_Wingull, MSGBOX_DEFAULT waitmoncry release end -FortreeCity_House4_Text_217D33: @ 8217D33 +FortreeCity_House4_Text_BringsWorldCloserTogether: @ 8217D33 .string "By being together with POKéMON,\n" .string "people make more and more friends.\p" .string "And that brings the world closer\n" .string "together. I think it's wonderful!$" -FortreeCity_House4_Text_217DB9: @ 8217DB9 +FortreeCity_House4_Text_GoBirdPokemon: @ 8217DB9 .string "There!\n" .string "Go, BIRD POKéMON!$" -FortreeCity_House4_Text_217DD2: @ 8217DD2 +FortreeCity_House4_Text_AskedWingullToRunErrand: @ 8217DD2 .string "Heheh, I asked my WINGULL to run\n" .string "an errand for me.$" -FortreeCity_House4_Text_217E05: @ 8217E05 +FortreeCity_House4_Text_WelcomeWingullTakeMentalHerb: @ 8217E05 .string "Good!\n" .string "Welcome back, WINGULL!\p" .string "Huh? What is this?\n" @@ -87,10 +87,10 @@ FortreeCity_House4_Text_217E05: @ 8217E05 .string "But I'm not a TRAINER, so you can\n" .string "have it.$" -FortreeCity_House4_Text_217EA8: @ 8217EA8 +FortreeCity_House4_Text_FriendsFarAwayThanksToWingull: @ 8217EA8 .string "Thanks to my WINGULL, I have friends\n" .string "who live far away.$" -FortreeCity_House4_Text_217EE0: @ 8217EE0 +FortreeCity_House4_Text_Wingull: @ 8217EE0 .string "WINGULL: Pihyoh!$" diff --git a/data/maps/FortreeCity_House5/map.json b/data/maps/FortreeCity_House5/map.json index a60c02ec3..a53b4e35c 100644 --- a/data/maps/FortreeCity_House5/map.json +++ b/data/maps/FortreeCity_House5/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House5_EventScript_217EF2", + "script": "FortreeCity_House5_EventScript_PokefanF", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House5_EventScript_217F04", + "script": "FortreeCity_House5_EventScript_Zigzagoon", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House5_EventScript_217EFB", + "script": "FortreeCity_House5_EventScript_Man", "flag": "0" } ], diff --git a/data/maps/FortreeCity_House5/scripts.inc b/data/maps/FortreeCity_House5/scripts.inc index a40fe0e83..4d27c2f06 100644 --- a/data/maps/FortreeCity_House5/scripts.inc +++ b/data/maps/FortreeCity_House5/scripts.inc @@ -1,35 +1,35 @@ FortreeCity_House5_MapScripts:: @ 8217EF1 .byte 0 -FortreeCity_House5_EventScript_217EF2:: @ 8217EF2 - msgbox FortreeCity_House5_Text_217F17, MSGBOX_NPC +FortreeCity_House5_EventScript_PokefanF:: @ 8217EF2 + msgbox FortreeCity_House5_Text_TreeHousesAreGreat, MSGBOX_NPC end -FortreeCity_House5_EventScript_217EFB:: @ 8217EFB - msgbox FortreeCity_House5_Text_217F80, MSGBOX_NPC +FortreeCity_House5_EventScript_Man:: @ 8217EFB + msgbox FortreeCity_House5_Text_AdaptedToNature, MSGBOX_NPC end -FortreeCity_House5_EventScript_217F04:: @ 8217F04 +FortreeCity_House5_EventScript_Zigzagoon:: @ 8217F04 lock faceplayer waitse playmoncry SPECIES_ZIGZAGOON, 0 - msgbox FortreeCity_House5_Text_217FFB, MSGBOX_DEFAULT + msgbox FortreeCity_House5_Text_Zigzagoon, MSGBOX_DEFAULT waitmoncry release end -FortreeCity_House5_Text_217F17: @ 8217F17 +FortreeCity_House5_Text_TreeHousesAreGreat: @ 8217F17 .string "The tree houses of FORTREE are great!\p" .string "I think it's the number one town for\n" .string "living together with POKéMON.$" -FortreeCity_House5_Text_217F80: @ 8217F80 +FortreeCity_House5_Text_AdaptedToNature: @ 8217F80 .string "POKéMON and people have adapted to\n" .string "nature for survival.\p" .string "There's no need to make nature\n" .string "conform to the way we want to live.$" -FortreeCity_House5_Text_217FFB: @ 8217FFB +FortreeCity_House5_Text_Zigzagoon: @ 8217FFB .string "ZIGZAGOON: Bufuu!$" From de933000e3c664459df7842d662841f2117b4f51 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 7 Nov 2019 15:21:32 -0500 Subject: [PATCH 26/40] Document Lavaridge scripts --- data/maps/LavaridgeTown/map.json | 26 +-- data/maps/LavaridgeTown/scripts.inc | 218 +++++++++---------- data/maps/LavaridgeTown_Gym_1F/scripts.inc | 2 +- data/maps/LavaridgeTown_HerbShop/map.json | 6 +- data/maps/LavaridgeTown_HerbShop/scripts.inc | 30 +-- data/maps/LavaridgeTown_House/map.json | 4 +- data/maps/LavaridgeTown_House/scripts.inc | 12 +- data/scripts/field_poison.inc | 2 +- data/scripts/new_game.inc | 4 +- include/constants/flags.h | 6 +- 10 files changed, 155 insertions(+), 155 deletions(-) diff --git a/data/maps/LavaridgeTown/map.json b/data/maps/LavaridgeTown/map.json index 65a6a25d3..1212f3354 100644 --- a/data/maps/LavaridgeTown/map.json +++ b/data/maps/LavaridgeTown/map.json @@ -30,7 +30,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_EventScript_1EA73B", + "script": "LavaridgeTown_EventScript_ExpertF", "flag": "0" }, { @@ -43,7 +43,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_EventScript_1EA70E", + "script": "LavaridgeTown_EventScript_ExpertM", "flag": "0" }, { @@ -56,7 +56,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_EventScript_1EA717", + "script": "LavaridgeTown_EventScript_OldMan", "flag": "0" }, { @@ -69,7 +69,7 @@ "movement_range_y": 2, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_EventScript_1EA720", + "script": "LavaridgeTown_EventScript_Twin", "flag": "0" }, { @@ -82,7 +82,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_EventScript_1EA729", + "script": "LavaridgeTown_EventScript_HotSpringsOldWoman1", "flag": "0" }, { @@ -95,7 +95,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_EventScript_1EA732", + "script": "LavaridgeTown_EventScript_HotSpringsOldWoman2", "flag": "0" }, { @@ -109,7 +109,7 @@ "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", - "flag": "FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_2" + "flag": "FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_ON_BIKE" }, { "graphics_id": "EVENT_OBJ_GFX_VAR_0", @@ -122,7 +122,7 @@ "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", - "flag": "FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1" + "flag": "FLAG_HIDE_LAVARIDGE_TOWN_RIVAL" }, { "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", @@ -134,7 +134,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_EventScript_1EA744", + "script": "LavaridgeTown_EventScript_EggWoman", "flag": "0" } ], @@ -190,7 +190,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "LavaridgeTown_EventScript_1EA6FA" + "script": "LavaridgeTown_EventScript_HotSpringsTrigger" } ], "bg_events": [ @@ -200,7 +200,7 @@ "y": 16, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LavaridgeTown_EventScript_1EA7B7" + "script": "LavaridgeTown_EventScript_HerbShopSign" }, { "type": "sign", @@ -208,7 +208,7 @@ "y": 15, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LavaridgeTown_EventScript_1EA7AE" + "script": "LavaridgeTown_EventScript_GymSign" }, { "type": "sign", @@ -224,7 +224,7 @@ "y": 8, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LavaridgeTown_EventScript_1EA7A5" + "script": "LavaridgeTown_EventScript_TownSign" }, { "type": "sign", diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc index a964d42e5..dc45f94d4 100644 --- a/data/maps/LavaridgeTown/scripts.inc +++ b/data/maps/LavaridgeTown/scripts.inc @@ -1,98 +1,98 @@ LavaridgeTown_MapScripts:: @ 81EA4D3 map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_OnTransition - map_script MAP_SCRIPT_ON_FRAME_TABLE, LavaridgeTown_MapScript2_1EA547 + map_script MAP_SCRIPT_ON_FRAME_TABLE, LavaridgeTown_OnFrame .byte 0 LavaridgeTown_OnTransition: @ 81EA4DE setflag FLAG_VISITED_LAVARIDGE_TOWN - call_if_set FLAG_FLANNERY_GIVES_BADGE_INFO, LavaridgeTown_EventScript_1EA514 - call_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, LavaridgeTown_EventScript_1EA53F + call_if_set FLAG_WHITEOUT_TO_LAVARIDGE, LavaridgeTown_EventScript_ClearLavaridgeWhiteOut + call_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, LavaridgeTown_EventScript_ShowMtChimneyTrainers call Common_EventScript_SetupRivalGfxId call Common_EventScript_SetupRivalOnBikeGfxId compare VAR_LAVARIDGE_TOWN_STATE, 1 - call_if_eq LavaridgeTown_EventScript_1EA518 + call_if_eq LavaridgeTown_EventScript_CheckSetRivalPos compare VAR_LAVARIDGE_TOWN_STATE, 1 - call_if_eq LavaridgeTown_EventScript_1EA543 + call_if_eq LavaridgeTown_EventScript_HideMapNamePopup end -LavaridgeTown_EventScript_1EA514:: @ 81EA514 - clearflag FLAG_FLANNERY_GIVES_BADGE_INFO +LavaridgeTown_EventScript_ClearLavaridgeWhiteOut:: @ 81EA514 + clearflag FLAG_WHITEOUT_TO_LAVARIDGE return -LavaridgeTown_EventScript_1EA518:: @ 81EA518 +LavaridgeTown_EventScript_CheckSetRivalPos:: @ 81EA518 getplayerxy VAR_0x8004, VAR_0x8005 compare VAR_0x8004, 9 - goto_if_eq LavaridgeTown_EventScript_1EA529 + goto_if_eq LavaridgeTown_EventScript_SetRivalPos return -LavaridgeTown_EventScript_1EA529:: @ 81EA529 +LavaridgeTown_EventScript_SetRivalPos:: @ 81EA529 setobjectxyperm 8, 11, 9 setobjectxyperm 7, 9, 8 setobjectmovementtype 7, MOVEMENT_TYPE_FACE_UP - clearflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1 + clearflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL return -LavaridgeTown_EventScript_1EA53F:: @ 81EA53F +LavaridgeTown_EventScript_ShowMtChimneyTrainers:: @ 81EA53F clearflag FLAG_HIDE_MT_CHIMNEY_TRAINERS return -LavaridgeTown_EventScript_1EA543:: @ 81EA543 +LavaridgeTown_EventScript_HideMapNamePopup:: @ 81EA543 setflag FLAG_HIDE_MAP_NAME_POPUP return -LavaridgeTown_MapScript2_1EA547: @ 81EA547 - map_script_2 VAR_LAVARIDGE_TOWN_STATE, 1, LavaridgeTown_EventScript_1EA551 +LavaridgeTown_OnFrame: @ 81EA547 + map_script_2 VAR_LAVARIDGE_TOWN_STATE, 1, LavaridgeTown_EventScript_RivalGiveGoGoggles .2byte 0 -LavaridgeTown_EventScript_1EA551:: @ 81EA551 +LavaridgeTown_EventScript_RivalGiveGoGoggles:: @ 81EA551 lockall getplayerxy VAR_0x8008, VAR_0x8009 compare VAR_0x8008, 9 - call_if_eq LavaridgeTown_EventScript_1EA63A + call_if_eq LavaridgeTown_EventScript_RivalNoticePlayer compare VAR_0x8008, 9 - call_if_ne LavaridgeTown_EventScript_1EA65C + call_if_ne LavaridgeTown_EventScript_RivalExitHerbShop delay 20 checkplayergender compare VAR_RESULT, MALE - call_if_eq LavaridgeTown_EventScript_1EA630 + call_if_eq LavaridgeTown_EventScript_PlayMayMusic compare VAR_RESULT, FEMALE - call_if_eq LavaridgeTown_EventScript_1EA635 + call_if_eq LavaridgeTown_EventScript_PlayBrendanMusic compare VAR_0x8008, 9 - call_if_eq LavaridgeTown_EventScript_1EA6A1 + call_if_eq LavaridgeTown_EventScript_RivalApproachPlayer1 compare VAR_0x8008, 9 - call_if_ne LavaridgeTown_EventScript_1EA6AC + call_if_ne LavaridgeTown_EventScript_RivalApproachPlayer2 checkplayergender compare VAR_RESULT, MALE - goto_if_eq LavaridgeTown_EventScript_1EA5B5 + goto_if_eq LavaridgeTown_EventScript_MayGiveGoGoggles compare VAR_RESULT, FEMALE - goto_if_eq LavaridgeTown_EventScript_1EA5DA + goto_if_eq LavaridgeTown_EventScript_BrendanGiveGoGoggles end -LavaridgeTown_EventScript_1EA5B5:: @ 81EA5B5 - msgbox LavaridgeTown_Text_1EA7C0, MSGBOX_DEFAULT +LavaridgeTown_EventScript_MayGiveGoGoggles:: @ 81EA5B5 + msgbox LavaridgeTown_Text_MayNiceBadgesTakeThis, MSGBOX_DEFAULT giveitem_std ITEM_GO_GOGGLES setflag FLAG_RECEIVED_GO_GOGGLES - msgbox LavaridgeTown_Text_1EA897, MSGBOX_DEFAULT - goto LavaridgeTown_EventScript_1EA5FF + msgbox LavaridgeTown_Text_MayExplainGoGogglesChallengeDad, MSGBOX_DEFAULT + goto LavaridgeTown_EventScript_RivalExit end -LavaridgeTown_EventScript_1EA5DA:: @ 81EA5DA - msgbox LavaridgeTown_Text_1EA9A2, MSGBOX_DEFAULT +LavaridgeTown_EventScript_BrendanGiveGoGoggles:: @ 81EA5DA + msgbox LavaridgeTown_Text_BrendanNiceBadgesTakeThis, MSGBOX_DEFAULT giveitem_std ITEM_GO_GOGGLES setflag FLAG_RECEIVED_GO_GOGGLES - msgbox LavaridgeTown_Text_1EAA2E, MSGBOX_DEFAULT - goto LavaridgeTown_EventScript_1EA5FF + msgbox LavaridgeTown_Text_BrendanExplainGoGogglesChallengeDad, MSGBOX_DEFAULT + goto LavaridgeTown_EventScript_RivalExit end -LavaridgeTown_EventScript_1EA5FF:: @ 81EA5FF +LavaridgeTown_EventScript_RivalExit:: @ 81EA5FF closemessage removeobject 8 addobject 7 delay 30 compare VAR_0x8008, 9 - call_if_eq LavaridgeTown_EventScript_1EA6B7 + call_if_eq LavaridgeTown_EventScript_RivalExit1 compare VAR_0x8008, 9 - call_if_ne LavaridgeTown_EventScript_1EA6C9 + call_if_ne LavaridgeTown_EventScript_RivalExit2 removeobject 7 setvar VAR_LAVARIDGE_TOWN_STATE, 2 clearflag FLAG_HIDE_MAP_NAME_POPUP @@ -101,15 +101,15 @@ LavaridgeTown_EventScript_1EA5FF:: @ 81EA5FF releaseall end -LavaridgeTown_EventScript_1EA630:: @ 81EA630 +LavaridgeTown_EventScript_PlayMayMusic:: @ 81EA630 playbgm MUS_GIRL_SUP, 1 return -LavaridgeTown_EventScript_1EA635:: @ 81EA635 +LavaridgeTown_EventScript_PlayBrendanMusic:: @ 81EA635 playbgm MUS_BOY_SUP, 1 return -LavaridgeTown_EventScript_1EA63A:: @ 81EA63A +LavaridgeTown_EventScript_RivalNoticePlayer:: @ 81EA63A applymovement 8, Common_Movement_WalkInPlaceFastestUp waitmovement 0 playse SE_PIN @@ -119,11 +119,11 @@ LavaridgeTown_EventScript_1EA63A:: @ 81EA63A waitmovement 0 return -LavaridgeTown_EventScript_1EA65C:: @ 81EA65C +LavaridgeTown_EventScript_RivalExitHerbShop:: @ 81EA65C opendoor 12, 15 waitdooranim addobject 8 - applymovement 8, LavaridgeTown_Movement_1EA6F8 + applymovement 8, LavaridgeTown_Movement_RivalExitHerbShop waitmovement 0 closedoor 12, 15 waitdooranim @@ -138,28 +138,28 @@ LavaridgeTown_EventScript_1EA65C:: @ 81EA65C waitmovement 0 return -LavaridgeTown_EventScript_1EA6A1:: @ 81EA6A1 - applymovement 8, LavaridgeTown_Movement_1EA6F4 +LavaridgeTown_EventScript_RivalApproachPlayer1:: @ 81EA6A1 + applymovement 8, LavaridgeTown_Movement_RivalApproachPlayer1 waitmovement 0 return -LavaridgeTown_EventScript_1EA6AC:: @ 81EA6AC - applymovement 8, LavaridgeTown_Movement_1EA6ED +LavaridgeTown_EventScript_RivalApproachPlayer2:: @ 81EA6AC + applymovement 8, LavaridgeTown_Movement_RivalApproachPlayer2 waitmovement 0 return -LavaridgeTown_EventScript_1EA6B7:: @ 81EA6B7 - applymovement EVENT_OBJ_ID_PLAYER, LavaridgeTown_Movement_1EA6DF - applymovement 7, LavaridgeTown_Movement_1EA6E3 +LavaridgeTown_EventScript_RivalExit1:: @ 81EA6B7 + applymovement EVENT_OBJ_ID_PLAYER, LavaridgeTown_Movement_PlayerWatchRivalExit + applymovement 7, LavaridgeTown_Movement_RivalExit1 waitmovement 0 return -LavaridgeTown_EventScript_1EA6C9:: @ 81EA6C9 - applymovement 7, LavaridgeTown_Movement_1EA6D4 +LavaridgeTown_EventScript_RivalExit2:: @ 81EA6C9 + applymovement 7, LavaridgeTown_Movement_RivalExit2 waitmovement 0 return -LavaridgeTown_Movement_1EA6D4: @ 81EA6D4 +LavaridgeTown_Movement_RivalExit2: @ 81EA6D4 walk_fast_right walk_fast_right walk_fast_right @@ -172,13 +172,13 @@ LavaridgeTown_Movement_1EA6D4: @ 81EA6D4 walk_fast_up step_end -LavaridgeTown_Movement_1EA6DF: @ 81EA6DF +LavaridgeTown_Movement_PlayerWatchRivalExit: @ 81EA6DF delay_16 delay_8 walk_in_place_fastest_right step_end -LavaridgeTown_Movement_1EA6E3: @ 81EA6E3 +LavaridgeTown_Movement_RivalExit1: @ 81EA6E3 walk_fast_down walk_fast_right walk_fast_right @@ -190,7 +190,7 @@ LavaridgeTown_Movement_1EA6E3: @ 81EA6E3 walk_fast_right step_end -LavaridgeTown_Movement_1EA6ED: @ 81EA6ED +LavaridgeTown_Movement_RivalApproachPlayer2: @ 81EA6ED walk_left walk_left walk_left @@ -199,97 +199,97 @@ LavaridgeTown_Movement_1EA6ED: @ 81EA6ED walk_left step_end -LavaridgeTown_Movement_1EA6F4: @ 81EA6F4 +LavaridgeTown_Movement_RivalApproachPlayer1: @ 81EA6F4 walk_left walk_left walk_up step_end -LavaridgeTown_Movement_1EA6F8: @ 81EA6F8 +LavaridgeTown_Movement_RivalExitHerbShop: @ 81EA6F8 walk_down step_end -LavaridgeTown_EventScript_1EA6FA:: @ 81EA6FA +LavaridgeTown_EventScript_HotSpringsTrigger:: @ 81EA6FA specialvar VAR_RESULT, GetPlayerFacingDirection - compare VAR_RESULT, 1 - goto_if_eq LavaridgeTown_EventScript_1EA70B + compare VAR_RESULT, DIR_SOUTH + goto_if_eq LavaridgeTown_EventScript_EnteredHotSprings end -LavaridgeTown_EventScript_1EA70B:: @ 81EA70B +LavaridgeTown_EventScript_EnteredHotSprings:: @ 81EA70B incrementgamestat GAME_STAT_ENTERED_HOT_SPRINGS end -LavaridgeTown_EventScript_1EA70E:: @ 81EA70E - msgbox LavaridgeTown_Text_1EAE03, MSGBOX_NPC +LavaridgeTown_EventScript_ExpertM:: @ 81EA70E + msgbox LavaridgeTown_Text_HotSpringsNeverRunDry, MSGBOX_NPC end -LavaridgeTown_EventScript_1EA717:: @ 81EA717 - msgbox LavaridgeTown_Text_1EAEE1, MSGBOX_SIGN +LavaridgeTown_EventScript_OldMan:: @ 81EA717 + msgbox LavaridgeTown_Text_PokemonNippedBackside, MSGBOX_SIGN end -LavaridgeTown_EventScript_1EA720:: @ 81EA720 - msgbox LavaridgeTown_Text_1EAF9B, MSGBOX_NPC +LavaridgeTown_EventScript_Twin:: @ 81EA720 + msgbox LavaridgeTown_Text_BatheInHotSpringsEveryDay, MSGBOX_NPC end -LavaridgeTown_EventScript_1EA729:: @ 81EA729 - msgbox LavaridgeTown_Text_1EB003, MSGBOX_NPC +LavaridgeTown_EventScript_HotSpringsOldWoman1:: @ 81EA729 + msgbox LavaridgeTown_Text_IfPokemonInHotSprings, MSGBOX_NPC end -LavaridgeTown_EventScript_1EA732:: @ 81EA732 - msgbox LavaridgeTown_Text_1EB092, MSGBOX_NPC +LavaridgeTown_EventScript_HotSpringsOldWoman2:: @ 81EA732 + msgbox LavaridgeTown_Text_HotSpringsClaims, MSGBOX_NPC end -LavaridgeTown_EventScript_1EA73B:: @ 81EA73B - msgbox LavaridgeTown_Text_1EAF4E, MSGBOX_NPC +LavaridgeTown_EventScript_ExpertF:: @ 81EA73B + msgbox LavaridgeTown_Text_OhYouLikeHotSprings, MSGBOX_NPC end -LavaridgeTown_EventScript_1EA744:: @ 81EA744 +LavaridgeTown_EventScript_EggWoman:: @ 81EA744 lock faceplayer - goto_if_set FLAG_RECEIVED_LAVARIDGE_EGG, LavaridgeTown_EventScript_1EA787 - msgbox LavaridgeTown_Text_1EAB80, MSGBOX_YESNO + goto_if_set FLAG_RECEIVED_LAVARIDGE_EGG, LavaridgeTown_EventScript_ReceivedEgg + msgbox LavaridgeTown_Text_HaveEggWillYouTakeIt, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq LavaridgeTown_EventScript_1EA79B + goto_if_eq LavaridgeTown_EventScript_DeclineEgg getpartysize compare VAR_RESULT, PARTY_SIZE - goto_if_eq LavaridgeTown_EventScript_1EA791 - msgbox LavaridgeTown_Text_1EACC0, MSGBOX_DEFAULT + goto_if_eq LavaridgeTown_EventScript_NoRoomForEgg + msgbox LavaridgeTown_Text_HopeYoullWalkPlentyWithEgg, MSGBOX_DEFAULT setflag FLAG_RECEIVED_LAVARIDGE_EGG playfanfare MUS_FANFA4 - message LavaridgeTown_Text_1EACF4 + message LavaridgeTown_Text_ReceivedTheEgg waitfanfare giveegg SPECIES_WYNAUT release end -LavaridgeTown_EventScript_1EA787:: @ 81EA787 - msgbox LavaridgeTown_Text_1EAD9E, MSGBOX_DEFAULT +LavaridgeTown_EventScript_ReceivedEgg:: @ 81EA787 + msgbox LavaridgeTown_Text_EverySoOftenEggFoundAtDayCare, MSGBOX_DEFAULT release end -LavaridgeTown_EventScript_1EA791:: @ 81EA791 - msgbox LavaridgeTown_Text_1EAD09, MSGBOX_DEFAULT +LavaridgeTown_EventScript_NoRoomForEgg:: @ 81EA791 + msgbox LavaridgeTown_Text_NoRoomForThisEgg, MSGBOX_DEFAULT release end -LavaridgeTown_EventScript_1EA79B:: @ 81EA79B - msgbox LavaridgeTown_Text_1EAD44, MSGBOX_DEFAULT +LavaridgeTown_EventScript_DeclineEgg:: @ 81EA79B + msgbox LavaridgeTown_Text_AsYouWishThen, MSGBOX_DEFAULT release end -LavaridgeTown_EventScript_1EA7A5:: @ 81EA7A5 - msgbox LavaridgeTown_Text_1EB12B, MSGBOX_SIGN +LavaridgeTown_EventScript_TownSign:: @ 81EA7A5 + msgbox LavaridgeTown_Text_TownSign, MSGBOX_SIGN end -LavaridgeTown_EventScript_1EA7AE:: @ 81EA7AE - msgbox LavaridgeTown_Text_1EB178, MSGBOX_SIGN +LavaridgeTown_EventScript_GymSign:: @ 81EA7AE + msgbox LavaridgeTown_Text_GymSign, MSGBOX_SIGN end -LavaridgeTown_EventScript_1EA7B7:: @ 81EA7B7 - msgbox LavaridgeTown_Text_1EB1CB, MSGBOX_SIGN +LavaridgeTown_EventScript_HerbShopSign:: @ 81EA7B7 + msgbox LavaridgeTown_Text_HerbShopSign, MSGBOX_SIGN end -LavaridgeTown_Text_1EA7C0: @ 81EA7C0 +LavaridgeTown_Text_MayNiceBadgesTakeThis: @ 81EA7C0 .string "MAY: {PLAYER}{KUN}! Long time no see!\p" .string "Oh? While I visited the hot springs,\n" .string "you got the LAVARIDGE GYM BADGE.\p" @@ -299,7 +299,7 @@ LavaridgeTown_Text_1EA7C0: @ 81EA7C0 .string "I guess it would be okay for you to\n" .string "have this.$" -LavaridgeTown_Text_1EA897: @ 81EA897 +LavaridgeTown_Text_MayExplainGoGogglesChallengeDad: @ 81EA897 .string "MAY: With those GO-GOGGLES, you'll\n" .string "have no trouble getting through the\l" .string "desert near ROUTE 111.\p" @@ -311,7 +311,7 @@ LavaridgeTown_Text_1EA897: @ 81EA897 .string "your dad in PETALBURG GYM.\p" .string "See you again!$" -LavaridgeTown_Text_1EA9A2: @ 81EA9A2 +LavaridgeTown_Text_BrendanNiceBadgesTakeThis: @ 81EA9A2 .string "BRENDAN: {PLAYER}, hey, it's been a while.\n" .string "How's it going?\p" .string "Hmm…\n" @@ -319,7 +319,7 @@ LavaridgeTown_Text_1EA9A2: @ 81EA9A2 .string "All right, then.\n" .string "You may as well have this.$" -LavaridgeTown_Text_1EAA2E: @ 81EAA2E +LavaridgeTown_Text_BrendanExplainGoGogglesChallengeDad: @ 81EAA2E .string "BRENDAN: Keep those with you if you're\n" .string "planning on going into that desert near\l" .string "ROUTE 111.\p" @@ -333,7 +333,7 @@ LavaridgeTown_Text_1EAA2E: @ 81EAA2E .string "he really is tough.\p" .string "See you around!$" -LavaridgeTown_Text_1EAB80: @ 81EAB80 +LavaridgeTown_Text_HaveEggWillYouTakeIt: @ 81EAB80 .string "I have here an EGG.\p" .string "I'd hoped to hatch it by covering it in\n" .string "hot sand by the hot springs.\l" @@ -346,28 +346,28 @@ LavaridgeTown_Text_1EAB80: @ 81EAB80 .string "So, what say you?\n" .string "Will you take this EGG to hatch?$" -LavaridgeTown_Text_1EACC0: @ 81EACC0 +LavaridgeTown_Text_HopeYoullWalkPlentyWithEgg: @ 81EACC0 .string "Good! I hope you'll walk plenty with\n" .string "this here EGG!$" -LavaridgeTown_Text_1EACF4: @ 81EACF4 +LavaridgeTown_Text_ReceivedTheEgg: @ 81EACF4 .string "{PLAYER} received the EGG.$" -LavaridgeTown_Text_1EAD09: @ 81EAD09 +LavaridgeTown_Text_NoRoomForThisEgg: @ 81EAD09 .string "Oh? You've too many POKéMON.\n" .string "There's no room for this EGG…$" -LavaridgeTown_Text_1EAD44: @ 81EAD44 +LavaridgeTown_Text_AsYouWishThen: @ 81EAD44 .string "As you wish, then…\p" .string "If you have a change of heart about\n" .string "hatching this EGG, I will be here.$" -LavaridgeTown_Text_1EAD9E: @ 81EAD9E +LavaridgeTown_Text_EverySoOftenEggFoundAtDayCare: @ 81EAD9E .string "Every so often, an EGG will be found at\n" .string "the POKéMON DAY CARE.\p" .string "Or at least that's how the rumor goes.$" -LavaridgeTown_Text_1EAE03: @ 81EAE03 +LavaridgeTown_Text_HotSpringsNeverRunDry: @ 81EAE03 .string "We draw as much hot water as we need,\n" .string "and yet the hot springs never run dry.\p" .string "Isn't it magical?\p" @@ -376,47 +376,47 @@ LavaridgeTown_Text_1EAE03: @ 81EAE03 .string "ground are heated by magma to well up\l" .string "as hot springs.$" -LavaridgeTown_Text_1EAEE1: @ 81EAEE1 +LavaridgeTown_Text_PokemonNippedBackside: @ 81EAEE1 .string "Being buried in this hot sand is…\n" .string "Sigh…\p" .string "So warm and heavenly…\p" .string "Eh? Gyaah! Ouch!\p" .string "A POKéMON nipped my backside!$" -LavaridgeTown_Text_1EAF4E: @ 81EAF4E +LavaridgeTown_Text_OhYouLikeHotSprings: @ 81EAF4E .string "Oh, you like hot springs, do you?\p" .string "That's surprising for one as young\n" .string "as you.$" -LavaridgeTown_Text_1EAF9B: @ 81EAF9B +LavaridgeTown_Text_BatheInHotSpringsEveryDay: @ 81EAF9B .string "I bathe in the hot springs every day.\p" .string "I want to become a beautiful and strong\n" .string "GYM LEADER like FLANNERY.$" -LavaridgeTown_Text_1EB003: @ 81EB003 +LavaridgeTown_Text_IfPokemonInHotSprings: @ 81EB003 .string "If people put POKéMON in hot springs,\n" .string "it might be seriously strange.\p" .string "Why, it might be an electric bath, or\n" .string "a bubble bath, or even a lava bath…$" -LavaridgeTown_Text_1EB092: @ 81EB092 +LavaridgeTown_Text_HotSpringsClaims: @ 81EB092 .string "They're claiming that these hot springs\n" .string "are good for calming nervous tension,\l" .string "relieving aching muscles, solving\l" .string "romantic problems, and attracting\l" .string "money…$" -LavaridgeTown_Text_1EB12B: @ 81EB12B +LavaridgeTown_Text_TownSign: @ 81EB12B .string "LAVARIDGE TOWN\p" .string "“POKéMON CENTER HOT SPRINGS\n" .string "An excellent place for relaxing!”$" -LavaridgeTown_Text_1EB178: @ 81EB178 +LavaridgeTown_Text_GymSign: @ 81EB178 .string "LAVARIDGE TOWN POKéMON GYM\n" .string "LEADER: FLANNERY\l" .string "“One with a fiery passion that burns!”$" -LavaridgeTown_Text_1EB1CB: @ 81EB1CB +LavaridgeTown_Text_HerbShopSign: @ 81EB1CB .string "POKéMON HERB SHOP\n" .string "“Bitter taste--better cure!”$" diff --git a/data/maps/LavaridgeTown_Gym_1F/scripts.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc index a5dcabf30..b94970e62 100644 --- a/data/maps/LavaridgeTown_Gym_1F/scripts.inc +++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc @@ -66,7 +66,7 @@ LavaridgeTown_Gym_1F_EventScript_FlanneryDefeated:: @ 81FE7C1 waitmessage call Common_EventScript_PlayGymBadgeFanfare msgbox LavaridgeTown_Gym_1F_Text_ExplainHeatBadgeTakeThis, MSGBOX_DEFAULT - setflag FLAG_FLANNERY_GIVES_BADGE_INFO + setflag FLAG_WHITEOUT_TO_LAVARIDGE setflag FLAG_DEFEATED_LAVARIDGE_GYM setflag FLAG_BADGE04_GET addvar VAR_PETALBURG_GYM_STATE, 1 diff --git a/data/maps/LavaridgeTown_HerbShop/map.json b/data/maps/LavaridgeTown_HerbShop/map.json index 203812fb2..1e7048b3f 100644 --- a/data/maps/LavaridgeTown_HerbShop/map.json +++ b/data/maps/LavaridgeTown_HerbShop/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_HerbShop_EventScript_1FE4D7", + "script": "LavaridgeTown_HerbShop_EventScript_Clerk", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_HerbShop_EventScript_1FE505", + "script": "LavaridgeTown_HerbShop_EventScript_OldMan", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_HerbShop_EventScript_1FE4FC", + "script": "LavaridgeTown_HerbShop_EventScript_ExpertM", "flag": "0" } ], diff --git a/data/maps/LavaridgeTown_HerbShop/scripts.inc b/data/maps/LavaridgeTown_HerbShop/scripts.inc index c7ae5fb9e..c32468589 100644 --- a/data/maps/LavaridgeTown_HerbShop/scripts.inc +++ b/data/maps/LavaridgeTown_HerbShop/scripts.inc @@ -1,18 +1,18 @@ LavaridgeTown_HerbShop_MapScripts:: @ 81FE4D6 .byte 0 -LavaridgeTown_HerbShop_EventScript_1FE4D7:: @ 81FE4D7 +LavaridgeTown_HerbShop_EventScript_Clerk:: @ 81FE4D7 lock faceplayer - message LavaridgeTown_HerbShop_Text_1FE53E + message LavaridgeTown_HerbShop_Text_WelcomeToHerbShop waitmessage - pokemart LavaridgeTown_HerbShop_Pokemart_1FE4F0 + pokemart LavaridgeTown_HerbShop_Pokemart msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -LavaridgeTown_HerbShop_Pokemart_1FE4F0: @ 81FE4F0 +LavaridgeTown_HerbShop_Pokemart: @ 81FE4F0 .2byte ITEM_ENERGY_POWDER .2byte ITEM_ENERGY_ROOT .2byte ITEM_HEAL_POWDER @@ -21,15 +21,15 @@ LavaridgeTown_HerbShop_Pokemart_1FE4F0: @ 81FE4F0 release end -LavaridgeTown_HerbShop_EventScript_1FE4FC:: @ 81FE4FC - msgbox LavaridgeTown_HerbShop_Text_1FE685, MSGBOX_NPC +LavaridgeTown_HerbShop_EventScript_ExpertM:: @ 81FE4FC + msgbox LavaridgeTown_HerbShop_Text_HerbalMedicineWorksButMonWillDislike, MSGBOX_NPC end -LavaridgeTown_HerbShop_EventScript_1FE505:: @ 81FE505 +LavaridgeTown_HerbShop_EventScript_OldMan:: @ 81FE505 lock faceplayer - goto_if_set FLFLAG_RECEIVED_CHARCOAL, LavaridgeTown_HerbShop_EventScript_1FE534 - msgbox LavaridgeTown_HerbShop_Text_1FE584, MSGBOX_DEFAULT + goto_if_set FLFLAG_RECEIVED_CHARCOAL, LavaridgeTown_HerbShop_EventScript_ExplainCharcoal + msgbox LavaridgeTown_HerbShop_Text_YouveComeToLookAtHerbalMedicine, MSGBOX_DEFAULT giveitem_std ITEM_CHARCOAL compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull @@ -37,22 +37,22 @@ LavaridgeTown_HerbShop_EventScript_1FE505:: @ 81FE505 release end -LavaridgeTown_HerbShop_EventScript_1FE534:: @ 81FE534 - msgbox LavaridgeTown_HerbShop_Text_1FE5EB, MSGBOX_DEFAULT +LavaridgeTown_HerbShop_EventScript_ExplainCharcoal:: @ 81FE534 + msgbox LavaridgeTown_HerbShop_Text_ExplainCharcoal, MSGBOX_DEFAULT release end -LavaridgeTown_HerbShop_Text_1FE53E: @ 81FE53E +LavaridgeTown_HerbShop_Text_WelcomeToHerbShop: @ 81FE53E .string "Welcome to the HERB SHOP, home of\n" .string "effective and inexpensive medicine!$" -LavaridgeTown_HerbShop_Text_1FE584: @ 81FE584 +LavaridgeTown_HerbShop_Text_YouveComeToLookAtHerbalMedicine: @ 81FE584 .string "You've come to look at herbal medicine\n" .string "in LAVARIDGE?\p" .string "That's rather commendable.\p" .string "I like you! Take this!$" -LavaridgeTown_HerbShop_Text_1FE5EB: @ 81FE5EB +LavaridgeTown_HerbShop_Text_ExplainCharcoal: @ 81FE5EB .string "That CHARCOAL I gave you, it's used\n" .string "for making herbal medicine.\p" .string "It also does wonders when held by\n" @@ -60,7 +60,7 @@ LavaridgeTown_HerbShop_Text_1FE5EB: @ 81FE5EB .string "It intensifies the power of FIRE-type\n" .string "moves.$" -LavaridgeTown_HerbShop_Text_1FE685: @ 81FE685 +LavaridgeTown_HerbShop_Text_HerbalMedicineWorksButMonWillDislike: @ 81FE685 .string "Herbal medicine works impressively well.\n" .string "But your POKéMON will dislike you for it.\l" .string "It must be horribly bitter!$" diff --git a/data/maps/LavaridgeTown_House/map.json b/data/maps/LavaridgeTown_House/map.json index 83416a7c0..77ebb268e 100644 --- a/data/maps/LavaridgeTown_House/map.json +++ b/data/maps/LavaridgeTown_House/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_House_EventScript_1FF912", + "script": "LavaridgeTown_House_EventScript_OldMan", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_House_EventScript_1FF91B", + "script": "LavaridgeTown_House_EventScript_Zigzagoon", "flag": "0" }, { diff --git a/data/maps/LavaridgeTown_House/scripts.inc b/data/maps/LavaridgeTown_House/scripts.inc index 2dc6bc76e..6db5f9ee5 100644 --- a/data/maps/LavaridgeTown_House/scripts.inc +++ b/data/maps/LavaridgeTown_House/scripts.inc @@ -1,26 +1,26 @@ LavaridgeTown_House_MapScripts:: @ 81FF911 .byte 0 -LavaridgeTown_House_EventScript_1FF912:: @ 81FF912 - msgbox LavaridgeTown_House_Text_1FF92E, MSGBOX_NPC +LavaridgeTown_House_EventScript_OldMan:: @ 81FF912 + msgbox LavaridgeTown_House_Text_WifeWarmingEggInHotSprings, MSGBOX_NPC end -LavaridgeTown_House_EventScript_1FF91B:: @ 81FF91B +LavaridgeTown_House_EventScript_Zigzagoon:: @ 81FF91B lock faceplayer waitse playmoncry SPECIES_ZIGZAGOON, 0 - msgbox LavaridgeTown_House_Text_1FF9BB, MSGBOX_DEFAULT + msgbox LavaridgeTown_House_Text_Zigzagoon, MSGBOX_DEFAULT waitmoncry release end -LavaridgeTown_House_Text_1FF92E: @ 81FF92E +LavaridgeTown_House_Text_WifeWarmingEggInHotSprings: @ 81FF92E .string "My wife's warming an EGG in the hot\n" .string "springs. This is what she told me.\p" .string "She left two POKéMON with the DAY CARE.\n" .string "And they discovered that EGG!$" -LavaridgeTown_House_Text_1FF9BB: @ 81FF9BB +LavaridgeTown_House_Text_Zigzagoon: @ 81FF9BB .string "ZIGZAGOON: Pshoo!$" diff --git a/data/scripts/field_poison.inc b/data/scripts/field_poison.inc index 2ca9c7b06..40b4cf658 100644 --- a/data/scripts/field_poison.inc +++ b/data/scripts/field_poison.inc @@ -16,7 +16,7 @@ EventScript_FieldWhiteOut:: @ 82736D9 special Script_FadeOutMapMusic waitstate fadescreen 1 - call_if_set FLAG_FLANNERY_GIVES_BADGE_INFO, EventScript_SetRespawnLavaridgePkmnCenter + call_if_set FLAG_WHITEOUT_TO_LAVARIDGE, EventScript_SetRespawnLavaridgePkmnCenter special SetCB2WhiteOut waitstate end diff --git a/data/scripts/new_game.inc b/data/scripts/new_game.inc index e39c6eca6..eaef6d45a 100644 --- a/data/scripts/new_game.inc +++ b/data/scripts/new_game.inc @@ -199,8 +199,8 @@ EventScript_ResetAllMapFlags:: @ 82715DE setflag FLAG_HIDE_ROUTE_119_RIVAL_ON_BIKE setflag FLAG_HIDE_ROUTE_104_RIVAL setflag FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS - setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1 - setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_2 + setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL + setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_ON_BIKE setflag FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL setflag FLAG_HIDE_METEOR_FALLS_TEAM_AQUA setflag FLAG_HIDE_DEWFORD_HALL_SLUDGE_BOMB_MAN diff --git a/include/constants/flags.h b/include/constants/flags.h index e76a9d9d7..062ed4771 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -119,7 +119,7 @@ #define FLAG_OCEANIC_MUSEUM_MET_REPORTER 0x69 #define FLAG_RECEIVED_HM04 0x6A #define FLAG_RECEIVED_HM06 0x6B -#define FLAG_FLANNERY_GIVES_BADGE_INFO 0x6C +#define FLAG_WHITEOUT_TO_LAVARIDGE 0x6C // Set after defeating Flannery, so the player cant white out from poison before receiving Go Goggles #define FLAG_RECEIVED_HM05 0x6D #define FLAG_RECEIVED_HM02 0x6E #define FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT 0x6F @@ -969,8 +969,8 @@ #define FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA 0x39E #define FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA 0x39F #define FLAG_HIDE_FALLARBOR_HOUSE_PROF_COZMO 0x3A0 -#define FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1 0x3A1 -#define FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_2 0x3A2 +#define FLAG_HIDE_LAVARIDGE_TOWN_RIVAL 0x3A1 +#define FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_ON_BIKE 0x3A2 #define FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1 0x3A3 #define FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2 0x3A4 #define FLAG_HIDE_FORTREE_CITY_HOUSE_4_WINGULL 0x3A5 From 5d35662c4ccfec2247ac138cb1e341eec1967ac4 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 7 Nov 2019 15:41:42 -0500 Subject: [PATCH 27/40] Document Pacifidlog scripts --- data/maps/PacifidlogTown/map.json | 8 +- data/maps/PacifidlogTown/scripts.inc | 28 +++---- data/maps/PacifidlogTown_House1/map.json | 4 +- data/maps/PacifidlogTown_House1/scripts.inc | 12 +-- data/maps/PacifidlogTown_House2/map.json | 6 +- data/maps/PacifidlogTown_House2/scripts.inc | 88 ++++++++++----------- data/maps/PacifidlogTown_House3/map.json | 4 +- data/maps/PacifidlogTown_House3/scripts.inc | 42 +++++----- data/maps/PacifidlogTown_House4/map.json | 6 +- data/maps/PacifidlogTown_House4/scripts.inc | 34 ++++---- data/maps/PacifidlogTown_House5/map.json | 4 +- data/maps/PacifidlogTown_House5/scripts.inc | 22 +++--- 12 files changed, 129 insertions(+), 129 deletions(-) diff --git a/data/maps/PacifidlogTown/map.json b/data/maps/PacifidlogTown/map.json index 3070d9c07..ff64a5967 100644 --- a/data/maps/PacifidlogTown/map.json +++ b/data/maps/PacifidlogTown/map.json @@ -35,7 +35,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_EventScript_1EBACC", + "script": "PacifidlogTown_EventScript_Girl", "flag": "0" }, { @@ -48,7 +48,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_EventScript_1EBAD5", + "script": "PacifidlogTown_EventScript_Fisherman", "flag": "0" }, { @@ -61,7 +61,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_EventScript_1EBAC3", + "script": "PacifidlogTown_EventScript_NinjaBoy", "flag": "0" } ], @@ -125,7 +125,7 @@ "y": 16, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "PacifidlogTown_EventScript_1EBADE" + "script": "PacifidlogTown_EventScript_TownSign" }, { "type": "sign", diff --git a/data/maps/PacifidlogTown/scripts.inc b/data/maps/PacifidlogTown/scripts.inc index 26e9924ed..fc491cfe3 100644 --- a/data/maps/PacifidlogTown/scripts.inc +++ b/data/maps/PacifidlogTown/scripts.inc @@ -1,44 +1,44 @@ PacifidlogTown_MapScripts:: @ 81EBAB1 map_script MAP_SCRIPT_ON_TRANSITION, PacifidlogTown_OnTransition - map_script MAP_SCRIPT_ON_RESUME, PacifidlogTown_MapScript1_1EBAC0 + map_script MAP_SCRIPT_ON_RESUME, PacifidlogTown_OnResume .byte 0 PacifidlogTown_OnTransition: @ 81EBABC setflag FLAG_VISITED_PACIFIDLOG_TOWN end -PacifidlogTown_MapScript1_1EBAC0: @ 81EBAC0 +PacifidlogTown_OnResume: @ 81EBAC0 setstepcallback STEP_CB_PACIFIDLOG_BRIDGE end -PacifidlogTown_EventScript_1EBAC3:: @ 81EBAC3 - msgbox PacifidlogTown_Text_1EBB6C, MSGBOX_NPC +PacifidlogTown_EventScript_NinjaBoy:: @ 81EBAC3 + msgbox PacifidlogTown_Text_NeatHousesOnWater, MSGBOX_NPC end -PacifidlogTown_EventScript_1EBACC:: @ 81EBACC - msgbox PacifidlogTown_Text_1EBAE7, MSGBOX_NPC +PacifidlogTown_EventScript_Girl:: @ 81EBACC + msgbox PacifidlogTown_Text_FastRunningCurrent, MSGBOX_NPC end -PacifidlogTown_EventScript_1EBAD5:: @ 81EBAD5 - msgbox PacifidlogTown_Text_1EBBAC, MSGBOX_NPC +PacifidlogTown_EventScript_Fisherman:: @ 81EBAD5 + msgbox PacifidlogTown_Text_SkyPillarTooScary, MSGBOX_NPC end -PacifidlogTown_EventScript_1EBADE:: @ 81EBADE - msgbox PacifidlogTown_Text_1EBC7A, MSGBOX_SIGN +PacifidlogTown_EventScript_TownSign:: @ 81EBADE + msgbox PacifidlogTown_Text_TownSign, MSGBOX_SIGN end -PacifidlogTown_Text_1EBAE7: @ 81EBAE7 +PacifidlogTown_Text_FastRunningCurrent: @ 81EBAE7 .string "The sea between PACIFIDLOG and\n" .string "SLATEPORT has a fast-running tide.\p" .string "If you decide to SURF, you could end\n" .string "up swept away somewhere else.$" -PacifidlogTown_Text_1EBB6C: @ 81EBB6C +PacifidlogTown_Text_NeatHousesOnWater: @ 81EBB6C .string "See, isn't it neat?\n" .string "These houses are on water!\p" .string "I was born here!$" -PacifidlogTown_Text_1EBBAC: @ 81EBBAC +PacifidlogTown_Text_SkyPillarTooScary: @ 81EBBAC .string "The SKY PILLAR?\p" .string "…Oh, you must mean that tall, tall\n" .string "tower a little further out.\p" @@ -47,7 +47,7 @@ PacifidlogTown_Text_1EBBAC: @ 81EBBAC .string "Life at sea level in PACIFIDLOG,\n" .string "that suits me fine.$" -PacifidlogTown_Text_1EBC7A: @ 81EBC7A +PacifidlogTown_Text_TownSign: @ 81EBC7A .string "PACIFIDLOG TOWN\p" .string "“Where the morning sun smiles upon\n" .string "the waters.”$" diff --git a/data/maps/PacifidlogTown_House1/map.json b/data/maps/PacifidlogTown_House1/map.json index 1e48da85c..8f7357246 100644 --- a/data/maps/PacifidlogTown_House1/map.json +++ b/data/maps/PacifidlogTown_House1/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_House1_EventScript_20365D", + "script": "PacifidlogTown_House1_EventScript_Man", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_House1_EventScript_203666", + "script": "PacifidlogTown_House1_EventScript_Woman", "flag": "0" } ], diff --git a/data/maps/PacifidlogTown_House1/scripts.inc b/data/maps/PacifidlogTown_House1/scripts.inc index 937b645bc..7759cb29a 100644 --- a/data/maps/PacifidlogTown_House1/scripts.inc +++ b/data/maps/PacifidlogTown_House1/scripts.inc @@ -1,15 +1,15 @@ PacifidlogTown_House1_MapScripts:: @ 820365C .byte 0 -PacifidlogTown_House1_EventScript_20365D:: @ 820365D - msgbox PacifidlogTown_House1_Text_20366F, MSGBOX_NPC +PacifidlogTown_House1_EventScript_Man:: @ 820365D + msgbox PacifidlogTown_House1_Text_RegiStory, MSGBOX_NPC end -PacifidlogTown_House1_EventScript_203666:: @ 8203666 - msgbox PacifidlogTown_House1_Text_20373A, MSGBOX_NPC +PacifidlogTown_House1_EventScript_Woman:: @ 8203666 + msgbox PacifidlogTown_House1_Text_SixDotsOpenThreeDoors, MSGBOX_NPC end -PacifidlogTown_House1_Text_20366F: @ 820366F +PacifidlogTown_House1_Text_RegiStory: @ 820366F .string "In the HOENN region, there are three\n" .string "POKéMON that represent the power of\l" .string "rock, ice, and steel.\p" @@ -18,7 +18,7 @@ PacifidlogTown_House1_Text_20366F: @ 820366F .string "That's the story I heard when I was\n" .string "just a little kid.$" -PacifidlogTown_House1_Text_20373A: @ 820373A +PacifidlogTown_House1_Text_SixDotsOpenThreeDoors: @ 820373A .string "“Six dots open three doors.”\p" .string "Grandpa used to say that, but I don't\n" .string "know what he meant.$" diff --git a/data/maps/PacifidlogTown_House2/map.json b/data/maps/PacifidlogTown_House2/map.json index d57720795..8c9cd91af 100644 --- a/data/maps/PacifidlogTown_House2/map.json +++ b/data/maps/PacifidlogTown_House2/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_House2_EventScript_203792", + "script": "PacifidlogTown_House2_EventScript_FanClubYoungerBrother", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_House2_EventScript_203891", + "script": "PacifidlogTown_House2_EventScript_HappyAzurill", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_House2_EventScript_2038AC", + "script": "PacifidlogTown_House2_EventScript_UnhappyAzurill", "flag": "0" } ], diff --git a/data/maps/PacifidlogTown_House2/scripts.inc b/data/maps/PacifidlogTown_House2/scripts.inc index 4f646ff43..d22a87dc9 100644 --- a/data/maps/PacifidlogTown_House2/scripts.inc +++ b/data/maps/PacifidlogTown_House2/scripts.inc @@ -1,101 +1,101 @@ PacifidlogTown_House2_MapScripts:: @ 8203791 .byte 0 -PacifidlogTown_House2_EventScript_203792:: @ 8203792 +PacifidlogTown_House2_EventScript_FanClubYoungerBrother:: @ 8203792 lock faceplayer dotimebasedevents - call PacifidlogTown_House2_EventScript_2037DE - goto_if_set FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK, PacifidlogTown_House2_EventScript_20387E - call_if_set FLAG_MET_FANCLUB_YOUNGER_BROTHER, PacifidlogTown_House2_EventScript_2037F8 - call_if_unset FLAG_MET_FANCLUB_YOUNGER_BROTHER, PacifidlogTown_House2_EventScript_203801 + call PacifidlogTown_House2_EventScript_UpdateFanClubTMFlag + goto_if_set FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK, PacifidlogTown_House2_EventScript_ComeBackInXDays + call_if_set FLAG_MET_FANCLUB_YOUNGER_BROTHER, PacifidlogTown_House2_EventScript_MonAssessment + call_if_unset FLAG_MET_FANCLUB_YOUNGER_BROTHER, PacifidlogTown_House2_EventScript_FirstMonAssessment setflag FLAG_MET_FANCLUB_YOUNGER_BROTHER specialvar VAR_RESULT, GetLeadMonFriendshipScore compare VAR_RESULT, 4 - goto_if_ge PacifidlogTown_House2_EventScript_203816 + goto_if_ge PacifidlogTown_House2_EventScript_GiveReturn specialvar VAR_RESULT, GetLeadMonFriendshipScore compare VAR_RESULT, 2 - goto_if_ge PacifidlogTown_House2_EventScript_203845 - goto PacifidlogTown_House2_EventScript_20384F + goto_if_ge PacifidlogTown_House2_EventScript_PutInEffort + goto PacifidlogTown_House2_EventScript_GiveFrustration end -PacifidlogTown_House2_EventScript_2037DE:: @ 82037DE +PacifidlogTown_House2_EventScript_UpdateFanClubTMFlag:: @ 82037DE goto_if_unset FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK, Common_EventScript_NopReturn specialvar VAR_RESULT, GetDaysUntilPacifidlogTMAvailable compare VAR_RESULT, 0 - call_if_eq PacifidlogTown_House2_EventScript_203812 + call_if_eq PacifidlogTown_House2_EventScript_ClearReceivedFanClubTM return -PacifidlogTown_House2_EventScript_2037F8:: @ 82037F8 - msgbox PacifidlogTown_House2_Text_20395B, MSGBOX_DEFAULT +PacifidlogTown_House2_EventScript_MonAssessment:: @ 82037F8 + msgbox PacifidlogTown_House2_Text_AhYourPokemon, MSGBOX_DEFAULT return -PacifidlogTown_House2_EventScript_203801:: @ 8203801 - msgbox PacifidlogTown_House2_Text_2038C7, MSGBOX_DEFAULT - msgbox PacifidlogTown_House2_Text_20395B, MSGBOX_DEFAULT +PacifidlogTown_House2_EventScript_FirstMonAssessment:: @ 8203801 + msgbox PacifidlogTown_House2_Text_ChairmansYoungerBrotherOnVacation, MSGBOX_DEFAULT + msgbox PacifidlogTown_House2_Text_AhYourPokemon, MSGBOX_DEFAULT return -PacifidlogTown_House2_EventScript_203812:: @ 8203812 +PacifidlogTown_House2_EventScript_ClearReceivedFanClubTM:: @ 8203812 clearflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK return -PacifidlogTown_House2_EventScript_203816:: @ 8203816 - msgbox PacifidlogTown_House2_Text_20396D, MSGBOX_DEFAULT +PacifidlogTown_House2_EventScript_GiveReturn:: @ 8203816 + msgbox PacifidlogTown_House2_Text_AdoringPokemonTakeThis, MSGBOX_DEFAULT giveitem_std ITEM_TM27 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK special SetPacifidlogTMReceivedDay - msgbox PacifidlogTown_House2_Text_203A85, MSGBOX_DEFAULT + msgbox PacifidlogTown_House2_Text_ExplainReturnFrustration, MSGBOX_DEFAULT release end -PacifidlogTown_House2_EventScript_203845:: @ 8203845 - msgbox PacifidlogTown_House2_Text_2039CE, MSGBOX_DEFAULT +PacifidlogTown_House2_EventScript_PutInEffort:: @ 8203845 + msgbox PacifidlogTown_House2_Text_PutInSomeMoreEffort, MSGBOX_DEFAULT release end -PacifidlogTown_House2_EventScript_20384F:: @ 820384F - msgbox PacifidlogTown_House2_Text_203A2F, MSGBOX_DEFAULT +PacifidlogTown_House2_EventScript_GiveFrustration:: @ 820384F + msgbox PacifidlogTown_House2_Text_ViciousPokemonTakeThis, MSGBOX_DEFAULT giveitem_std ITEM_TM21 compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK special SetPacifidlogTMReceivedDay - msgbox PacifidlogTown_House2_Text_203A85, MSGBOX_DEFAULT + msgbox PacifidlogTown_House2_Text_ExplainReturnFrustration, MSGBOX_DEFAULT release end -PacifidlogTown_House2_EventScript_20387E:: @ 820387E +PacifidlogTown_House2_EventScript_ComeBackInXDays:: @ 820387E specialvar VAR_RESULT, GetDaysUntilPacifidlogTMAvailable buffernumberstring 0, VAR_RESULT - msgbox PacifidlogTown_House2_Text_203AF4, MSGBOX_DEFAULT + msgbox PacifidlogTown_House2_Text_GetGoodTMInXDays, MSGBOX_DEFAULT release end -PacifidlogTown_House2_EventScript_203891:: @ 8203891 +PacifidlogTown_House2_EventScript_HappyAzurill:: @ 8203891 lock faceplayer waitse playmoncry SPECIES_AZURILL, 0 - msgbox PacifidlogTown_House2_Text_203B8D, MSGBOX_DEFAULT + msgbox PacifidlogTown_House2_Text_Rurii, MSGBOX_DEFAULT waitmoncry - msgbox PacifidlogTown_House2_Text_203B9D, MSGBOX_DEFAULT + msgbox PacifidlogTown_House2_Text_VeryFriendlyWithTrainer, MSGBOX_DEFAULT release end -PacifidlogTown_House2_EventScript_2038AC:: @ 82038AC +PacifidlogTown_House2_EventScript_UnhappyAzurill:: @ 82038AC lock faceplayer waitse playmoncry SPECIES_AZURILL, 2 - msgbox PacifidlogTown_House2_Text_203BCE, MSGBOX_DEFAULT + msgbox PacifidlogTown_House2_Text_Rururi, MSGBOX_DEFAULT waitmoncry - msgbox PacifidlogTown_House2_Text_203BDF, MSGBOX_DEFAULT + msgbox PacifidlogTown_House2_Text_DoesntLikeTrainerVeryMuch, MSGBOX_DEFAULT release end -PacifidlogTown_House2_Text_2038C7: @ 82038C7 +PacifidlogTown_House2_Text_ChairmansYoungerBrotherOnVacation: @ 82038C7 .string "Er-hem!\p" .string "I am the POKéMON FAN CLUB's most\n" .string "important person, the CHAIRMAN's\l" @@ -103,50 +103,50 @@ PacifidlogTown_House2_Text_2038C7: @ 82038C7 .string "I'm here enjoying my vacation with\n" .string "POKéMON, yes, indeed.$" -PacifidlogTown_House2_Text_20395B: @ 820395B +PacifidlogTown_House2_Text_AhYourPokemon: @ 820395B .string "Ah!\n" .string "Your POKéMON…$" -PacifidlogTown_House2_Text_20396D: @ 820396D +PacifidlogTown_House2_Text_AdoringPokemonTakeThis: @ 820396D .string "It clearly likes you very much.\p" .string "A POKéMON that adoring and adorable\n" .string "deserves a TM like this, no?$" -PacifidlogTown_House2_Text_2039CE: @ 82039CE +PacifidlogTown_House2_Text_PutInSomeMoreEffort: @ 82039CE .string "Hmm…\n" .string "It's not bad, but it's also not good.\p" .string "You, as the TRAINER, need to put in\n" .string "some more effort.$" -PacifidlogTown_House2_Text_203A2F: @ 8203A2F +PacifidlogTown_House2_Text_ViciousPokemonTakeThis: @ 8203A2F .string "It has a vicious look to it.\p" .string "A frightening POKéMON like that\n" .string "deserves a TM like this.$" -PacifidlogTown_House2_Text_203A85: @ 8203A85 +PacifidlogTown_House2_Text_ExplainReturnFrustration: @ 8203A85 .string "If a POKéMON likes you a lot, RETURN's\n" .string "power is enhanced.\p" .string "If it doesn't like you, FRUSTRATION's\n" .string "power goes up.$" -PacifidlogTown_House2_Text_203AF4: @ 8203AF4 +PacifidlogTown_House2_Text_GetGoodTMInXDays: @ 8203AF4 .string "Oh, yes. In about {STR_VAR_1} or so days,\n" .string "I should be getting a good TM or two.\p" .string "You should come see me then.\n" .string "I'll give you a TM that's suitable for\l" .string "your POKéMON.$" -PacifidlogTown_House2_Text_203B8D: @ 8203B8D +PacifidlogTown_House2_Text_Rurii: @ 8203B8D .string "AZURILL: Rurii.$" -PacifidlogTown_House2_Text_203B9D: @ 8203B9D +PacifidlogTown_House2_Text_VeryFriendlyWithTrainer: @ 8203B9D .string "It appears to be very friendly with the\n" .string "TRAINER.$" -PacifidlogTown_House2_Text_203BCE: @ 8203BCE +PacifidlogTown_House2_Text_Rururi: @ 8203BCE .string "AZURILL: Rururi!$" -PacifidlogTown_House2_Text_203BDF: @ 8203BDF +PacifidlogTown_House2_Text_DoesntLikeTrainerVeryMuch: @ 8203BDF .string "It doesn't appear to like the TRAINER\n" .string "very much.$" diff --git a/data/maps/PacifidlogTown_House3/map.json b/data/maps/PacifidlogTown_House3/map.json index 181d69a80..11bd0761b 100644 --- a/data/maps/PacifidlogTown_House3/map.json +++ b/data/maps/PacifidlogTown_House3/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_House3_EventScript_203CB5", + "script": "PacifidlogTown_House3_EventScript_Girl", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_House3_EventScript_203C11", + "script": "PacifidlogTown_House3_EventScript_Trader", "flag": "0" } ], diff --git a/data/maps/PacifidlogTown_House3/scripts.inc b/data/maps/PacifidlogTown_House3/scripts.inc index 921f788d6..ea33c8d01 100644 --- a/data/maps/PacifidlogTown_House3/scripts.inc +++ b/data/maps/PacifidlogTown_House3/scripts.inc @@ -1,59 +1,59 @@ PacifidlogTown_House3_MapScripts:: @ 8203C10 .byte 0 -PacifidlogTown_House3_EventScript_203C11:: @ 8203C11 +PacifidlogTown_House3_EventScript_Trader:: @ 8203C11 lock faceplayer - goto_if_set FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED, PacifidlogTown_House3_EventScript_203CAB + goto_if_set FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED, PacifidlogTown_House3_EventScript_TradeCompleted setvar VAR_0x8008, INGAME_TRADE_HORSEA copyvar VAR_0x8004, VAR_0x8008 specialvar VAR_RESULT, GetInGameTradeSpeciesInfo copyvar VAR_0x8009, VAR_RESULT - msgbox PacifidlogTown_House3_Text_203CBE, MSGBOX_YESNO + msgbox PacifidlogTown_House3_Text_WillingToTradeIt, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq PacifidlogTown_House3_EventScript_203C93 + goto_if_eq PacifidlogTown_House3_EventScript_DeclineTrade special ChoosePartyMon waitstate copyvar VAR_0x800A, VAR_0x8004 compare VAR_0x8004, 255 - goto_if_eq PacifidlogTown_House3_EventScript_203C93 + goto_if_eq PacifidlogTown_House3_EventScript_DeclineTrade copyvar VAR_0x8005, VAR_0x800A specialvar VAR_RESULT, GetTradeSpecies copyvar VAR_0x800B, VAR_RESULT compare VAR_RESULT, VAR_0x8009 - goto_if_ne PacifidlogTown_House3_EventScript_203C9D + goto_if_ne PacifidlogTown_House3_EventScript_NotRequestedMon copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8005, VAR_0x800A special CreateInGameTradePokemon special DoInGameTradeScene waitstate bufferspeciesname 0, VAR_0x8009 - msgbox PacifidlogTown_House3_Text_203D87, MSGBOX_DEFAULT + msgbox PacifidlogTown_House3_Text_ItsSubtlyDifferentThankYou, MSGBOX_DEFAULT setflag FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED release end -PacifidlogTown_House3_EventScript_203C93:: @ 8203C93 - msgbox PacifidlogTown_House3_Text_203E12, MSGBOX_DEFAULT +PacifidlogTown_House3_EventScript_DeclineTrade:: @ 8203C93 + msgbox PacifidlogTown_House3_Text_NotDesperateOrAnything, MSGBOX_DEFAULT release end -PacifidlogTown_House3_EventScript_203C9D:: @ 8203C9D +PacifidlogTown_House3_EventScript_NotRequestedMon:: @ 8203C9D bufferspeciesname 0, VAR_0x8009 - msgbox PacifidlogTown_House3_Text_203DDE, MSGBOX_DEFAULT + msgbox PacifidlogTown_House3_Text_WontAcceptAnyLessThanRealMon, MSGBOX_DEFAULT release end -PacifidlogTown_House3_EventScript_203CAB:: @ 8203CAB - msgbox PacifidlogTown_House3_Text_203E7F, MSGBOX_DEFAULT +PacifidlogTown_House3_EventScript_TradeCompleted:: @ 8203CAB + msgbox PacifidlogTown_House3_Text_ReallyWantedToGetBagon, MSGBOX_DEFAULT release end -PacifidlogTown_House3_EventScript_203CB5:: @ 8203CB5 - msgbox PacifidlogTown_House3_Text_203EF1, MSGBOX_NPC +PacifidlogTown_House3_EventScript_Girl:: @ 8203CB5 + msgbox PacifidlogTown_House3_Text_IsThatAPokedex, MSGBOX_NPC end -PacifidlogTown_House3_Text_203CBE: @ 8203CBE +PacifidlogTown_House3_Text_WillingToTradeIt: @ 8203CBE .string "Check out this {STR_VAR_2}!\p" .string "It's the {STR_VAR_2} that I caught\n" .string "yesterday to celebrate my birthday!\p" @@ -62,29 +62,29 @@ PacifidlogTown_House3_Text_203CBE: @ 8203CBE .string "I'll tell you what. I might be willing\n" .string "to trade it for a {STR_VAR_1}.$" -PacifidlogTown_House3_Text_203D87: @ 8203D87 +PacifidlogTown_House3_Text_ItsSubtlyDifferentThankYou: @ 8203D87 .string "Oh, so this is a {STR_VAR_1}?\p" .string "It's sort of like a {STR_VAR_2},\n" .string "and yet it's subtly different.\p" .string "Thank you!$" -PacifidlogTown_House3_Text_203DDE: @ 8203DDE +PacifidlogTown_House3_Text_WontAcceptAnyLessThanRealMon: @ 8203DDE .string "No, no, no! I won't accept any\n" .string "less than a real {STR_VAR_1}!$" -PacifidlogTown_House3_Text_203E12: @ 8203E12 +PacifidlogTown_House3_Text_NotDesperateOrAnything: @ 8203E12 .string "Oh, so you're not going to go through\n" .string "with this?\p" .string "That's cool. I'm not desperate to make\n" .string "a trade or anything.$" -PacifidlogTown_House3_Text_203E7F: @ 8203E7F +PacifidlogTown_House3_Text_ReallyWantedToGetBagon: @ 8203E7F .string "I know I could go looking for one\n" .string "on my own, but…\p" .string "But I really wanted to get a BAGON\n" .string "that another TRAINER caught…$" -PacifidlogTown_House3_Text_203EF1: @ 8203EF1 +PacifidlogTown_House3_Text_IsThatAPokedex: @ 8203EF1 .string "Is that a POKéDEX?\p" .string "Did you get to meet a lot of different\n" .string "POKéMON?\p" diff --git a/data/maps/PacifidlogTown_House4/map.json b/data/maps/PacifidlogTown_House4/map.json index d38384fc9..f196f6a8a 100644 --- a/data/maps/PacifidlogTown_House4/map.json +++ b/data/maps/PacifidlogTown_House4/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_House4_EventScript_203F55", + "script": "PacifidlogTown_House4_EventScript_Woman", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_House4_EventScript_203F4C", + "script": "PacifidlogTown_House4_EventScript_LittleGirl", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_House4_EventScript_203F5E", + "script": "PacifidlogTown_House4_EventScript_Boy", "flag": "0" } ], diff --git a/data/maps/PacifidlogTown_House4/scripts.inc b/data/maps/PacifidlogTown_House4/scripts.inc index 1535b534d..42a988bc2 100644 --- a/data/maps/PacifidlogTown_House4/scripts.inc +++ b/data/maps/PacifidlogTown_House4/scripts.inc @@ -1,53 +1,53 @@ PacifidlogTown_House4_MapScripts:: @ 8203F4B .byte 0 -PacifidlogTown_House4_EventScript_203F4C:: @ 8203F4C - msgbox PacifidlogTown_House4_Text_204017, MSGBOX_NPC +PacifidlogTown_House4_EventScript_LittleGirl:: @ 8203F4C + msgbox PacifidlogTown_House4_Text_SkyPokemon, MSGBOX_NPC end -PacifidlogTown_House4_EventScript_203F55:: @ 8203F55 - msgbox PacifidlogTown_House4_Text_203F93, MSGBOX_NPC +PacifidlogTown_House4_EventScript_Woman:: @ 8203F55 + msgbox PacifidlogTown_House4_Text_PeopleSawHighFlyingPokemon, MSGBOX_NPC end -PacifidlogTown_House4_EventScript_203F5E:: @ 8203F5E +PacifidlogTown_House4_EventScript_Boy:: @ 8203F5E lock faceplayer - msgbox PacifidlogTown_House4_Text_204035, MSGBOX_YESNO + msgbox PacifidlogTown_House4_Text_WhereDidYouComeFrom, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq PacifidlogTown_House4_EventScript_203F7F + goto_if_eq PacifidlogTown_House4_EventScript_Yes compare VAR_RESULT, NO - goto_if_eq PacifidlogTown_House4_EventScript_203F89 + goto_if_eq PacifidlogTown_House4_EventScript_No end -PacifidlogTown_House4_EventScript_203F7F:: @ 8203F7F - msgbox PacifidlogTown_House4_Text_20404E, MSGBOX_DEFAULT +PacifidlogTown_House4_EventScript_Yes:: @ 8203F7F + msgbox PacifidlogTown_House4_Text_YesTown, MSGBOX_DEFAULT release end -PacifidlogTown_House4_EventScript_203F89:: @ 8203F89 - msgbox PacifidlogTown_House4_Text_204084, MSGBOX_DEFAULT +PacifidlogTown_House4_EventScript_No:: @ 8203F89 + msgbox PacifidlogTown_House4_Text_YouHaveToComeFromSomewhere, MSGBOX_DEFAULT release end -PacifidlogTown_House4_Text_203F93: @ 8203F93 +PacifidlogTown_House4_Text_PeopleSawHighFlyingPokemon: @ 8203F93 .string "People were saying they saw a POKéMON\n" .string "flying high above HOENN.\p" .string "Is it flying around all the time?\n" .string "Doesn't it need to rest somewhere?$" -PacifidlogTown_House4_Text_204017: @ 8204017 +PacifidlogTown_House4_Text_SkyPokemon: @ 8204017 .string "A sky POKéMON!\n" .string "A sky POKéMON!$" -PacifidlogTown_House4_Text_204035: @ 8204035 +PacifidlogTown_House4_Text_WhereDidYouComeFrom: @ 8204035 .string "Where did you come from?$" -PacifidlogTown_House4_Text_20404E: @ 820404E +PacifidlogTown_House4_Text_YesTown: @ 820404E .string "Yes?\n" .string "YES TOWN?\p" .string "I've never heard of a place like that.$" -PacifidlogTown_House4_Text_204084: @ 8204084 +PacifidlogTown_House4_Text_YouHaveToComeFromSomewhere: @ 8204084 .string "No? That doesn't make any sense.\n" .string "You have to come from somewhere.\p" .string "Oh! Wait! You're not going to say you\n" diff --git a/data/maps/PacifidlogTown_House5/map.json b/data/maps/PacifidlogTown_House5/map.json index db7e51c46..c828d7a29 100644 --- a/data/maps/PacifidlogTown_House5/map.json +++ b/data/maps/PacifidlogTown_House5/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_House5_EventScript_204111", + "script": "PacifidlogTown_House5_EventScript_MirageIslandWatcher", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_House5_EventScript_204137", + "script": "PacifidlogTown_House5_EventScript_Gentleman", "flag": "0" } ], diff --git a/data/maps/PacifidlogTown_House5/scripts.inc b/data/maps/PacifidlogTown_House5/scripts.inc index cdc54fefe..f8be20f47 100644 --- a/data/maps/PacifidlogTown_House5/scripts.inc +++ b/data/maps/PacifidlogTown_House5/scripts.inc @@ -1,33 +1,33 @@ PacifidlogTown_House5_MapScripts:: @ 8204110 .byte 0 -PacifidlogTown_House5_EventScript_204111:: @ 8204111 +PacifidlogTown_House5_EventScript_MirageIslandWatcher:: @ 8204111 lock faceplayer specialvar VAR_RESULT, IsMirageIslandPresent - compare VAR_RESULT, 1 - goto_if_eq PacifidlogTown_House5_EventScript_20412D - msgbox PacifidlogTown_House5_Text_204140, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq PacifidlogTown_House5_EventScript_MirageIslandPresent + msgbox PacifidlogTown_House5_Text_CantSeeMirageIslandToday, MSGBOX_DEFAULT release end -PacifidlogTown_House5_EventScript_20412D:: @ 820412D - msgbox PacifidlogTown_House5_Text_204161, MSGBOX_DEFAULT +PacifidlogTown_House5_EventScript_MirageIslandPresent:: @ 820412D + msgbox PacifidlogTown_House5_Text_CanSeeMirageIslandToday, MSGBOX_DEFAULT release end -PacifidlogTown_House5_EventScript_204137:: @ 8204137 - msgbox PacifidlogTown_House5_Text_20418B, MSGBOX_NPC +PacifidlogTown_House5_EventScript_Gentleman:: @ 8204137 + msgbox PacifidlogTown_House5_Text_MirageIslandAppearDependingOnWeather, MSGBOX_NPC end -PacifidlogTown_House5_Text_204140: @ 8204140 +PacifidlogTown_House5_Text_CantSeeMirageIslandToday: @ 8204140 .string "I can't see MIRAGE ISLAND today…$" -PacifidlogTown_House5_Text_204161: @ 8204161 +PacifidlogTown_House5_Text_CanSeeMirageIslandToday: @ 8204161 .string "Oh! Oh my!\n" .string "I can see MIRAGE ISLAND today!$" -PacifidlogTown_House5_Text_20418B: @ 820418B +PacifidlogTown_House5_Text_MirageIslandAppearDependingOnWeather: @ 820418B .string "MIRAGE ISLAND…\p" .string "It must become visible and invisible\n" .string "depending on the weather conditions\l" From 5e4dd022a6e32f3d29772928bc5d598f6dee11e3 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 7 Nov 2019 16:36:48 -0500 Subject: [PATCH 28/40] Document Dewford scripts --- data/event_scripts.s | 3 +- data/maps/DewfordTown/map.json | 14 +- data/maps/DewfordTown/scripts.inc | 228 +++++++++--------- data/maps/DewfordTown_Hall/map.json | 22 +- data/maps/DewfordTown_Hall/scripts.inc | 284 +++++++++++------------ data/maps/DewfordTown_House1/map.json | 6 +- data/maps/DewfordTown_House1/scripts.inc | 18 +- data/maps/DewfordTown_House2/map.json | 4 +- data/maps/DewfordTown_House2/scripts.inc | 30 +-- 9 files changed, 304 insertions(+), 305 deletions(-) diff --git a/data/event_scripts.s b/data/event_scripts.s index 7bd77505c..f426273bb 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -746,8 +746,7 @@ Common_EventScript_ReadyPetalburgGymForBattle:: @ 8271E84 setflag FLAG_PETALBURG_MART_EXPANDED_ITEMS return -DewfordTown_EventScript_271E8B:: @ 8271E8B -DewfordTown_Hall_EventScript_271E8B:: @ 8271E8B +Common_EventScript_BufferTrendyPhrase:: @ 8271E8B dotimebasedevents setvar VAR_0x8004, 0 special BufferTrendyPhraseString diff --git a/data/maps/DewfordTown/map.json b/data/maps/DewfordTown/map.json index 32fe0c313..bfa5a2e8b 100644 --- a/data/maps/DewfordTown/map.json +++ b/data/maps/DewfordTown/map.json @@ -35,7 +35,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_EventScript_1E95B1", + "script": "DewfordTown_EventScript_Woman", "flag": "0" }, { @@ -48,7 +48,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "3", - "script": "DewfordTown_EventScript_1E9511", + "script": "DewfordTown_EventScript_Briney", "flag": "FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN" }, { @@ -61,7 +61,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_EventScript_1E95D5", + "script": "DewfordTown_EventScript_OldRodFisherman", "flag": "0" }, { @@ -87,7 +87,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_EventScript_1E9922", + "script": "DewfordTown_EventScript_TrendyPhraseBoy", "flag": "0" } ], @@ -136,7 +136,7 @@ "y": 10, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "DewfordTown_EventScript_1E95BA" + "script": "DewfordTown_EventScript_TownSign" }, { "type": "sign", @@ -144,7 +144,7 @@ "y": 16, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "DewfordTown_EventScript_1E95C3" + "script": "DewfordTown_EventScript_GymSign" }, { "type": "sign", @@ -168,7 +168,7 @@ "y": 4, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "DewfordTown_EventScript_1E95CC" + "script": "DewfordTown_EventScript_HallSign" } ] } \ No newline at end of file diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc index 9d6011a1f..058a3ffca 100644 --- a/data/maps/DewfordTown/scripts.inc +++ b/data/maps/DewfordTown/scripts.inc @@ -6,131 +6,131 @@ DewfordTown_OnTransition: @ 81E950D setflag FLAG_VISITED_DEWFORD_TOWN end -DewfordTown_EventScript_1E9511:: @ 81E9511 +DewfordTown_EventScript_Briney:: @ 81E9511 lock faceplayer - goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, DewfordTown_EventScript_1E9585 - message DewfordTown_Text_1E9C8A + goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, DewfordTown_EventScript_ReturnToPetalburgPrompt + message DewfordTown_Text_WhereAreWeBound waitmessage multichoicedefault 21, 6, MULTI_BRINEY_ON_DEWFORD, 2, 0 switch VAR_RESULT - case 0, DewfordTown_EventScript_1E955A - case 1, DewfordTown_EventScript_1E956A - case 2, DewfordTown_EventScript_1E957A - case MULTI_B_PRESSED, DewfordTown_EventScript_1E957A + case 0, DewfordTown_EventScript_ChoosePetalburg + case 1, DewfordTown_EventScript_ChooseSlateport + case 2, DewfordTown_EventScript_CancelSailSelect + case MULTI_B_PRESSED, DewfordTown_EventScript_CancelSailSelect end -DewfordTown_EventScript_1E955A:: @ 81E955A - msgbox DewfordTown_Text_1E9CE5, MSGBOX_DEFAULT +DewfordTown_EventScript_ChoosePetalburg:: @ 81E955A + msgbox DewfordTown_Text_PetalburgWereSettingSail, MSGBOX_DEFAULT closemessage - goto DewfordTown_EventScript_1E9660 + goto DewfordTown_EventScript_SailToPetalburg release end -DewfordTown_EventScript_1E956A:: @ 81E956A - msgbox DewfordTown_Text_1E9D3A, MSGBOX_DEFAULT +DewfordTown_EventScript_ChooseSlateport:: @ 81E956A + msgbox DewfordTown_Text_SlateportWereSettingSail, MSGBOX_DEFAULT closemessage - goto DewfordTown_EventScript_1E96E7 + goto DewfordTown_EventScript_SailToSlateport release end -DewfordTown_EventScript_1E957A:: @ 81E957A - msgbox DewfordTown_Text_1E9D8F, MSGBOX_DEFAULT +DewfordTown_EventScript_CancelSailSelect:: @ 81E957A + msgbox DewfordTown_Text_JustTellMeWhenYouNeedToSetSail, MSGBOX_DEFAULT closemessage release end -DewfordTown_EventScript_1E9585:: @ 81E9585 - msgbox DewfordTown_Text_1E9B24, MSGBOX_YESNO +DewfordTown_EventScript_ReturnToPetalburgPrompt:: @ 81E9585 + msgbox DewfordTown_Text_SetSailBackToPetalburg, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq DewfordTown_EventScript_1E95A2 - msgbox DewfordTown_Text_1E9BD9, MSGBOX_DEFAULT + goto_if_eq DewfordTown_EventScript_SailBackToPetalburg + msgbox DewfordTown_Text_GoDeliverIllBeWaiting, MSGBOX_DEFAULT release end -DewfordTown_EventScript_1E95A2:: @ 81E95A2 - msgbox DewfordTown_Text_1E9B7F, MSGBOX_DEFAULT +DewfordTown_EventScript_SailBackToPetalburg:: @ 81E95A2 + msgbox DewfordTown_Text_PetalburgWereSettingSail2, MSGBOX_DEFAULT closemessage - goto DewfordTown_EventScript_1E9660 + goto DewfordTown_EventScript_SailToPetalburg end -DewfordTown_EventScript_1E95B1:: @ 81E95B1 - msgbox DewfordTown_Text_1E99A8, MSGBOX_NPC +DewfordTown_EventScript_Woman:: @ 81E95B1 + msgbox DewfordTown_Text_TinyIslandCommunity, MSGBOX_NPC end -DewfordTown_EventScript_1E95BA:: @ 81E95BA - msgbox DewfordTown_Text_1E9A0F, MSGBOX_SIGN +DewfordTown_EventScript_TownSign:: @ 81E95BA + msgbox DewfordTown_Text_TownSign, MSGBOX_SIGN end -DewfordTown_EventScript_1E95C3:: @ 81E95C3 - msgbox DewfordTown_Text_1E9A3D, MSGBOX_SIGN +DewfordTown_EventScript_GymSign:: @ 81E95C3 + msgbox DewfordTown_Text_GymSign, MSGBOX_SIGN end -DewfordTown_EventScript_1E95CC:: @ 81E95CC - msgbox DewfordTown_Text_1E9A7F, MSGBOX_SIGN +DewfordTown_EventScript_HallSign:: @ 81E95CC + msgbox DewfordTown_Text_HallSign, MSGBOX_SIGN end -DewfordTown_EventScript_1E95D5:: @ 81E95D5 +DewfordTown_EventScript_OldRodFisherman:: @ 81E95D5 lock faceplayer - goto_if_set FLAG_RECEIVED_OLD_ROD, DewfordTown_EventScript_1E962A - msgbox DewfordTown_Text_1E9DD1, MSGBOX_YESNO + goto_if_set FLAG_RECEIVED_OLD_ROD, DewfordTown_EventScript_HowsFishing + msgbox DewfordTown_Text_GettingItchToFish, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq DewfordTown_EventScript_1E95FF + goto_if_eq DewfordTown_EventScript_GiveOldRod compare VAR_RESULT, NO - goto_if_eq DewfordTown_EventScript_1E9620 + goto_if_eq DewfordTown_EventScript_NotGettingItchToFish end -DewfordTown_EventScript_1E95FF:: @ 81E95FF - msgbox DewfordTown_Text_1E9E14, MSGBOX_DEFAULT +DewfordTown_EventScript_GiveOldRod:: @ 81E95FF + msgbox DewfordTown_Text_GiveYouOneOfMyRods, MSGBOX_DEFAULT giveitem_std ITEM_OLD_ROD setflag FLAG_RECEIVED_OLD_ROD - msgbox DewfordTown_Text_1E9E65, MSGBOX_DEFAULT + msgbox DewfordTown_Text_ThrowInFishingAdvice, MSGBOX_DEFAULT release end -DewfordTown_EventScript_1E9620:: @ 81E9620 - msgbox DewfordTown_Text_1E9F92, MSGBOX_DEFAULT +DewfordTown_EventScript_NotGettingItchToFish:: @ 81E9620 + msgbox DewfordTown_Text_ThatsTooBadThen, MSGBOX_DEFAULT release end -DewfordTown_EventScript_1E962A:: @ 81E962A - message DewfordTown_Text_1E9FB8 +DewfordTown_EventScript_HowsFishing:: @ 81E962A + message DewfordTown_Text_HowsYourFishing waitmessage multichoice 20, 8, MULTI_HOWS_FISHING, 1 compare VAR_RESULT, 0 - goto_if_eq DewfordTown_EventScript_1E964C + goto_if_eq DewfordTown_EventScript_FishingExcellent compare VAR_RESULT, 1 - goto_if_eq DewfordTown_EventScript_1E9656 + goto_if_eq DewfordTown_EventScript_FishingNotSoGood end -DewfordTown_EventScript_1E964C:: @ 81E964C - msgbox DewfordTown_Text_1E9FD0, MSGBOX_DEFAULT +DewfordTown_EventScript_FishingExcellent:: @ 81E964C + msgbox DewfordTown_Text_GreatHaulInSomeBigOnes, MSGBOX_DEFAULT release end -DewfordTown_EventScript_1E9656:: @ 81E9656 - msgbox DewfordTown_Text_1EA004, MSGBOX_DEFAULT +DewfordTown_EventScript_FishingNotSoGood:: @ 81E9656 + msgbox DewfordTown_Text_FishingAdvice, MSGBOX_DEFAULT release end -DewfordTown_EventScript_1E9660:: @ 81E9660 +DewfordTown_EventScript_SailToPetalburg:: @ 81E9660 call EventScript_BackupMrBrineyLocation setobjectpriority 2, MAP_DEWFORD_TOWN, 0 setobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN, 0 - applymovement 2, DewfordTown_Movement_1E991D + applymovement 2, DewfordTown_Movement_BrineyBoardBoat waitmovement 0 removeobject 2 - applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9911 + applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_PlayerBoardBoat waitmovement 0 hideobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN call Common_EventScript_PlayBrineysBoatMusic - applymovement 4, DewfordTown_Movement_1E97A2 - applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E97A2 + applymovement 4, DewfordTown_Movement_SailToDewford + applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_SailToDewford waitmovement 0 showobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE104 call Common_EventScript_StopBrineysBoatMusic - applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9914 + applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_ExitBoatPetalburg waitmovement 0 showobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE104 clearflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY @@ -146,36 +146,36 @@ DewfordTown_EventScript_1E9660:: @ 81E9660 release end -DewfordTown_EventScript_1E96E7:: @ 81E96E7 +DewfordTown_EventScript_SailToSlateport:: @ 81E96E7 call EventScript_BackupMrBrineyLocation setobjectpriority 2, MAP_DEWFORD_TOWN, 0 setobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN, 1 - applymovement 2, DewfordTown_Movement_1E991D + applymovement 2, DewfordTown_Movement_BrineyBoardBoat waitmovement 0 removeobject 2 - applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9911 + applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_PlayerBoardBoat waitmovement 0 hideobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN call Common_EventScript_PlayBrineysBoatMusic - applymovement 4, DewfordTown_Movement_1E9865 - applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9865 + applymovement 4, DewfordTown_Movement_SailToPetalburg + applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_SailToPetalburg waitmovement 0 call Common_EventScript_StopBrineysBoatMusic showobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE109 - applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9918 + applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_ExitBoatSlateport waitmovement 0 setobjectxyperm 2, 21, 26 addobject 2 setobjectpriority 2, MAP_ROUTE109, 0 - applymovement 2, DewfordTown_Movement_1E991F + applymovement 2, DewfordTown_Movement_BrineyExitBoat waitmovement 0 clearflag FLAG_HIDE_ROUTE_109_MR_BRINEY addobject 1 clearflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN hideobjectat 4, MAP_DEWFORD_TOWN - call_if_unset FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_1E9790 - call_if_set FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_1E9799 + call_if_unset FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_LandedSlateportDeliverGoods + call_if_set FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_LandedSlateport closemessage copyvar VAR_BRINEY_LOCATION, VAR_0x8008 resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN @@ -184,15 +184,15 @@ DewfordTown_EventScript_1E96E7:: @ 81E96E7 release end -DewfordTown_EventScript_1E9790:: @ 81E9790 +DewfordTown_EventScript_LandedSlateportDeliverGoods:: @ 81E9790 msgbox DewfordTown_Text_BrineyLandedInSlateportDeliverGoods, MSGBOX_DEFAULT return -DewfordTown_EventScript_1E9799:: @ 81E9799 +DewfordTown_EventScript_LandedSlateport:: @ 81E9799 msgbox DewfordTown_Text_BrineyLandedInSlateport, MSGBOX_DEFAULT return -DewfordTown_Movement_1E97A2: @ 81E97A2 +DewfordTown_Movement_SailToDewford: @ 81E97A2 walk_up walk_up walk_fast_up @@ -389,7 +389,7 @@ DewfordTown_Movement_1E97A2: @ 81E97A2 walk_up step_end -DewfordTown_Movement_1E9865: @ 81E9865 +DewfordTown_Movement_SailToPetalburg: @ 81E9865 walk_right walk_fast_right walk_fast_right @@ -563,94 +563,94 @@ DewfordTown_Movement_1E9865: @ 81E9865 walk_fast_up step_end -DewfordTown_Movement_1E9911: @ 81E9911 +DewfordTown_Movement_PlayerBoardBoat: @ 81E9911 walk_right walk_up step_end -DewfordTown_Movement_1E9914: @ 81E9914 +DewfordTown_Movement_ExitBoatPetalburg: @ 81E9914 walk_up walk_up walk_up step_end -DewfordTown_Movement_1E9918: @ 81E9918 +DewfordTown_Movement_ExitBoatSlateport: @ 81E9918 walk_up walk_up walk_up walk_in_place_fastest_down step_end -DewfordTown_Movement_1E991D: @ 81E991D +DewfordTown_Movement_BrineyBoardBoat: @ 81E991D walk_up step_end -DewfordTown_Movement_1E991F: @ 81E991F +DewfordTown_Movement_BrineyExitBoat: @ 81E991F walk_up walk_up step_end -DewfordTown_EventScript_1E9922:: @ 81E9922 +DewfordTown_EventScript_TrendyPhraseBoy:: @ 81E9922 lock faceplayer - call DewfordTown_EventScript_271E8B - msgbox DewfordTown_Text_1EA136, MSGBOX_YESNO + call Common_EventScript_BufferTrendyPhrase + msgbox DewfordTown_Text_XIsTheBiggestHappeningThingRight, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq DewfordTown_EventScript_1E9948 + goto_if_eq DewfordTown_EventScript_ConfirmTrendyPhrase compare VAR_RESULT, NO - goto_if_eq DewfordTown_EventScript_1E9952 + goto_if_eq DewfordTown_EventScript_RejectTrendyPhrase end -DewfordTown_EventScript_1E9948:: @ 81E9948 - msgbox DewfordTown_Text_1EA491, MSGBOX_DEFAULT +DewfordTown_EventScript_ConfirmTrendyPhrase:: @ 81E9948 + msgbox DewfordTown_Text_YeahDefinitionOfInRightNow, MSGBOX_DEFAULT release end -DewfordTown_EventScript_1E9952:: @ 81E9952 - msgbox DewfordTown_Text_1EA242, MSGBOX_DEFAULT +DewfordTown_EventScript_RejectTrendyPhrase:: @ 81E9952 + msgbox DewfordTown_Text_TellMeWhatsNewAndIn, MSGBOX_DEFAULT setvar VAR_0x8004, EASY_CHAT_TYPE_TRENDY_PHRASE call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 1 - goto_if_eq DewfordTown_EventScript_1E997D + goto_if_eq DewfordTown_EventScript_GiveNewTrendyPhrase compare VAR_RESULT, 0 - goto_if_eq DewfordTown_EventScript_1E9994 + goto_if_eq DewfordTown_EventScript_CancelNewTrendyPhrase end -DewfordTown_EventScript_1E997D:: @ 81E997D +DewfordTown_EventScript_GiveNewTrendyPhrase:: @ 81E997D incrementgamestat GAME_STAT_STARTED_TRENDS compare VAR_0x8004, 0 - goto_if_eq DewfordTown_EventScript_1E999E - msgbox DewfordTown_Text_1EA2AA, MSGBOX_DEFAULT + goto_if_eq DewfordTown_EventScript_PhraseNotTrendyEnough + msgbox DewfordTown_Text_OfCourseIKnowAboutThat, MSGBOX_DEFAULT release end -DewfordTown_EventScript_1E9994:: @ 81E9994 - msgbox DewfordTown_Text_1EA443, MSGBOX_DEFAULT +DewfordTown_EventScript_CancelNewTrendyPhrase:: @ 81E9994 + msgbox DewfordTown_Text_HearOfAnyTrendsComeShareWithMe, MSGBOX_DEFAULT release end -DewfordTown_EventScript_1E999E:: @ 81E999E - msgbox DewfordTown_Text_1EA3FE, MSGBOX_DEFAULT +DewfordTown_EventScript_PhraseNotTrendyEnough:: @ 81E999E + msgbox DewfordTown_Text_XHuhIThinkYIsCool, MSGBOX_DEFAULT release end -DewfordTown_Text_1E99A8: @ 81E99A8 +DewfordTown_Text_TinyIslandCommunity: @ 81E99A8 .string "DEWFORD is a tiny island community.\n" .string "If something gets trendy here,\l" .string "everyone picks up on it right away.$" -DewfordTown_Text_1E9A0F: @ 81E9A0F +DewfordTown_Text_TownSign: @ 81E9A0F .string "DEWFORD TOWN\n" .string "“A tiny island in the blue sea.”$" -DewfordTown_Text_1E9A3D: @ 81E9A3D +DewfordTown_Text_GymSign: @ 81E9A3D .string "DEWFORD TOWN POKéMON GYM\n" .string "LEADER: BRAWLY\l" .string "“A big wave in fighting!”$" -DewfordTown_Text_1E9A7F: @ 81E9A7F +DewfordTown_Text_HallSign: @ 81E9A7F .string "DEWFORD HALL\n" .string "“Everyone's information exchange!”$" @@ -660,18 +660,18 @@ Route104_Text_LandedInDewfordDeliverLetter: @ 81E9AAF .string "I suppose you're off to deliver that\n" .string "LETTER to, who was it now, STEVEN!$" -DewfordTown_Text_1E9B24: @ 81E9B24 +DewfordTown_Text_SetSailBackToPetalburg: @ 81E9B24 .string "MR. BRINEY: Have you delivered your\n" .string "LETTER?\p" .string "Or were you meaning to sail back to\n" .string "PETALBURG?$" -DewfordTown_Text_1E9B7F: @ 81E9B7F +DewfordTown_Text_PetalburgWereSettingSail2: @ 81E9B7F .string "MR. BRINEY: PETALBURG it is, then!\p" .string "Anchors aweigh!\n" .string "PEEKO, we're setting sail, my darling!$" -DewfordTown_Text_1E9BD9: @ 81E9BD9 +DewfordTown_Text_GoDeliverIllBeWaiting: @ 81E9BD9 .string "MR. BRINEY: Then you go on and deliver\n" .string "the LETTER. I'll be waiting.$" @@ -681,35 +681,35 @@ DewfordTown_Text_BrineyLandedInDewford: @ 81E9C1D .string "You just go on and tell me whenever\n" .string "you want to set sail again!$" -DewfordTown_Text_1E9C8A: @ 81E9C8A +DewfordTown_Text_WhereAreWeBound: @ 81E9C8A .string "MR. BRINEY: Ahoy!\n" .string "For you, I'll go out to sea anytime!\p" .string "Now, my friend, where are we bound?$" -DewfordTown_Text_1E9CE5: @ 81E9CE5 +DewfordTown_Text_PetalburgWereSettingSail: @ 81E9CE5 .string "MR. BRINEY: PETALBURG, is it?\p" .string "Anchors aweigh!\n" .string "PEEKO, we're setting sail, my darling!$" -DewfordTown_Text_1E9D3A: @ 81E9D3A +DewfordTown_Text_SlateportWereSettingSail: @ 81E9D3A .string "MR. BRINEY: SLATEPORT, is it?\p" .string "Anchors aweigh!\n" .string "PEEKO, we're setting sail, my darling!$" -DewfordTown_Text_1E9D8F: @ 81E9D8F +DewfordTown_Text_JustTellMeWhenYouNeedToSetSail: @ 81E9D8F .string "MR. BRINEY: You just tell me whenever\n" .string "you need to set sail again!$" -DewfordTown_Text_1E9DD1: @ 81E9DD1 +DewfordTown_Text_GettingItchToFish: @ 81E9DD1 .string "This is a renowned fishing spot.\n" .string "Are you getting the itch to fish?$" -DewfordTown_Text_1E9E14: @ 81E9E14 +DewfordTown_Text_GiveYouOneOfMyRods: @ 81E9E14 .string "I hear you, and I like what\n" .string "you're saying!\p" .string "I'll give you one of my fishing RODS.$" -DewfordTown_Text_1E9E65: @ 81E9E65 +DewfordTown_Text_ThrowInFishingAdvice: @ 81E9E65 .string "And, as an added bonus, I'll even throw\n" .string "in a little fishing advice!\p" .string "First, you want to face the water,\n" @@ -721,19 +721,19 @@ DewfordTown_Text_1E9E65: @ 81E9E65 .string "you need to time the pulls on your ROD\l" .string "to haul them in.$" -DewfordTown_Text_1E9F92: @ 81E9F92 +DewfordTown_Text_ThatsTooBadThen: @ 81E9F92 .string "Oh, is that so?\n" .string "That's too bad, then.$" -DewfordTown_Text_1E9FB8: @ 81E9FB8 +DewfordTown_Text_HowsYourFishing: @ 81E9FB8 .string "Yo!\n" .string "How's your fishing?$" -DewfordTown_Text_1E9FD0: @ 81E9FD0 +DewfordTown_Text_GreatHaulInSomeBigOnes: @ 81E9FD0 .string "Is that right! That's great!\n" .string "Haul in some big ones!$" -DewfordTown_Text_1EA004: @ 81EA004 +DewfordTown_Text_FishingAdvice: @ 81EA004 .string "Oh, hey, don't get down on yourself!\n" .string "I'll give you a little fishing advice.\p" .string "First, you want to face the water,\n" @@ -745,7 +745,7 @@ DewfordTown_Text_1EA004: @ 81EA004 .string "you need to time the pulls on your ROD\l" .string "to haul them in.$" -DewfordTown_Text_1EA136: @ 81EA136 +DewfordTown_Text_XIsTheBiggestHappeningThingRight: @ 81EA136 .string "I like what's hip, happening, and trendy.\n" .string "I'm always checking it out.\p" .string "Listen, have you heard about this new\n" @@ -759,13 +759,13 @@ DewfordTown_Text_1EA136: @ 81EA136 .string "“{STR_VAR_1}”\l" .string "is the biggest happening thing, right?$" -DewfordTown_Text_1EA242: @ 81EA242 +DewfordTown_Text_TellMeWhatsNewAndIn: @ 81EA242 .string "Hunh?\n" .string "It's not the hip and happening thing?\p" .string "Well, hey, you have to tell me,\n" .string "what's new and what's “in”?$" -DewfordTown_Text_1EA2AA: @ 81EA2AA +DewfordTown_Text_OfCourseIKnowAboutThat: @ 81EA2AA .string "Hunh?\n" .string "“{STR_VAR_2}”?\p" .string "… …\p" @@ -783,18 +783,18 @@ DewfordTown_Text_1EA2AA: @ 81EA2AA .string "Now, “{STR_VAR_2}” is\n" .string "what's vital and in tune with the times!$" -DewfordTown_Text_1EA3FE: @ 81EA3FE +DewfordTown_Text_XHuhIThinkYIsCool: @ 81EA3FE .string "Hmm…\n" .string "“{STR_VAR_2},” huh?\p" .string "But personally, I think\n" .string "“{STR_VAR_1}”\l" .string "is what's real in cool.$" -DewfordTown_Text_1EA443: @ 81EA443 +DewfordTown_Text_HearOfAnyTrendsComeShareWithMe: @ 81EA443 .string "Well, if you hear of any happening new\n" .string "trends, come share them with me, okay?$" -DewfordTown_Text_1EA491: @ 81EA491 +DewfordTown_Text_YeahDefinitionOfInRightNow: @ 81EA491 .string "Yeah, absolutely right!\p" .string "“{STR_VAR_1}” is the\n" .string "definition of “in” right now.$" diff --git a/data/maps/DewfordTown_Hall/map.json b/data/maps/DewfordTown_Hall/map.json index b801ea3c2..087981fde 100644 --- a/data/maps/DewfordTown_Hall/map.json +++ b/data/maps/DewfordTown_Hall/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_Hall_EventScript_1FD4D0", + "script": "DewfordTown_Hall_EventScript_Girl", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_Hall_EventScript_1FD4F9", + "script": "DewfordTown_Hall_EventScript_Woman", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_Hall_EventScript_1FD50A", + "script": "DewfordTown_Hall_EventScript_Man", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_Hall_EventScript_1FD547", + "script": "DewfordTown_Hall_EventScript_ExpertM", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_Hall_EventScript_1FD563", + "script": "DewfordTown_Hall_EventScript_Twin", "flag": "0" }, { @@ -89,7 +89,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_Hall_EventScript_1FD57F", + "script": "DewfordTown_Hall_EventScript_LittleBoy", "flag": "0" }, { @@ -102,7 +102,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_Hall_EventScript_1FD62F", + "script": "DewfordTown_Hall_EventScript_SchoolKidM", "flag": "0" }, { @@ -115,7 +115,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_Hall_EventScript_1FD63B", + "script": "DewfordTown_Hall_EventScript_PsychicM", "flag": "0" }, { @@ -128,7 +128,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_Hall_EventScript_1FD7DA", + "script": "DewfordTown_Hall_EventScript_SludgeBombMan", "flag": "FLAG_HIDE_DEWFORD_HALL_SLUDGE_BOMB_MAN" } ], @@ -156,7 +156,7 @@ "y": 1, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "DewfordTown_Hall_EventScript_1FD590" + "script": "DewfordTown_Hall_EventScript_Bookshelf" }, { "type": "sign", @@ -164,7 +164,7 @@ "y": 1, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "DewfordTown_Hall_EventScript_1FD5A0" + "script": "DewfordTown_Hall_EventScript_Painting" } ] } \ No newline at end of file diff --git a/data/maps/DewfordTown_Hall/scripts.inc b/data/maps/DewfordTown_Hall/scripts.inc index e6eeec010..971dd2321 100644 --- a/data/maps/DewfordTown_Hall/scripts.inc +++ b/data/maps/DewfordTown_Hall/scripts.inc @@ -1,319 +1,319 @@ DewfordTown_Hall_MapScripts:: @ 81FD4CF .byte 0 -DewfordTown_Hall_EventScript_1FD4D0:: @ 81FD4D0 +DewfordTown_Hall_EventScript_Girl:: @ 81FD4D0 lock faceplayer - call DewfordTown_Hall_EventScript_271E8B + call Common_EventScript_BufferTrendyPhrase special TrendyPhraseIsOld - compare VAR_RESULT, 1 - goto_if_eq DewfordTown_Hall_EventScript_1FD4EF - msgbox DewfordTown_Hall_Text_1FD818, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq DewfordTown_Hall_EventScript_GirlBoredOfTrend + msgbox DewfordTown_Hall_Text_CantImagineLifeWithoutTrend, MSGBOX_DEFAULT release end -DewfordTown_Hall_EventScript_1FD4EF:: @ 81FD4EF - msgbox DewfordTown_Hall_Text_1FD877, MSGBOX_DEFAULT +DewfordTown_Hall_EventScript_GirlBoredOfTrend:: @ 81FD4EF + msgbox DewfordTown_Hall_Text_GettingBoredOfTrend, MSGBOX_DEFAULT release end -DewfordTown_Hall_EventScript_1FD4F9:: @ 81FD4F9 +DewfordTown_Hall_EventScript_Woman:: @ 81FD4F9 lock faceplayer - call DewfordTown_Hall_EventScript_271E8B - msgbox DewfordTown_Hall_Text_1FD8ED, MSGBOX_DEFAULT + call Common_EventScript_BufferTrendyPhrase + msgbox DewfordTown_Hall_Text_TeachingMonAboutTrend, MSGBOX_DEFAULT release end -DewfordTown_Hall_EventScript_1FD50A:: @ 81FD50A +DewfordTown_Hall_EventScript_Man:: @ 81FD50A lock faceplayer - call DewfordTown_Hall_EventScript_271E8B + call Common_EventScript_BufferTrendyPhrase special sub_811EF6C - msgbox DewfordTown_Hall_Text_1FD948, MSGBOX_YESNO + msgbox DewfordTown_Hall_Text_DeepLinkBetweenXAndY, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq DewfordTown_Hall_EventScript_1FD533 + goto_if_eq DewfordTown_Hall_EventScript_ConfirmTrendLink compare VAR_RESULT, NO - goto_if_eq DewfordTown_Hall_EventScript_1FD53D + goto_if_eq DewfordTown_Hall_EventScript_RejectTrendLink end -DewfordTown_Hall_EventScript_1FD533:: @ 81FD533 - msgbox DewfordTown_Hall_Text_1FD9B3, MSGBOX_DEFAULT +DewfordTown_Hall_EventScript_ConfirmTrendLink:: @ 81FD533 + msgbox DewfordTown_Hall_Text_MyHunchWasRight, MSGBOX_DEFAULT release end -DewfordTown_Hall_EventScript_1FD53D:: @ 81FD53D - msgbox DewfordTown_Hall_Text_1FDA06, MSGBOX_DEFAULT +DewfordTown_Hall_EventScript_RejectTrendLink:: @ 81FD53D + msgbox DewfordTown_Hall_Text_NotEasyToKeepUp, MSGBOX_DEFAULT release end -DewfordTown_Hall_EventScript_1FD547:: @ 81FD547 +DewfordTown_Hall_EventScript_ExpertM:: @ 81FD547 lock faceplayer - call DewfordTown_Hall_EventScript_271E8B - msgbox DewfordTown_Hall_Text_1FDA5C, MSGBOX_DEFAULT + call Common_EventScript_BufferTrendyPhrase + msgbox DewfordTown_Hall_Text_TVShowAboutTrend, MSGBOX_DEFAULT closemessage applymovement 4, Common_Movement_WalkInPlaceFastestUp waitmovement 0 release end -DewfordTown_Hall_EventScript_1FD563:: @ 81FD563 +DewfordTown_Hall_EventScript_Twin:: @ 81FD563 lock faceplayer - call DewfordTown_Hall_EventScript_271E8B - msgbox DewfordTown_Hall_Text_1FDA99, MSGBOX_DEFAULT + call Common_EventScript_BufferTrendyPhrase + msgbox DewfordTown_Hall_Text_IsTrendMorePopularAcrossSea, MSGBOX_DEFAULT closemessage applymovement 5, Common_Movement_WalkInPlaceFastestUp waitmovement 0 release end -DewfordTown_Hall_EventScript_1FD57F:: @ 81FD57F +DewfordTown_Hall_EventScript_LittleBoy:: @ 81FD57F lock faceplayer - call DewfordTown_Hall_EventScript_271E8B - msgbox DewfordTown_Hall_Text_1FDAC4, MSGBOX_DEFAULT + call Common_EventScript_BufferTrendyPhrase + msgbox DewfordTown_Hall_Text_CollectTrendMerchandise, MSGBOX_DEFAULT release end -DewfordTown_Hall_EventScript_1FD590:: @ 81FD590 +DewfordTown_Hall_EventScript_Bookshelf:: @ 81FD590 lockall - call DewfordTown_Hall_EventScript_271E8B - msgbox DewfordTown_Hall_Text_1FDB89, MSGBOX_DEFAULT + call Common_EventScript_BufferTrendyPhrase + msgbox DewfordTown_Hall_Text_BooksAboutTrend, MSGBOX_DEFAULT releaseall end -DewfordTown_Hall_EventScript_1FD5A0:: @ 81FD5A0 +DewfordTown_Hall_EventScript_Painting:: @ 81FD5A0 lockall - call DewfordTown_Hall_EventScript_271E8B + call Common_EventScript_BufferTrendyPhrase special GetDewfordHallPaintingNameIndex switch VAR_RESULT - case 0, DewfordTown_Hall_EventScript_1FD607 - case 4, DewfordTown_Hall_EventScript_1FD607 - case 1, DewfordTown_Hall_EventScript_1FD611 - case 5, DewfordTown_Hall_EventScript_1FD607 - case 2, DewfordTown_Hall_EventScript_1FD61B - case 6, DewfordTown_Hall_EventScript_1FD61B - case 3, DewfordTown_Hall_EventScript_1FD625 - case 7, DewfordTown_Hall_EventScript_1FD61B + case 0, DewfordTown_Hall_EventScript_ScreamTitle + case 4, DewfordTown_Hall_EventScript_ScreamTitle + case 1, DewfordTown_Hall_EventScript_SmileTitle + case 5, DewfordTown_Hall_EventScript_ScreamTitle + case 2, DewfordTown_Hall_EventScript_LastTitle + case 6, DewfordTown_Hall_EventScript_LastTitle + case 3, DewfordTown_Hall_EventScript_BirthTitle + case 7, DewfordTown_Hall_EventScript_LastTitle end -DewfordTown_Hall_EventScript_1FD607:: @ 81FD607 - msgbox DewfordTown_Hall_Text_1FDC05, MSGBOX_DEFAULT +DewfordTown_Hall_EventScript_ScreamTitle:: @ 81FD607 + msgbox DewfordTown_Hall_Text_TrendsScream, MSGBOX_DEFAULT releaseall end -DewfordTown_Hall_EventScript_1FD611:: @ 81FD611 - msgbox DewfordTown_Hall_Text_1FDC21, MSGBOX_DEFAULT +DewfordTown_Hall_EventScript_SmileTitle:: @ 81FD611 + msgbox DewfordTown_Hall_Text_TrendsSmile, MSGBOX_DEFAULT releaseall end -DewfordTown_Hall_EventScript_1FD61B:: @ 81FD61B - msgbox DewfordTown_Hall_Text_1FDC3C, MSGBOX_DEFAULT +DewfordTown_Hall_EventScript_LastTitle:: @ 81FD61B + msgbox DewfordTown_Hall_Text_LastTrend, MSGBOX_DEFAULT releaseall end -DewfordTown_Hall_EventScript_1FD625:: @ 81FD625 - msgbox DewfordTown_Hall_Text_1FDC57, MSGBOX_DEFAULT +DewfordTown_Hall_EventScript_BirthTitle:: @ 81FD625 + msgbox DewfordTown_Hall_Text_BirthOfTrend, MSGBOX_DEFAULT releaseall end -DewfordTown_Hall_EventScript_1FD62F:: @ 81FD62F +DewfordTown_Hall_EventScript_SchoolKidM:: @ 81FD62F lockall setvar VAR_0x8008, 0 - goto DewfordTown_Hall_EventScript_1FD647 + goto DewfordTown_Hall_EventScript_DoTrendDebate end -DewfordTown_Hall_EventScript_1FD63B:: @ 81FD63B +DewfordTown_Hall_EventScript_PsychicM:: @ 81FD63B lockall setvar VAR_0x8008, 1 - goto DewfordTown_Hall_EventScript_1FD647 + goto DewfordTown_Hall_EventScript_DoTrendDebate end -DewfordTown_Hall_EventScript_1FD647:: @ 81FD647 - call DewfordTown_Hall_EventScript_271E8B +DewfordTown_Hall_EventScript_DoTrendDebate:: @ 81FD647 + call Common_EventScript_BufferTrendyPhrase special GetDewfordHallPaintingNameIndex switch VAR_RESULT - case 0, DewfordTown_Hall_EventScript_1FD6AD - case 1, DewfordTown_Hall_EventScript_1FD6AD - case 2, DewfordTown_Hall_EventScript_1FD6C9 - case 3, DewfordTown_Hall_EventScript_1FD6C9 - case 4, DewfordTown_Hall_EventScript_1FD6E5 - case 5, DewfordTown_Hall_EventScript_1FD6E5 - case 6, DewfordTown_Hall_EventScript_1FD701 - case 7, DewfordTown_Hall_EventScript_1FD71D + case 0, DewfordTown_Hall_EventScript_TrendDebate1 + case 1, DewfordTown_Hall_EventScript_TrendDebate1 + case 2, DewfordTown_Hall_EventScript_TrendDebate2 + case 3, DewfordTown_Hall_EventScript_TrendDebate2 + case 4, DewfordTown_Hall_EventScript_TrendDebate3 + case 5, DewfordTown_Hall_EventScript_TrendDebate3 + case 6, DewfordTown_Hall_EventScript_TrendDebate4 + case 7, DewfordTown_Hall_EventScript_TrendDebate5 end -DewfordTown_Hall_EventScript_1FD6AD:: @ 81FD6AD - call DewfordTown_Hall_EventScript_1FD73A - msgbox DewfordTown_Hall_Text_1FDC76, MSGBOX_DEFAULT - call DewfordTown_Hall_EventScript_1FD772 - msgbox DewfordTown_Hall_Text_1FDCE2, MSGBOX_DEFAULT +DewfordTown_Hall_EventScript_TrendDebate1:: @ 81FD6AD + call DewfordTown_Hall_EventScript_DebateReact1 + msgbox DewfordTown_Hall_Text_SawTrendCoolestThing, MSGBOX_DEFAULT + call DewfordTown_Hall_EventScript_DebateReact2 + msgbox DewfordTown_Hall_Text_AllegedTrendNotAuthentic, MSGBOX_DEFAULT releaseall end -DewfordTown_Hall_EventScript_1FD6C9:: @ 81FD6C9 - call DewfordTown_Hall_EventScript_1FD73A - msgbox DewfordTown_Hall_Text_1FDD95, MSGBOX_DEFAULT - call DewfordTown_Hall_EventScript_1FD772 - msgbox DewfordTown_Hall_Text_1FDE0E, MSGBOX_DEFAULT +DewfordTown_Hall_EventScript_TrendDebate2:: @ 81FD6C9 + call DewfordTown_Hall_EventScript_DebateReact1 + msgbox DewfordTown_Hall_Text_ComposedTrendThemeSong, MSGBOX_DEFAULT + call DewfordTown_Hall_EventScript_DebateReact2 + msgbox DewfordTown_Hall_Text_WorkOnYourSinging, MSGBOX_DEFAULT releaseall end -DewfordTown_Hall_EventScript_1FD6E5:: @ 81FD6E5 - call DewfordTown_Hall_EventScript_1FD73A - msgbox DewfordTown_Hall_Text_1FDE77, MSGBOX_DEFAULT - call DewfordTown_Hall_EventScript_1FD772 - msgbox DewfordTown_Hall_Text_1FDED8, MSGBOX_DEFAULT +DewfordTown_Hall_EventScript_TrendDebate3:: @ 81FD6E5 + call DewfordTown_Hall_EventScript_DebateReact1 + msgbox DewfordTown_Hall_Text_OrganizeTrendParty, MSGBOX_DEFAULT + call DewfordTown_Hall_EventScript_DebateReact2 + msgbox DewfordTown_Hall_Text_BrilliantIndeed, MSGBOX_DEFAULT releaseall end -DewfordTown_Hall_EventScript_1FD701:: @ 81FD701 - call DewfordTown_Hall_EventScript_1FD73A - msgbox DewfordTown_Hall_Text_1FDF72, MSGBOX_DEFAULT - call DewfordTown_Hall_EventScript_1FD772 - msgbox DewfordTown_Hall_Text_1FDFF1, MSGBOX_DEFAULT +DewfordTown_Hall_EventScript_TrendDebate4:: @ 81FD701 + call DewfordTown_Hall_EventScript_DebateReact1 + msgbox DewfordTown_Hall_Text_TrendHasBecomePartOfLife, MSGBOX_DEFAULT + call DewfordTown_Hall_EventScript_DebateReact2 + msgbox DewfordTown_Hall_Text_TrendWeighsHeavilyOnMind, MSGBOX_DEFAULT releaseall end -DewfordTown_Hall_EventScript_1FD71D:: @ 81FD71D - call DewfordTown_Hall_EventScript_1FD73A - msgbox DewfordTown_Hall_Text_1FE09A, MSGBOX_DEFAULT - call DewfordTown_Hall_EventScript_1FD772 - msgbox DewfordTown_Hall_Text_1FE0F2, MSGBOX_DEFAULT +DewfordTown_Hall_EventScript_TrendDebate5:: @ 81FD71D + call DewfordTown_Hall_EventScript_DebateReact1 + msgbox DewfordTown_Hall_Text_IfWeTeamUpWellBeInvincible, MSGBOX_DEFAULT + call DewfordTown_Hall_EventScript_DebateReact2 + msgbox DewfordTown_Hall_Text_WellBeTrendDuo, MSGBOX_DEFAULT releaseall end -DewfordTown_Hall_EventScript_1FD739:: @ 81FD739 +DewfordTown_Hall_EventScript_DontMovePlayer1:: @ 81FD739 return -DewfordTown_Hall_EventScript_1FD73A:: @ 81FD73A - applymovement 8, DewfordTown_Hall_Movement_1FD7D6 +DewfordTown_Hall_EventScript_DebateReact1:: @ 81FD73A + applymovement 8, DewfordTown_Hall_Movement_PsychicWalkInPlaceLeft waitmovement 0 compare VAR_0x8008, 0 - goto_if_eq DewfordTown_Hall_EventScript_1FD75B + goto_if_eq DewfordTown_Hall_EventScript_PlayerReactWest compare VAR_0x8008, 1 - goto_if_eq DewfordTown_Hall_EventScript_1FD771 + goto_if_eq DewfordTown_Hall_EventScript_DontMovePlayer2 end -DewfordTown_Hall_EventScript_1FD75B:: @ 81FD75B +DewfordTown_Hall_EventScript_PlayerReactWest:: @ 81FD75B compare VAR_FACING, DIR_EAST - goto_if_eq DewfordTown_Hall_EventScript_1FD739 + goto_if_eq DewfordTown_Hall_EventScript_DontMovePlayer1 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return -DewfordTown_Hall_EventScript_1FD771:: @ 81FD771 +DewfordTown_Hall_EventScript_DontMovePlayer2:: @ 81FD771 return -DewfordTown_Hall_EventScript_1FD772:: @ 81FD772 - applymovement 7, DewfordTown_Hall_Movement_1FD7D8 +DewfordTown_Hall_EventScript_DebateReact2:: @ 81FD772 + applymovement 7, DewfordTown_Hall_Movement_SchoolKidWalkInPlaceRight waitmovement 0 compare VAR_0x8008, 0 - goto_if_eq DewfordTown_Hall_EventScript_1FD793 + goto_if_eq DewfordTown_Hall_EventScript_PlayerReactNorthSouth compare VAR_0x8008, 1 - goto_if_eq DewfordTown_Hall_EventScript_1FD7C0 + goto_if_eq DewfordTown_Hall_EventScript_PlayerReactEast end -DewfordTown_Hall_EventScript_1FD793:: @ 81FD793 +DewfordTown_Hall_EventScript_PlayerReactNorthSouth:: @ 81FD793 compare VAR_FACING, DIR_NORTH - call_if_eq DewfordTown_Hall_EventScript_1FD7AA + call_if_eq DewfordTown_Hall_EventScript_PlayerWalkInPlaceUp compare VAR_FACING, DIR_SOUTH - call_if_eq DewfordTown_Hall_EventScript_1FD7B5 + call_if_eq DewfordTown_Hall_EventScript_PlayerWalkInPlaceDown return -DewfordTown_Hall_EventScript_1FD7AA:: @ 81FD7AA +DewfordTown_Hall_EventScript_PlayerWalkInPlaceUp:: @ 81FD7AA applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return -DewfordTown_Hall_EventScript_1FD7B5:: @ 81FD7B5 +DewfordTown_Hall_EventScript_PlayerWalkInPlaceDown:: @ 81FD7B5 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return -DewfordTown_Hall_EventScript_1FD7C0:: @ 81FD7C0 +DewfordTown_Hall_EventScript_PlayerReactEast:: @ 81FD7C0 compare VAR_FACING, DIR_WEST - goto_if_eq DewfordTown_Hall_EventScript_1FD739 + goto_if_eq DewfordTown_Hall_EventScript_DontMovePlayer1 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return -DewfordTown_Hall_Movement_1FD7D6: @ 81FD7D6 +DewfordTown_Hall_Movement_PsychicWalkInPlaceLeft: @ 81FD7D6 walk_in_place_left step_end -DewfordTown_Hall_Movement_1FD7D8: @ 81FD7D8 +DewfordTown_Hall_Movement_SchoolKidWalkInPlaceRight: @ 81FD7D8 walk_in_place_right step_end -DewfordTown_Hall_EventScript_1FD7DA:: @ 81FD7DA +DewfordTown_Hall_EventScript_SludgeBombMan:: @ 81FD7DA lock faceplayer - call DewfordTown_Hall_EventScript_271E8B - goto_if_set FLAG_RECEIVED_TM36, DewfordTown_Hall_EventScript_1FD80E - msgbox DewfordTown_Hall_Text_1FE142, MSGBOX_DEFAULT + call Common_EventScript_BufferTrendyPhrase + goto_if_set FLAG_RECEIVED_TM36, DewfordTown_Hall_EventScript_ReceivedSludgeBomb + msgbox DewfordTown_Hall_Text_GiveYouSludgeBomb, MSGBOX_DEFAULT giveitem_std ITEM_TM36 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM36 release end -DewfordTown_Hall_EventScript_1FD80E:: @ 81FD80E - msgbox DewfordTown_Hall_Text_1FE1ED, MSGBOX_DEFAULT +DewfordTown_Hall_EventScript_ReceivedSludgeBomb:: @ 81FD80E + msgbox DewfordTown_Hall_Text_LoveSludgeBombButTrendInToo, MSGBOX_DEFAULT release end -DewfordTown_Hall_Text_1FD818: @ 81FD818 +DewfordTown_Hall_Text_CantImagineLifeWithoutTrend: @ 81FD818 .string "What's in vogue? Why, it has to be\n" .string "“{STR_VAR_1}”!\p" .string "I can't imagine what life would be like\n" .string "without “{STR_VAR_1}”!$" -DewfordTown_Hall_Text_1FD877: @ 81FD877 +DewfordTown_Hall_Text_GettingBoredOfTrend: @ 81FD877 .string "What's in vogue? Why, it has to be\n" .string "“{STR_VAR_1}”!\p" .string "But I'm getting kind of bored with it.\p" .string "I should look for the next big thing.$" -DewfordTown_Hall_Text_1FD8ED: @ 81FD8ED +DewfordTown_Hall_Text_TeachingMonAboutTrend: @ 81FD8ED .string "I'm teaching my POKéMON about\n" .string "“{STR_VAR_1},”\l" .string "but it's not going well.\p" .string "It's a bit too much, I think.$" -DewfordTown_Hall_Text_1FD948: @ 81FD948 +DewfordTown_Hall_Text_DeepLinkBetweenXAndY: @ 81FD948 .string "I'm studying up on the hip and trendy\n" .string "“{STR_VAR_1}” now.\p" .string "Is it true that there's a deep link\n" .string "between “{STR_VAR_1}”\l" .string "and “{STR_VAR_2}”?$" -DewfordTown_Hall_Text_1FD9B3: @ 81FD9B3 +DewfordTown_Hall_Text_MyHunchWasRight: @ 81FD9B3 .string "Oh!\n" .string "So, my hunch was right!\p" .string "I'm one step closer to being hip and\n" .string "happening, yowza!$" -DewfordTown_Hall_Text_1FDA06: @ 81FDA06 +DewfordTown_Hall_Text_NotEasyToKeepUp: @ 81FDA06 .string "What?!\n" .string "Is that so?!\p" .string "It's not easy for an older fellow like\n" .string "me to keep up with trends!$" -DewfordTown_Hall_Text_1FDA5C: @ 81FDA5C +DewfordTown_Hall_Text_TVShowAboutTrend: @ 81FDA5C .string "This whole business about\n" .string "“{STR_VAR_1}”…\l" .string "Isn't there a TV show on it?$" -DewfordTown_Hall_Text_1FDA99: @ 81FDA99 +DewfordTown_Hall_Text_IsTrendMorePopularAcrossSea: @ 81FDA99 .string "Across the sea…\p" .string "Is “{STR_VAR_1}”\n" .string "even more popular?$" -DewfordTown_Hall_Text_1FDAC4: @ 81FDAC4 +DewfordTown_Hall_Text_CollectTrendMerchandise: @ 81FDAC4 .string "I collect official\n" .string "“{STR_VAR_1}”\l" .string "licensed merchandise.\p" @@ -327,7 +327,7 @@ DewfordTown_Hall_Text_1FDAC4: @ 81FDAC4 .string "Heheh, I own!\n" .string "I'm not sharing anything with you!$" -DewfordTown_Hall_Text_1FDB89: @ 81FDB89 +DewfordTown_Hall_Text_BooksAboutTrend: @ 81FDB89 .string "IDENTIFYING GOOD\n" .string "“{STR_VAR_1}” &\l" .string "BAD “{STR_VAR_1}”…\p" @@ -339,30 +339,30 @@ DewfordTown_Hall_Text_1FDB89: @ 81FDB89 .string "It's neatly jammed with books about\n" .string "“{STR_VAR_1}.”$" -DewfordTown_Hall_Text_1FDC05: @ 81FDC05 +DewfordTown_Hall_Text_TrendsScream: @ 81FDC05 .string "“{STR_VAR_1}'S\n" .string "SCREAM” is the title.$" -DewfordTown_Hall_Text_1FDC21: @ 81FDC21 +DewfordTown_Hall_Text_TrendsSmile: @ 81FDC21 .string "“{STR_VAR_1}'S\n" .string "SMILE” is the title.$" -DewfordTown_Hall_Text_1FDC3C: @ 81FDC3C +DewfordTown_Hall_Text_LastTrend: @ 81FDC3C .string "It's titled “THE LAST\n" .string "{STR_VAR_1}”.$" -DewfordTown_Hall_Text_1FDC57: @ 81FDC57 +DewfordTown_Hall_Text_BirthOfTrend: @ 81FDC57 .string "It's titled “THE BIRTH OF\n" .string "{STR_VAR_1}”.$" -DewfordTown_Hall_Text_1FDC76: @ 81FDC76 +DewfordTown_Hall_Text_SawTrendCoolestThing: @ 81FDC76 .string "I saw “{STR_VAR_1}”!\n" .string "Cool, huh?\p" .string "It's, like, the coolest thing going!\p" .string "It was awesome!\n" .string "It was the real thing, oh yeah!$" -DewfordTown_Hall_Text_1FDCE2: @ 81FDCE2 +DewfordTown_Hall_Text_AllegedTrendNotAuthentic: @ 81FDCE2 .string "Oh, no, no, no.\p" .string "That alleged\n" .string "“{STR_VAR_1}”\l" @@ -372,7 +372,7 @@ DewfordTown_Hall_Text_1FDCE2: @ 81FDCE2 .string "Sharper, yet more mellow!\p" .string "Ah, no matter. It's astonishing!$" -DewfordTown_Hall_Text_1FDD95: @ 81FDD95 +DewfordTown_Hall_Text_ComposedTrendThemeSong: @ 81FDD95 .string "Hey, listen, I composed a theme song\n" .string "for “{STR_VAR_1}.”\p" .string "“{STR_VAR_1}”\n" @@ -384,20 +384,20 @@ DewfordTown_Hall_Text_1FDD95: @ 81FDD95 .string "Wonderful\n" .string "{STR_VAR_1}!$" -DewfordTown_Hall_Text_1FDE0E: @ 81FDE0E +DewfordTown_Hall_Text_WorkOnYourSinging: @ 81FDE0E .string "… …\p" .string "I dare say, chap, it would pay for you\n" .string "to work on your singing before you\l" .string "trifle yourself with\l" .string "“{STR_VAR_1}.”$" -DewfordTown_Hall_Text_1FDE77: @ 81FDE77 +DewfordTown_Hall_Text_OrganizeTrendParty: @ 81FDE77 .string "Anyway, as I was saying earlier, we\n" .string "should get together and organize a\l" .string "“{STR_VAR_1}” party\l" .string "on the island.$" -DewfordTown_Hall_Text_1FDED8: @ 81FDED8 +DewfordTown_Hall_Text_BrilliantIndeed: @ 81FDED8 .string "Oh, a smashing good idea!\p" .string "It will settle once and for all\n" .string "who is the best at\l" @@ -406,14 +406,14 @@ DewfordTown_Hall_Text_1FDED8: @ 81FDED8 .string "Starting today, our lives will revolve\n" .string "around “{STR_VAR_1}”!$" -DewfordTown_Hall_Text_1FDF72: @ 81FDF72 +DewfordTown_Hall_Text_TrendHasBecomePartOfLife: @ 81FDF72 .string "I was thinking, though…\p" .string "Wouldn't you agree that\n" .string "“{STR_VAR_1}” has\l" .string "grown from being something trendy to\l" .string "being a part of our daily lives?$" -DewfordTown_Hall_Text_1FDFF1: @ 81FDFF1 +DewfordTown_Hall_Text_TrendWeighsHeavilyOnMind: @ 81FDFF1 .string "Beg pardon?\n" .string "That much, what?\p" .string "However, it's true that\n" @@ -424,19 +424,19 @@ DewfordTown_Hall_Text_1FDFF1: @ 81FDFF1 .string "“{STR_VAR_1}”\l" .string "PROFESSOR, old sport!$" -DewfordTown_Hall_Text_1FE09A: @ 81FE09A +DewfordTown_Hall_Text_IfWeTeamUpWellBeInvincible: @ 81FE09A .string "If you and me team up as a combo,\n" .string "we'll be invincible when it comes to all\l" .string "things “{STR_VAR_1}”!$" -DewfordTown_Hall_Text_1FE0F2: @ 81FE0F2 +DewfordTown_Hall_Text_WellBeTrendDuo: @ 81FE0F2 .string "Spot on, my friend!\p" .string "We shall be the\n" .string "“{STR_VAR_1}” DUO!\p" .string "Isn't that a ripe image?\n" .string "Hahahah!$" -DewfordTown_Hall_Text_1FE142: @ 81FE142 +DewfordTown_Hall_Text_GiveYouSludgeBomb: @ 81FE142 .string "For me, SLUDGE BOMB is at the peak\n" .string "of popularity. It's the one.\p" .string "Hunh? You're telling me that you don't\n" @@ -444,7 +444,7 @@ DewfordTown_Hall_Text_1FE142: @ 81FE142 .string "That's outright pitiful.\n" .string "I'll give you one.$" -DewfordTown_Hall_Text_1FE1ED: @ 81FE1ED +DewfordTown_Hall_Text_LoveSludgeBombButTrendInToo: @ 81FE1ED .string "I love SLUDGE BOMB.\p" .string "But POKéMON with the move\n" .string "“{STR_VAR_1}”\l" diff --git a/data/maps/DewfordTown_House1/map.json b/data/maps/DewfordTown_House1/map.json index dfae500bd..beb6d5275 100644 --- a/data/maps/DewfordTown_House1/map.json +++ b/data/maps/DewfordTown_House1/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_House1_EventScript_1FC3D7", + "script": "DewfordTown_House1_EventScript_Woman", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_House1_EventScript_1FC3CE", + "script": "DewfordTown_House1_EventScript_Man", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_House1_EventScript_1FC3E0", + "script": "DewfordTown_House1_EventScript_Zigzagoon", "flag": "0" } ], diff --git a/data/maps/DewfordTown_House1/scripts.inc b/data/maps/DewfordTown_House1/scripts.inc index 32706dbde..06e377057 100644 --- a/data/maps/DewfordTown_House1/scripts.inc +++ b/data/maps/DewfordTown_House1/scripts.inc @@ -1,36 +1,36 @@ DewfordTown_House1_MapScripts:: @ 81FC3CD .byte 0 -DewfordTown_House1_EventScript_1FC3CE:: @ 81FC3CE - msgbox DewfordTown_House1_Text_1FC3F3, MSGBOX_NPC +DewfordTown_House1_EventScript_Man:: @ 81FC3CE + msgbox DewfordTown_House1_Text_LotToBeSaidForLivingOnIsland, MSGBOX_NPC end -DewfordTown_House1_EventScript_1FC3D7:: @ 81FC3D7 - msgbox DewfordTown_House1_Text_1FC45B, MSGBOX_NPC +DewfordTown_House1_EventScript_Woman:: @ 81FC3D7 + msgbox DewfordTown_House1_Text_LifeGoesSlowlyOnIsland, MSGBOX_NPC end -DewfordTown_House1_EventScript_1FC3E0:: @ 81FC3E0 +DewfordTown_House1_EventScript_Zigzagoon:: @ 81FC3E0 lock faceplayer waitse playmoncry SPECIES_ZIGZAGOON, 0 - msgbox DewfordTown_House1_Text_1FC510, MSGBOX_DEFAULT + msgbox DewfordTown_House1_Text_Zigzagoon, MSGBOX_DEFAULT waitmoncry release end -DewfordTown_House1_Text_1FC3F3: @ 81FC3F3 +DewfordTown_House1_Text_LotToBeSaidForLivingOnIsland: @ 81FC3F3 .string "There's a lot to be said for living on\n" .string "a small island like this in harmony with\l" .string "POKéMON and the family.$" -DewfordTown_House1_Text_1FC45B: @ 81FC45B +DewfordTown_House1_Text_LifeGoesSlowlyOnIsland: @ 81FC45B .string "I left the major port of SLATEPORT\n" .string "CITY when I married my husband here.\p" .string "Life goes by slowly on this little\n" .string "island. But being surrounded by the\l" .string "beautiful sea--that's happiness, too.$" -DewfordTown_House1_Text_1FC510: @ 81FC510 +DewfordTown_House1_Text_Zigzagoon: @ 81FC510 .string "ZIGZAGOON: Guguuh!$" diff --git a/data/maps/DewfordTown_House2/map.json b/data/maps/DewfordTown_House2/map.json index bc9c008fc..ac1abca36 100644 --- a/data/maps/DewfordTown_House2/map.json +++ b/data/maps/DewfordTown_House2/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_House2_EventScript_1FE22E", + "script": "DewfordTown_House2_EventScript_Man", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_House2_EventScript_1FE271", + "script": "DewfordTown_House2_EventScript_Boy", "flag": "0" } ], diff --git a/data/maps/DewfordTown_House2/scripts.inc b/data/maps/DewfordTown_House2/scripts.inc index eb6beb951..43d2c1b5e 100644 --- a/data/maps/DewfordTown_House2/scripts.inc +++ b/data/maps/DewfordTown_House2/scripts.inc @@ -1,33 +1,33 @@ DewfordTown_House2_MapScripts:: @ 81FE22D .byte 0 -DewfordTown_House2_EventScript_1FE22E:: @ 81FE22E +DewfordTown_House2_EventScript_Man:: @ 81FE22E lock faceplayer - goto_if_set FLAG_RECEIVED_SILK_SCARF, DewfordTown_House2_EventScript_1FE267 - msgbox DewfordTown_House2_Text_1FE27A, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_SILK_SCARF, DewfordTown_House2_EventScript_ExplainSilkScarf + msgbox DewfordTown_House2_Text_WantYouToHaveSilkScarf, MSGBOX_DEFAULT giveitem_std ITEM_SILK_SCARF - compare VAR_RESULT, 0 - goto_if_eq DewfordTown_House2_EventScript_1FE25D + compare VAR_RESULT, FALSE + goto_if_eq DewfordTown_House2_EventScript_NoRoomForScarf setflag FLAG_RECEIVED_SILK_SCARF release end -DewfordTown_House2_EventScript_1FE25D:: @ 81FE25D - msgbox DewfordTown_House2_Text_1FE356, MSGBOX_DEFAULT +DewfordTown_House2_EventScript_NoRoomForScarf:: @ 81FE25D + msgbox DewfordTown_House2_Text_NoRoom, MSGBOX_DEFAULT release end -DewfordTown_House2_EventScript_1FE267:: @ 81FE267 - msgbox DewfordTown_House2_Text_1FE3D1, MSGBOX_DEFAULT +DewfordTown_House2_EventScript_ExplainSilkScarf:: @ 81FE267 + msgbox DewfordTown_House2_Text_ExplainSilkScarf, MSGBOX_DEFAULT release end -DewfordTown_House2_EventScript_1FE271:: @ 81FE271 - msgbox DewfordTown_House2_Text_1FE444, MSGBOX_NPC +DewfordTown_House2_EventScript_Boy:: @ 81FE271 + msgbox DewfordTown_House2_Text_BrawlySoCool, MSGBOX_NPC end -DewfordTown_House2_Text_1FE27A: @ 81FE27A +DewfordTown_House2_Text_WantYouToHaveSilkScarf: @ 81FE27A .string "Gorge your eyes on this!\p" .string "It's a SILK SCARF. It's right at the\n" .string "cutting edge of fashion, yeah!\p" @@ -36,19 +36,19 @@ DewfordTown_House2_Text_1FE27A: @ 81FE27A .string "Oh, you're a delight!\n" .string "Here you go. I want you to have it!$" -DewfordTown_House2_Text_1FE356: @ 81FE356 +DewfordTown_House2_Text_NoRoom: @ 81FE356 .string "Oh, you don't have room?\p" .string "Now, listen tight, this SCARF is a must-\n" .string "have! Why, I would sell all my items\l" .string "in order to get it!$" -DewfordTown_House2_Text_1FE3D1: @ 81FE3D1 +DewfordTown_House2_Text_ExplainSilkScarf: @ 81FE3D1 .string "The SILK SCARF raises the power of\n" .string "NORMAL-type moves.\p" .string "It's a marvelous SCARF that will go\n" .string "with almost all POKéMON!$" -DewfordTown_House2_Text_1FE444: @ 81FE444 +DewfordTown_House2_Text_BrawlySoCool: @ 81FE444 .string "Wow, you bothered to cross the sea\n" .string "to visit DEWFORD?\p" .string "Did you maybe come here because you\n" From 4334e31a7eb22f80a2571f48ccbff458a4f2d735 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 7 Nov 2019 16:46:56 -0500 Subject: [PATCH 29/40] Fix sailing typo --- data/maps/DewfordTown/scripts.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc index 058a3ffca..137b394b1 100644 --- a/data/maps/DewfordTown/scripts.inc +++ b/data/maps/DewfordTown/scripts.inc @@ -125,8 +125,8 @@ DewfordTown_EventScript_SailToPetalburg:: @ 81E9660 waitmovement 0 hideobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN call Common_EventScript_PlayBrineysBoatMusic - applymovement 4, DewfordTown_Movement_SailToDewford - applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_SailToDewford + applymovement 4, DewfordTown_Movement_SailToPetalburg + applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_SailToPetalburg waitmovement 0 showobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE104 call Common_EventScript_StopBrineysBoatMusic @@ -157,8 +157,8 @@ DewfordTown_EventScript_SailToSlateport:: @ 81E96E7 waitmovement 0 hideobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN call Common_EventScript_PlayBrineysBoatMusic - applymovement 4, DewfordTown_Movement_SailToPetalburg - applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_SailToPetalburg + applymovement 4, DewfordTown_Movement_SailToSlateport + applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_SailToSlateport waitmovement 0 call Common_EventScript_StopBrineysBoatMusic showobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE109 @@ -192,7 +192,7 @@ DewfordTown_EventScript_LandedSlateport:: @ 81E9799 msgbox DewfordTown_Text_BrineyLandedInSlateport, MSGBOX_DEFAULT return -DewfordTown_Movement_SailToDewford: @ 81E97A2 +DewfordTown_Movement_SailToPetalburg: @ 81E97A2 walk_up walk_up walk_fast_up @@ -389,7 +389,7 @@ DewfordTown_Movement_SailToDewford: @ 81E97A2 walk_up step_end -DewfordTown_Movement_SailToPetalburg: @ 81E9865 +DewfordTown_Movement_SailToSlateport: @ 81E9865 walk_right walk_fast_right walk_fast_right From 01e6fb6dd0e4880b3ebac3c9a5287daf6c60fba3 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 6 Nov 2019 18:18:11 -0600 Subject: [PATCH 30/40] Document some battle_bg-related things --- .../text.pal | 0 include/battle_bg.h | 4 +- include/battle_message.h | 2 +- include/graphics.h | 4 +- src/battle_bg.c | 123 +++++++++--------- src/battle_dome.c | 4 +- src/battle_main.c | 14 +- src/battle_script_commands.c | 2 +- src/evolution_scene.c | 4 +- src/graphics.c | 4 +- 10 files changed, 79 insertions(+), 82 deletions(-) rename graphics/{battle_frontier => battle_interface}/text.pal (100%) mode change 100644 => 100755 diff --git a/graphics/battle_frontier/text.pal b/graphics/battle_interface/text.pal old mode 100644 new mode 100755 similarity index 100% rename from graphics/battle_frontier/text.pal rename to graphics/battle_interface/text.pal diff --git a/include/battle_bg.h b/include/battle_bg.h index dac41c992..167ea5cf7 100644 --- a/include/battle_bg.h +++ b/include/battle_bg.h @@ -2,11 +2,11 @@ #define GUARD_BATTLE_BG_H void BattleInitBgsAndWindows(void); -void sub_80356D0(void); +void InitBattleBgsVideo(void); void LoadBattleMenuWindowGfx(void); void DrawMainBattleBackground(void); void LoadBattleTextboxAndBackground(void); -void sub_8035D74(u8 taskId); +void InitLinkBattleVsScreen(u8 taskId); void DrawBattleEntryBackground(void); bool8 LoadChosenBattleElement(u8 caseId); diff --git a/include/battle_message.h b/include/battle_message.h index 88ccbb90f..1157fbfae 100644 --- a/include/battle_message.h +++ b/include/battle_message.h @@ -213,7 +213,7 @@ struct BattleMsgData void BufferStringBattle(u16 stringID); u32 BattleStringExpandPlaceholdersToDisplayedString(const u8* src); u32 BattleStringExpandPlaceholders(const u8* src, u8* dst); -void BattlePutTextOnWindow(const u8* text, u8 arg1); +void BattlePutTextOnWindow(const u8* text, u8 windowId); void SetPpNumbersPaletteInMoveSelection(void); u8 GetCurrentPpToMaxPpState(u8 currentPp, u8 maxPp); diff --git a/include/graphics.h b/include/graphics.h index 37dd77e89..831b202f8 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -3208,7 +3208,7 @@ extern const u32 gBattleTextboxTiles[]; extern const u32 gBattleTextboxTilemap[]; extern const u32 gBattleTextboxPalette[]; extern const u32 gUnknown_08D778F0[]; -extern const u32 gUnknown_08D77B0C[]; +extern const u32 gVsLettersGfx[]; extern const u32 gUnknown_08D77AE4[]; extern const u32 gUnknown_08D779D8[]; extern const u32 gUnknown_08D857A8[]; @@ -4122,7 +4122,7 @@ extern const u32 gUnknown_08D84970[]; extern const u32 gUnknown_08D84F00[]; extern const u32 gUnknown_08D85444[]; extern const u32 gUnknown_08D85358[]; -extern const u32 gUnknown_08D85600[]; +extern const u32 gBattleWindowTextPalette[]; extern const u32 gUnknown_08D854C8[]; extern const u32 gUnknown_08D82F10[]; extern const u32 gUnknown_08D834FC[]; diff --git a/src/battle_bg.c b/src/battle_bg.c index a08873857..567625a99 100644 --- a/src/battle_bg.c +++ b/src/battle_bg.c @@ -36,7 +36,7 @@ struct BattleBackground // .rodata static const u16 sUnrefArray[] = {0x0300, 0x0000}; //OamData? -static const struct OamData gUnknown_0831A988 = +static const struct OamData sVsLetter_V_OamData = { .y = 0, .affineMode = 3, @@ -53,7 +53,7 @@ static const struct OamData gUnknown_0831A988 = .affineParam = 0, }; -static const struct OamData gUnknown_0831A990 = +static const struct OamData sVsLetter_S_OamData = { .y = 0, .affineMode = 3, @@ -70,13 +70,13 @@ static const struct OamData gUnknown_0831A990 = .affineParam = 0, }; -static const union AffineAnimCmd gUnknown_0831A998[] = +static const union AffineAnimCmd sVsLetterAffineAnimCmds0[] = { AFFINEANIMCMD_FRAME(0x0080, 0x0080, 0x00, 0x00), AFFINEANIMCMD_END, }; -static const union AffineAnimCmd gUnknown_0831A9A8[] = +static const union AffineAnimCmd sVsLetterAffineAnimCmds1[] = { AFFINEANIMCMD_FRAME(0x0080, 0x0080, 0x00, 0x00), AFFINEANIMCMD_FRAME(0x0018, 0x0018, 0x00, 0x80), @@ -84,37 +84,39 @@ static const union AffineAnimCmd gUnknown_0831A9A8[] = AFFINEANIMCMD_END, }; -static const union AffineAnimCmd * const gUnknown_0831A9C8[] = +static const union AffineAnimCmd *const sVsLetterAffineAnimTable[] = { - gUnknown_0831A998, - gUnknown_0831A9A8, + sVsLetterAffineAnimCmds0, + sVsLetterAffineAnimCmds1, }; -static const struct SpriteTemplate gUnknown_0831A9D0 = +#define TAG_VS_LETTERS 10000 + +static const struct SpriteTemplate sVsLetter_V_SpriteTemplate = { - .tileTag = 0x2710, - .paletteTag = 0x2710, - .oam = &gUnknown_0831A988, + .tileTag = TAG_VS_LETTERS, + .paletteTag = TAG_VS_LETTERS, + .oam = &sVsLetter_V_OamData, .anims = gDummySpriteAnimTable, .images = NULL, - .affineAnims = gUnknown_0831A9C8, + .affineAnims = sVsLetterAffineAnimTable, .callback = nullsub_17 }; -static const struct SpriteTemplate gUnknown_0831A9E8 = +static const struct SpriteTemplate sVsLetter_S_SpriteTemplate = { - .tileTag = 0x2710, - .paletteTag = 0x2710, - .oam = &gUnknown_0831A990, + .tileTag = TAG_VS_LETTERS, + .paletteTag = TAG_VS_LETTERS, + .oam = &sVsLetter_S_OamData, .anims = gDummySpriteAnimTable, .images = NULL, - .affineAnims = gUnknown_0831A9C8, + .affineAnims = sVsLetterAffineAnimTable, .callback = nullsub_17 }; -static const struct CompressedSpriteSheet gUnknown_0831AA00 = +static const struct CompressedSpriteSheet sVsLettersSpriteSheet = { - gUnknown_08D77B0C, 0x1000, 0x2710 + gVsLettersGfx, 0x1000, TAG_VS_LETTERS }; const struct BgTemplate gBattleBgTemplates[] = @@ -689,7 +691,6 @@ static const struct BattleBackground gBattleTerrainTable[] = }, }; -// .text void BattleInitBgsAndWindows(void) { ResetBgsAndClearDma3BusyFlags(0); @@ -710,7 +711,7 @@ void BattleInitBgsAndWindows(void) DeactivateAllTextPrinters(); } -void sub_80356D0(void) +void InitBattleBgsVideo(void) { DisableInterrupts(INTR_FLAG_HBLANK); EnableInterrupts(INTR_FLAG_VBLANK | INTR_FLAG_VCOUNT | INTR_FLAG_TIMER3 | INTR_FLAG_SERIAL); @@ -725,10 +726,11 @@ void LoadBattleMenuWindowGfx(void) { LoadUserWindowBorderGfx(2, 0x12, 0x10); LoadUserWindowBorderGfx(2, 0x22, 0x10); - LoadCompressedPalette(gUnknown_08D85600, 0x50, 0x20); + LoadCompressedPalette(gBattleWindowTextPalette, 0x50, 0x20); if (gBattleTypeFlags & BATTLE_TYPE_ARENA) { + // Load graphics for the Battle Arena referee's mid-battle messages. Menu_LoadStdPalAt(0x70); LoadMessageBoxGfx(0, 0x30, 0x70); gPlttBufferUnfaded[0x76] = 0; @@ -837,86 +839,81 @@ void DrawMainBattleBackground(void) void LoadBattleTextboxAndBackground(void) { - LZDecompressVram(gBattleTextboxTiles, (void*)(VRAM)); + LZDecompressVram(gBattleTextboxTiles, (void*)(BG_CHAR_ADDR(0))); CopyToBgTilemapBuffer(0, gBattleTextboxTilemap, 0, 0); CopyBgTilemapBufferToVram(0); LoadCompressedPalette(gBattleTextboxPalette, 0, 0x40); LoadBattleMenuWindowGfx(); - DrawMainBattleBackground(); } -static void sub_8035AE4(u8 taskId, u8 battlerId, u8 bgId, u8 destX, u8 destY) +static void DrawLinkBattleParticipantPokeballs(u8 taskId, u8 multiplayerId, u8 bgId, u8 destX, u8 destY) { s32 i; - u16 var = 0; - u16 src[6]; + u16 pokeballStatuses = 0; + u16 tiles[6]; if (gBattleTypeFlags & BATTLE_TYPE_MULTI) { if (gTasks[taskId].data[5] != 0) { - switch (battlerId) + switch (multiplayerId) { case 0: - var = 0x3F & gTasks[taskId].data[3]; + pokeballStatuses = 0x3F & gTasks[taskId].data[3]; break; case 1: - var = (0xFC0 & gTasks[taskId].data[4]) >> 6; + pokeballStatuses = (0xFC0 & gTasks[taskId].data[4]) >> 6; break; case 2: - var = (0xFC0 & gTasks[taskId].data[3]) >> 6; + pokeballStatuses = (0xFC0 & gTasks[taskId].data[3]) >> 6; break; case 3: - var = 0x3F & gTasks[taskId].data[4]; + pokeballStatuses = 0x3F & gTasks[taskId].data[4]; break; } } else { - switch (battlerId) + switch (multiplayerId) { case 0: - var = 0x3F & gTasks[taskId].data[3]; + pokeballStatuses = 0x3F & gTasks[taskId].data[3]; break; case 1: - var = 0x3F & gTasks[taskId].data[4]; + pokeballStatuses = 0x3F & gTasks[taskId].data[4]; break; case 2: - var = (0xFC0 & gTasks[taskId].data[3]) >> 6; + pokeballStatuses = (0xFC0 & gTasks[taskId].data[3]) >> 6; break; case 3: - var = (0xFC0 & gTasks[taskId].data[4]) >> 6; + pokeballStatuses = (0xFC0 & gTasks[taskId].data[4]) >> 6; break; } } for (i = 0; i < 3; i++) - { - src[i] = ((var & (3 << (i * 2))) >> (i * 2)) + 0x6001; - } + tiles[i] = ((pokeballStatuses & (3 << (i * 2))) >> (i * 2)) + 0x6001; - CopyToBgTilemapBufferRect_ChangePalette(bgId, src, destX, destY, 3, 1, 0x11); + CopyToBgTilemapBufferRect_ChangePalette(bgId, tiles, destX, destY, 3, 1, 0x11); CopyBgTilemapBufferToVram(bgId); } else { - if (battlerId == gBattleScripting.multiplayerId) - var = gTasks[taskId].data[3]; + if (multiplayerId == gBattleScripting.multiplayerId) + pokeballStatuses = gTasks[taskId].data[3]; else - var = gTasks[taskId].data[4]; + pokeballStatuses = gTasks[taskId].data[4]; for (i = 0; i < 6; i++) - { - src[i] = ((var & (3 << (i * 2))) >> (i * 2)) + 0x6001; - } + tiles[i] = ((pokeballStatuses & (3 << (i * 2))) >> (i * 2)) + 0x6001; - CopyToBgTilemapBufferRect_ChangePalette(bgId, src, destX, destY, 6, 1, 0x11); + CopyToBgTilemapBufferRect_ChangePalette(bgId, tiles, destX, destY, 6, 1, 0x11); CopyBgTilemapBufferToVram(bgId); } } -static void sub_8035C4C(void) +static void DrawLinkBattleVsScreenOutcomeText(void) { if (gBattleOutcome == B_OUTCOME_DREW) { @@ -997,7 +994,7 @@ static void sub_8035C4C(void) } } -void sub_8035D74(u8 taskId) +void InitLinkBattleVsScreen(u8 taskId) { struct LinkPlayer *linkPlayer; u8 *name; @@ -1017,19 +1014,19 @@ void sub_8035D74(u8 taskId) { case 0: BattlePutTextOnWindow(name, 0x11); - sub_8035AE4(taskId, linkPlayer->id, 1, 2, 4); + DrawLinkBattleParticipantPokeballs(taskId, linkPlayer->id, 1, 2, 4); break; case 1: BattlePutTextOnWindow(name, 0x12); - sub_8035AE4(taskId, linkPlayer->id, 2, 2, 4); + DrawLinkBattleParticipantPokeballs(taskId, linkPlayer->id, 2, 2, 4); break; case 2: BattlePutTextOnWindow(name, 0x13); - sub_8035AE4(taskId, linkPlayer->id, 1, 2, 8); + DrawLinkBattleParticipantPokeballs(taskId, linkPlayer->id, 1, 2, 8); break; case 3: BattlePutTextOnWindow(name, 0x14); - sub_8035AE4(taskId, linkPlayer->id, 2, 2, 8); + DrawLinkBattleParticipantPokeballs(taskId, linkPlayer->id, 2, 2, 8); break; } } @@ -1049,16 +1046,16 @@ void sub_8035D74(u8 taskId) name = gLinkPlayers[opponentId].name; BattlePutTextOnWindow(name, 0x10); - sub_8035AE4(taskId, playerId, 1, 2, 7); - sub_8035AE4(taskId, opponentId, 2, 2, 7); + DrawLinkBattleParticipantPokeballs(taskId, playerId, 1, 2, 7); + DrawLinkBattleParticipantPokeballs(taskId, opponentId, 2, 2, 7); } gTasks[taskId].data[0]++; break; case 1: - palId = AllocSpritePalette(0x2710); + palId = AllocSpritePalette(TAG_VS_LETTERS); gPlttBufferUnfaded[palId * 16 + 0x10F] = gPlttBufferFaded[palId * 16 + 0x10F] = 0x7FFF; - gBattleStruct->linkBattleVsSpriteId_V = CreateSprite(&gUnknown_0831A9D0, 111, 80, 0); - gBattleStruct->linkBattleVsSpriteId_S = CreateSprite(&gUnknown_0831A9E8, 129, 80, 0); + gBattleStruct->linkBattleVsSpriteId_V = CreateSprite(&sVsLetter_V_SpriteTemplate, 111, 80, 0); + gBattleStruct->linkBattleVsSpriteId_S = CreateSprite(&sVsLetter_S_SpriteTemplate, 129, 80, 0); gSprites[gBattleStruct->linkBattleVsSpriteId_V].invisible = TRUE; gSprites[gBattleStruct->linkBattleVsSpriteId_S].invisible = TRUE; gTasks[taskId].data[0]++; @@ -1087,7 +1084,7 @@ void sub_8035D74(u8 taskId) else { if (gTasks[taskId].data[5] != 0) - sub_8035C4C(); + DrawLinkBattleVsScreenOutcomeText(); PlaySE(SE_W231); DestroyTask(taskId); @@ -1110,7 +1107,7 @@ void DrawBattleEntryBackground(void) if (gBattleTypeFlags & BATTLE_TYPE_LINK) { LZDecompressVram(gUnknown_08D778F0, (void*)(BG_CHAR_ADDR(1))); - LZDecompressVram(gUnknown_08D77B0C, (void*)(VRAM + 0x10000)); + LZDecompressVram(gVsLettersGfx, (void*)(VRAM + 0x10000)); LoadCompressedPalette(gUnknown_08D77AE4, 0x60, 0x20); SetBgAttribute(1, BG_ATTR_SCREENSIZE, 1); SetGpuReg(REG_OFFSET_BG1CNT, 0x5C04); @@ -1122,7 +1119,7 @@ void DrawBattleEntryBackground(void) SetGpuReg(REG_OFFSET_WINOUT, 0x36); gBattle_BG1_Y = 0xFF5C; gBattle_BG2_Y = 0xFF5C; - LoadCompressedSpriteSheetUsingHeap(&gUnknown_0831AA00); + LoadCompressedSpriteSheetUsingHeap(&sVsLettersSpriteSheet); } else if (gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000 | BATTLE_TYPE_EREADER_TRAINER)) { @@ -1195,7 +1192,7 @@ bool8 LoadChosenBattleElement(u8 caseId) switch (caseId) { case 0: - LZDecompressVram(gBattleTextboxTiles, (void*)(VRAM)); + LZDecompressVram(gBattleTextboxTiles, (void*)(BG_CHAR_ADDR(0))); break; case 1: CopyToBgTilemapBuffer(0, gBattleTextboxTilemap, 0, 0); diff --git a/src/battle_dome.c b/src/battle_dome.c index a7d7a92f1..9c63bba42 100644 --- a/src/battle_dome.c +++ b/src/battle_dome.c @@ -3414,7 +3414,7 @@ static void Task_ShowOpponentInfo(u8 taskId) LoadCompressedSpriteSheet(sDomeOptionsSpriteSheet); LoadCompressedPalette(gUnknown_08D85358, 0, 0x200); LoadCompressedPalette(gUnknown_08D85444, 0x100, 0x200); - LoadCompressedPalette(gUnknown_08D85600, 0xF0, 0x20); + LoadCompressedPalette(gBattleWindowTextPalette, 0xF0, 0x20); if (r9 == 2) LoadCompressedPalette(gUnknown_08D854C8, 0x50, 0x20); CpuFill32(0, gPlttBufferFaded, 0x400); @@ -5574,7 +5574,7 @@ static void Task_ShowTourneyTree(u8 taskId) DecompressAndLoadBgGfxUsingHeap(3, gUnknown_08D83C3C, 0x2000, 0, 1); LoadCompressedPalette(gUnknown_08D85358, 0, 0x200); LoadCompressedPalette(gUnknown_08D85444, 0x100, 0x200); - LoadCompressedPalette(gUnknown_08D85600, 0xF0, 0x20); + LoadCompressedPalette(gBattleWindowTextPalette, 0xF0, 0x20); CpuFill32(0, gPlttBufferFaded, 0x400); ShowBg(0); ShowBg(1); diff --git a/src/battle_main.c b/src/battle_main.c index ab8c73ed4..196053ad2 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -687,7 +687,7 @@ static void CB2_InitBattleInternal(void) if (gBattleTypeFlags & BATTLE_TYPE_RECORDED) gBattleTerrain = BATTLE_TERRAIN_BUILDING; - sub_80356D0(); + InitBattleBgsVideo(); LoadBattleTextboxAndBackground(); ResetSpriteData(); ResetTasks(); @@ -1024,7 +1024,7 @@ static void CB2_HandleStartBattle(void) ResetBlockReceivedFlags(); sub_8036EB8(2, playerMultiplayerId); SetAllPlayersBerryData(); - taskId = CreateTask(sub_8035D74, 0); + taskId = CreateTask(InitLinkBattleVsScreen, 0); gTasks[taskId].data[1] = 0x10E; gTasks[taskId].data[2] = 0x5A; gTasks[taskId].data[5] = 0; @@ -1226,7 +1226,7 @@ static void CB2_HandleStartMultiPartnerBattle(void) ResetBlockReceivedFlags(); sub_8036EB8(2, playerMultiplayerId); SetAllPlayersBerryData(); - taskId = CreateTask(sub_8035D74, 0); + taskId = CreateTask(InitLinkBattleVsScreen, 0); gTasks[taskId].data[1] = 0x10E; gTasks[taskId].data[2] = 0x5A; gTasks[taskId].data[5] = 0; @@ -1612,7 +1612,7 @@ static void CB2_HandleStartMultiBattle(void) sub_8036EB8(4, playerMultiplayerId); SetAllPlayersBerryData(); SetDeoxysStats(); - var = CreateTask(sub_8035D74, 0); + var = CreateTask(InitLinkBattleVsScreen, 0); gTasks[var].data[1] = 0x10E; gTasks[var].data[2] = 0x5A; gTasks[var].data[5] = 0; @@ -2250,7 +2250,7 @@ void sub_8038D64(void) gBattle_BG3_X = 0; gBattle_BG3_Y = 0; - sub_80356D0(); + InitBattleBgsVideo(); LoadCompressedPalette(gBattleTextboxPalette, 0, 64); LoadBattleMenuWindowGfx(); ResetSpriteData(); @@ -2261,7 +2261,7 @@ void sub_8038D64(void) gReservedSpritePaletteCount = 4; SetVBlankCallback(VBlankCB_Battle); - taskId = CreateTask(sub_8035D74, 0); + taskId = CreateTask(InitLinkBattleVsScreen, 0); gTasks[taskId].data[1] = 0x10E; gTasks[taskId].data[2] = 0x5A; gTasks[taskId].data[5] = 1; @@ -2446,7 +2446,7 @@ static void sub_80392A8(void) gBattle_BG2_Y = 0; gBattle_BG3_X = 0; gBattle_BG3_Y = 0; - sub_80356D0(); + InitBattleBgsVideo(); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP); LoadBattleMenuWindowGfx(); diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index a6c0f1ee7..33c5f661b 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -10279,7 +10279,7 @@ static void Cmd_displaydexinfo(void) } break; case 3: - sub_80356D0(); + InitBattleBgsVideo(); LoadBattleTextboxAndBackground(); gBattle_BG3_X = 0x100; gBattleCommunication[0]++; diff --git a/src/evolution_scene.c b/src/evolution_scene.c index 929539d30..019d48416 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -235,7 +235,7 @@ void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, gBattleTerrain = BATTLE_TERRAIN_PLAIN; - sub_80356D0(); + InitBattleBgsVideo(); LoadBattleTextboxAndBackground(); ResetSpriteData(); ScanlineEffect_Stop(); @@ -341,7 +341,7 @@ static void CB2_EvolutionSceneLoadGraphics(void) gBattleTerrain = BATTLE_TERRAIN_PLAIN; - sub_80356D0(); + InitBattleBgsVideo(); LoadBattleTextboxAndBackground(); ResetSpriteData(); FreeAllSpritePalettes(); diff --git a/src/graphics.c b/src/graphics.c index 06bfeed17..17d9a03cb 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -960,7 +960,7 @@ const u32 gUnknown_08D778F0[] = INCBIN_U32("graphics/battle_transitions/vs_frame const u32 gUnknown_08D779D8[] = INCBIN_U32("graphics/battle_transitions/vs_frame.bin.lz"); const u32 gUnknown_08D77AE4[] = INCBIN_U32("graphics/battle_transitions/vs_frame.gbapal.lz"); -const u32 gUnknown_08D77B0C[] = INCBIN_U32("graphics/battle_transitions/vs.4bpp.lz"); +const u32 gVsLettersGfx[] = INCBIN_U32("graphics/battle_transitions/vs.4bpp.lz"); #include "data/graphics/battle_terrain.h" @@ -987,7 +987,7 @@ const u32 gUnknown_08D854C8[] = INCBIN_U32("graphics/battle_frontier/options_pal const u32 gBattleArenaJudgementSymbolsGfx[] = INCBIN_U32("graphics/battle_frontier/arena_judgement_symbols.4bpp.lz"); const u32 gBattleArenaJudgementSymbolsPalette[] = INCBIN_U32("graphics/battle_frontier/arena_judgement_symbols.gbapal.lz"); -const u32 gUnknown_08D85600[] = INCBIN_U32("graphics/battle_frontier/text.gbapal.lz"); +const u32 gBattleWindowTextPalette[] = INCBIN_U32("graphics/battle_interface/text.gbapal.lz"); const u16 gUnknown_08D85620[] = INCBIN_U16("graphics/battle_frontier/text_pp.gbapal"); const u16 gTilesetAnims_BattleDomePals0_0[] = INCBIN_U16("graphics/battle_frontier/dome_anim1.gbapal"); From bef24a45f0249ba867a5a11f34e04c35c64cd9fa Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 8 Nov 2019 02:03:45 -0500 Subject: [PATCH 31/40] Document Littleroot scripts --- data/event_scripts.s | 4 +- data/maps/InsideOfTruck/map.json | 22 +- data/maps/InsideOfTruck/scripts.inc | 28 +- data/maps/LittlerootTown/map.json | 34 +- data/maps/LittlerootTown/scripts.inc | 576 +++++++++--------- .../scripts.inc | 7 +- .../LittlerootTown_MaysHouse_1F/scripts.inc | 6 +- .../map.json | 42 +- .../scripts.inc | 574 ++++++++--------- data/scripts/players_house.inc | 8 +- data/text/match_call.inc | 5 +- include/constants/vars.h | 4 +- include/event_scripts.h | 2 +- src/field_control_avatar.c | 2 +- src/save_location.c | 2 + 15 files changed, 685 insertions(+), 631 deletions(-) diff --git a/data/event_scripts.s b/data/event_scripts.s index b1e637bf0..213784708 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -692,8 +692,8 @@ EverGrandeCity_HallOfFame_EventScript_27183F:: @ 827183F return EverGrandeCity_HallOfFame_EventScript_271843:: @ 8271843 - setvar VAR_LITTLEROOT_HOUSES_STATE, 3 - setvar VAR_LITTLEROOT_HOUSES_STATE_2, 3 + setvar VAR_LITTLEROOT_HOUSES_STATE_MAY, 3 + setvar VAR_LITTLEROOT_HOUSES_STATE_BRENDAN, 3 clearflag FLAG_HIDE_PLAYERS_HOUSE_DAD return diff --git a/data/maps/InsideOfTruck/map.json b/data/maps/InsideOfTruck/map.json index ff76eb774..256c7c1a5 100644 --- a/data/maps/InsideOfTruck/map.json +++ b/data/maps/InsideOfTruck/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "InsideOfTruck_EventScript_23BF6C", + "script": "InsideOfTruck_EventScript_MovingBox", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "InsideOfTruck_EventScript_23BF6C", + "script": "InsideOfTruck_EventScript_MovingBox", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "InsideOfTruck_EventScript_23BF6C", + "script": "InsideOfTruck_EventScript_MovingBox", "flag": "0" } ], @@ -85,7 +85,7 @@ "elevation": 3, "var": "VAR_LITTLEROOT_INTRO_STATE", "var_value": "0", - "script": "InsideOfTruck_EventScript_23BF04" + "script": "InsideOfTruck_EventScript_SetIntroFlags" }, { "type": "trigger", @@ -94,7 +94,7 @@ "elevation": 3, "var": "VAR_LITTLEROOT_INTRO_STATE", "var_value": "0", - "script": "InsideOfTruck_EventScript_23BF04" + "script": "InsideOfTruck_EventScript_SetIntroFlags" }, { "type": "trigger", @@ -103,7 +103,7 @@ "elevation": 3, "var": "VAR_LITTLEROOT_INTRO_STATE", "var_value": "0", - "script": "InsideOfTruck_EventScript_23BF04" + "script": "InsideOfTruck_EventScript_SetIntroFlags" } ], "bg_events": [ @@ -113,7 +113,7 @@ "y": 0, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "InsideOfTruck_EventScript_23BF6C" + "script": "InsideOfTruck_EventScript_MovingBox" }, { "type": "sign", @@ -121,7 +121,7 @@ "y": 4, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "InsideOfTruck_EventScript_23BF6C" + "script": "InsideOfTruck_EventScript_MovingBox" }, { "type": "sign", @@ -129,7 +129,7 @@ "y": 3, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "InsideOfTruck_EventScript_23BF6C" + "script": "InsideOfTruck_EventScript_MovingBox" }, { "type": "sign", @@ -137,7 +137,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "InsideOfTruck_EventScript_23BF6C" + "script": "InsideOfTruck_EventScript_MovingBox" }, { "type": "sign", @@ -145,7 +145,7 @@ "y": 2, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "InsideOfTruck_EventScript_23BF6C" + "script": "InsideOfTruck_EventScript_MovingBox" } ] } \ No newline at end of file diff --git a/data/maps/InsideOfTruck/scripts.inc b/data/maps/InsideOfTruck/scripts.inc index 9573fe745..fb75273cc 100644 --- a/data/maps/InsideOfTruck/scripts.inc +++ b/data/maps/InsideOfTruck/scripts.inc @@ -1,29 +1,29 @@ InsideOfTruck_MapScripts:: @ 823BEDA - map_script MAP_SCRIPT_ON_LOAD, InsideOfTruck_MapScript1_23BEE5 - map_script MAP_SCRIPT_ON_RESUME, InsideOfTruck_MapScript1_23BF01 + map_script MAP_SCRIPT_ON_LOAD, InsideOfTruck_OnLoad + map_script MAP_SCRIPT_ON_RESUME, InsideOfTruck_OnResume .byte 0 -InsideOfTruck_MapScript1_23BEE5: @ 823BEE5 +InsideOfTruck_OnLoad: @ 823BEE5 setmetatile 4, 1, METATILE_InsideOfTruck_ExitLight_Top, 0 setmetatile 4, 2, METATILE_InsideOfTruck_ExitLight_Mid, 0 setmetatile 4, 3, METATILE_InsideOfTruck_ExitLight_Bottom, 0 end -InsideOfTruck_MapScript1_23BF01: @ 823BF01 +InsideOfTruck_OnResume: @ 823BF01 setstepcallback STEP_CB_TRUCK end -InsideOfTruck_EventScript_23BF04:: @ 823BF04 +InsideOfTruck_EventScript_SetIntroFlags:: @ 823BF04 lockall setflag FLAG_HIDE_MAP_NAME_POPUP checkplayergender compare VAR_RESULT, MALE - goto_if_eq InsideOfTruck_EventScript_23BF20 + goto_if_eq InsideOfTruck_EventScript_SetIntroFlagsMale compare VAR_RESULT, FEMALE - goto_if_eq InsideOfTruck_EventScript_23BF46 + goto_if_eq InsideOfTruck_EventScript_SetIntroFlagsFemale end -InsideOfTruck_EventScript_23BF20:: @ 823BF20 +InsideOfTruck_EventScript_SetIntroFlagsMale:: @ 823BF20 setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F setvar VAR_LITTLEROOT_INTRO_STATE, 1 setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MOM @@ -31,12 +31,12 @@ InsideOfTruck_EventScript_23BF20:: @ 823BF20 setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_MOM setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_SIBLING setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL - setvar VAR_LITTLEROOT_HOUSES_STATE_2, 1 + setvar VAR_LITTLEROOT_HOUSES_STATE_BRENDAN, 1 setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 3, 10 releaseall end -InsideOfTruck_EventScript_23BF46:: @ 823BF46 +InsideOfTruck_EventScript_SetIntroFlagsFemale:: @ 823BF46 setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_MAYS_HOUSE_2F setvar VAR_LITTLEROOT_INTRO_STATE, 2 setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_MOM @@ -44,16 +44,16 @@ InsideOfTruck_EventScript_23BF46:: @ 823BF46 setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_MOM setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_SIBLING setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL - setvar VAR_LITTLEROOT_HOUSES_STATE, 1 + setvar VAR_LITTLEROOT_HOUSES_STATE_MAY, 1 setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 12, 10 releaseall end -InsideOfTruck_EventScript_23BF6C:: @ 823BF6C - msgbox InsideOfTruck_Text_23BF75, MSGBOX_SIGN +InsideOfTruck_EventScript_MovingBox:: @ 823BF6C + msgbox InsideOfTruck_Text_BoxPrintedWithMonLogo, MSGBOX_SIGN end -InsideOfTruck_Text_23BF75: @ 823BF75 +InsideOfTruck_Text_BoxPrintedWithMonLogo: @ 823BF75 .string "The box is printed with a POKéMON logo.\p" .string "It's a POKéMON brand moving and\n" .string "delivery service.$" diff --git a/data/maps/LittlerootTown/map.json b/data/maps/LittlerootTown/map.json index eaa17a5df..56249cb50 100644 --- a/data/maps/LittlerootTown/map.json +++ b/data/maps/LittlerootTown/map.json @@ -30,7 +30,7 @@ "movement_range_y": 2, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LittlerootTown_EventScript_1E8034", + "script": "LittlerootTown_EventScript_Twin", "flag": "0" }, { @@ -43,7 +43,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LittlerootTown_EventScript_1E8022", + "script": "LittlerootTown_EventScript_FatMan", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN" }, { @@ -56,7 +56,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LittlerootTown_EventScript_1E802B", + "script": "LittlerootTown_EventScript_Boy", "flag": "0" }, { @@ -69,7 +69,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LittlerootTown_EventScript_1E863D", + "script": "LittlerootTown_EventScript_Mom", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE" }, { @@ -156,7 +156,7 @@ "elevation": 3, "var": "VAR_LITTLEROOT_TOWN_STATE", "var_value": "0", - "script": "LittlerootTown_EventScript_1E8091" + "script": "LittlerootTown_EventScript_NeedPokemonTriggerLeft" }, { "type": "trigger", @@ -165,7 +165,7 @@ "elevation": 3, "var": "VAR_LITTLEROOT_TOWN_STATE", "var_value": "0", - "script": "LittlerootTown_EventScript_1E80EF" + "script": "LittlerootTown_EventScript_NeedPokemonTriggerRight" }, { "type": "trigger", @@ -174,7 +174,7 @@ "elevation": 3, "var": "VAR_LITTLEROOT_TOWN_STATE", "var_value": "1", - "script": "LittlerootTown_EventScript_1E811F" + "script": "LittlerootTown_EventScript_GoSaveBirchTrigger" }, { "type": "trigger", @@ -183,7 +183,7 @@ "elevation": 3, "var": "VAR_LITTLEROOT_TOWN_STATE", "var_value": "3", - "script": "LittlerootTown_EventScript_1E81F9" + "script": "LittlerootTown_EventScript_GiveRunningShoesTrigger4" }, { "type": "trigger", @@ -192,7 +192,7 @@ "elevation": 3, "var": "VAR_LITTLEROOT_TOWN_STATE", "var_value": "3", - "script": "LittlerootTown_EventScript_1E8205" + "script": "LittlerootTown_EventScript_GiveRunningShoesTrigger5" }, { "type": "trigger", @@ -201,7 +201,7 @@ "elevation": 3, "var": "VAR_LITTLEROOT_TOWN_STATE", "var_value": "3", - "script": "LittlerootTown_EventScript_1E81E1" + "script": "LittlerootTown_EventScript_GiveRunningShoesTrigger2" }, { "type": "trigger", @@ -210,7 +210,7 @@ "elevation": 3, "var": "VAR_LITTLEROOT_TOWN_STATE", "var_value": "3", - "script": "LittlerootTown_EventScript_1E81ED" + "script": "LittlerootTown_EventScript_GiveRunningShoesTrigger3" }, { "type": "trigger", @@ -219,7 +219,7 @@ "elevation": 3, "var": "VAR_LITTLEROOT_TOWN_STATE", "var_value": "3", - "script": "LittlerootTown_EventScript_1E81BB" + "script": "LittlerootTown_EventScript_GiveRunningShoesTrigger0" }, { "type": "trigger", @@ -228,7 +228,7 @@ "elevation": 3, "var": "VAR_LITTLEROOT_TOWN_STATE", "var_value": "3", - "script": "LittlerootTown_EventScript_1E81CE" + "script": "LittlerootTown_EventScript_GiveRunningShoesTrigger1" } ], "bg_events": [ @@ -238,7 +238,7 @@ "y": 13, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_EventScript_1E8151" + "script": "LittlerootTown_EventScript_TownSign" }, { "type": "sign", @@ -246,7 +246,7 @@ "y": 17, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_EventScript_1E815A" + "script": "LittlerootTown_EventScript_BirchsLabSign" }, { "type": "sign", @@ -254,7 +254,7 @@ "y": 8, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_EventScript_1E8163" + "script": "LittlerootTown_EventScript_BrendansHouseSign" }, { "type": "sign", @@ -262,7 +262,7 @@ "y": 8, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_EventScript_1E818F" + "script": "LittlerootTown_EventScript_MaysHouseSign" } ] } diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc index 8825d1899..cb2589ed2 100644 --- a/data/maps/LittlerootTown/scripts.inc +++ b/data/maps/LittlerootTown/scripts.inc @@ -1,139 +1,169 @@ LittlerootTown_MapScripts:: @ 81E7DCB - map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_MapScript1_1E7DDB - map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_MapScript2_1E7EC1 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_MapScript2_1E7FE2 + map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_OnWarp .byte 0 -LittlerootTown_MapScript1_1E7DDB: @ 81E7DDB + @ State descriptions for VAR_LITTLEROOT_TOWN_STATE + @ 1: Met Rival + @ 2: Saving Birch + @ 3: Received Pokedex + @ 4: Received Running Shoes + + @ State descriptions for VAR_LITTLEROOT_INTRO_STATE + @ 1: In truck male + @ 2: In truck female + @ 3: Entered house + @ 4: Told to go set clock + @ 5: Entered 2F to set clock + @ 6: Set clock + @ 7: Told to go meet rival + + @ State descriptions for VAR_LITTLEROOT_HOUSES_STATE_MAY + @ and VAR_LITTLEROOT_HOUSES_STATE_BRENDAN + @ 1: On Truck (and is corresponding gender) + @ 2: Met Rival's Mom (and is corresponding gender) + @ 3: Entered Hall of Fame + @ 4: Completed Lati TV / SS Ticket event + @ 5: Exited house after above event + + @ State descriptions for VAR_LITTLEROOT_RIVAL_STATE + @ 1: Never occurs + @ 2: Entered Rival's bedroom + @ 3: Met Rival + @ 4: Received Pokedex + + +LittlerootTown_OnTransition: @ 81E7DDB setflag FLAG_VISITED_LITTLEROOT_TOWN call Common_EventScript_SetupRivalGfxId compare VAR_LITTLEROOT_INTRO_STATE, 2 - call_if_eq LittlerootTown_EventScript_1E7E67 - call_if_unset FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_1E7E6F + call_if_eq LittlerootTown_EventScript_MoveMomToMaysDoor + call_if_unset FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_SetTwinPos compare VAR_LITTLEROOT_TOWN_STATE, 3 - call_if_eq LittlerootTown_EventScript_1E7E92 - compare VAR_LITTLEROOT_HOUSES_STATE, 4 - call_if_eq LittlerootTown_EventScript_1E7E5C - compare VAR_LITTLEROOT_HOUSES_STATE_2, 4 - call_if_eq LittlerootTown_EventScript_1E7E5C + call_if_eq LittlerootTown_EventScript_SetMomStandingInFrontOfDoorPos + compare VAR_LITTLEROOT_HOUSES_STATE_MAY, 4 + call_if_eq LittlerootTown_EventScript_SetExitedHouseAfterLatiSSTicketEvent + compare VAR_LITTLEROOT_HOUSES_STATE_BRENDAN, 4 + call_if_eq LittlerootTown_EventScript_SetExitedHouseAfterLatiSSTicketEvent compare VAR_OLDALE_RIVAL_STATE, 1 - call_if_eq LittlerootTown_EventScript_1E7E53 + call_if_eq LittlerootTown_EventScript_MoveRivalFromOldale compare VAR_LITTLEROOT_RIVAL_STATE, 3 - call_if_eq LittlerootTown_EventScript_1E7E4F + call_if_eq LittlerootTown_EventScript_SetRivalLeftForRoute103 compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 1 - call_if_eq LittlerootTown_EventScript_1E7E4B + call_if_eq LittlerootTown_EventScript_HideMapNamePopup compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 2 - call_if_eq LittlerootTown_EventScript_1E7E45 + call_if_eq LittlerootTown_EventScript_LeftLabAfterDexUpgrade end -LittlerootTown_EventScript_1E7E45:: @ 81E7E45 +LittlerootTown_EventScript_LeftLabAfterDexUpgrade:: @ 81E7E45 setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 3 return -LittlerootTown_EventScript_1E7E4B:: @ 81E7E4B +LittlerootTown_EventScript_HideMapNamePopup:: @ 81E7E4B setflag FLAG_HIDE_MAP_NAME_POPUP return -LittlerootTown_EventScript_1E7E4F:: @ 81E7E4F +LittlerootTown_EventScript_SetRivalLeftForRoute103:: @ 81E7E4F setflag FLAG_RIVAL_LEFT_FOR_ROUTE103 return -LittlerootTown_EventScript_1E7E53:: @ 81E7E53 +LittlerootTown_EventScript_MoveRivalFromOldale:: @ 81E7E53 setvar VAR_OLDALE_RIVAL_STATE, 2 setflag FLAG_HIDE_OLDALE_TOWN_RIVAL return -LittlerootTown_EventScript_1E7E5C:: @ 81E7E5C - setvar VAR_LITTLEROOT_HOUSES_STATE, 5 - setvar VAR_LITTLEROOT_HOUSES_STATE_2, 5 +LittlerootTown_EventScript_SetExitedHouseAfterLatiSSTicketEvent:: @ 81E7E5C + setvar VAR_LITTLEROOT_HOUSES_STATE_MAY, 5 + setvar VAR_LITTLEROOT_HOUSES_STATE_BRENDAN, 5 return -LittlerootTown_EventScript_1E7E67:: @ 81E7E67 +LittlerootTown_EventScript_MoveMomToMaysDoor:: @ 81E7E67 setobjectxyperm 4, 14, 8 return -LittlerootTown_EventScript_1E7E6F:: @ 81E7E6F +LittlerootTown_EventScript_SetTwinPos:: @ 81E7E6F compare VAR_LITTLEROOT_TOWN_STATE, 0 - goto_if_eq LittlerootTown_EventScript_1E7E86 + goto_if_eq LittlerootTown_EventScript_SetTwinGuardingRoutePos setobjectxyperm 1, 10, 1 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP return -LittlerootTown_EventScript_1E7E86:: @ 81E7E86 +LittlerootTown_EventScript_SetTwinGuardingRoutePos:: @ 81E7E86 setobjectxyperm 1, 7, 2 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN return -LittlerootTown_EventScript_1E7E92:: @ 81E7E92 +LittlerootTown_EventScript_SetMomStandingInFrontOfDoorPos:: @ 81E7E92 clearflag FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE setobjectmovementtype 4, MOVEMENT_TYPE_FACE_DOWN checkplayergender compare VAR_RESULT, MALE - call_if_eq LittlerootTown_EventScript_1E7EB1 + call_if_eq LittlerootTown_EventScript_SetMomInFrontOfDoorMale compare VAR_RESULT, FEMALE - call_if_eq LittlerootTown_EventScript_1E7EB9 + call_if_eq LittlerootTown_EventScript_SetMomInFrontOfDoorFemale return -LittlerootTown_EventScript_1E7EB1:: @ 81E7EB1 +LittlerootTown_EventScript_SetMomInFrontOfDoorMale:: @ 81E7EB1 setobjectxyperm 4, 5, 9 return -LittlerootTown_EventScript_1E7EB9:: @ 81E7EB9 +LittlerootTown_EventScript_SetMomInFrontOfDoorFemale:: @ 81E7EB9 setobjectxyperm 4, 14, 9 return -LittlerootTown_MapScript2_1E7EC1: @ 81E7EC1 - map_script_2 VAR_LITTLEROOT_INTRO_STATE, 1, LittlerootTown_EventScript_1E7EDB - map_script_2 VAR_LITTLEROOT_INTRO_STATE, 2, LittlerootTown_EventScript_1E7EF9 - map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 1, LittlerootTown_EventScript_1E7FB1 +LittlerootTown_OnFrame: @ 81E7EC1 + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 1, LittlerootTown_EventScript_StepOffTruckMale + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 2, LittlerootTown_EventScript_StepOffTruckFemale + map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 1, LittlerootTown_EventScript_BeginDexUpgradeScene .2byte 0 -LittlerootTown_EventScript_1E7EDB:: @ 81E7EDB +LittlerootTown_EventScript_StepOffTruckMale:: @ 81E7EDB lockall setvar VAR_0x8004, 5 setvar VAR_0x8005, 8 - call LittlerootTown_EventScript_1E7F17 + call LittlerootTown_EventScript_GoInsideWithMom setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_TRUCK warpsilent MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F, 255, 8, 8 waitstate releaseall end -LittlerootTown_EventScript_1E7EF9:: @ 81E7EF9 +LittlerootTown_EventScript_StepOffTruckFemale:: @ 81E7EF9 lockall setvar VAR_0x8004, 14 setvar VAR_0x8005, 8 - call LittlerootTown_EventScript_1E7F17 + call LittlerootTown_EventScript_GoInsideWithMom setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_TRUCK warpsilent MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F, 255, 2, 8 waitstate releaseall end -LittlerootTown_EventScript_1E7F17:: @ 81E7F17 +LittlerootTown_EventScript_GoInsideWithMom:: @ 81E7F17 delay 15 playse SE_DANSA - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_1E7FAC + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_PlayerStepOffTruck waitmovement 0 opendoor VAR_0x8004, VAR_0x8005 waitdooranim addobject 4 - applymovement 4, LittlerootTown_Movement_1E7F98 + applymovement 4, LittlerootTown_Movement_MomExitHouse waitmovement 0 closedoor VAR_0x8004, VAR_0x8005 waitdooranim delay 10 - applymovement 4, LittlerootTown_Movement_1E7F9A + applymovement 4, LittlerootTown_Movement_MomApproachPlayerAtTruck waitmovement 0 - msgbox LittlerootTown_Text_1E86BC, MSGBOX_DEFAULT + msgbox LittlerootTown_Text_OurNewHomeLetsGoInside, MSGBOX_DEFAULT closemessage - applymovement 4, LittlerootTown_Movement_1E7F9D - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_1E7FA4 + applymovement 4, LittlerootTown_Movement_MomApproachDoor + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_PlayerApproachDoor waitmovement 0 opendoor VAR_0x8004, VAR_0x8005 waitdooranim - applymovement 4, LittlerootTown_Movement_1E7FA1 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_1E7FA9 + applymovement 4, LittlerootTown_Movement_MomEnterHouse + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_PlayerEnterHouse waitmovement 0 setflag FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE setvar VAR_LITTLEROOT_INTRO_STATE, 3 @@ -144,52 +174,52 @@ LittlerootTown_EventScript_1E7F17:: @ 81E7F17 clearflag FLAG_HIDE_MAP_NAME_POPUP return -LittlerootTown_Movement_1E7F98: @ 81E7F98 +LittlerootTown_Movement_MomExitHouse: @ 81E7F98 walk_down step_end -LittlerootTown_Movement_1E7F9A: @ 81E7F9A +LittlerootTown_Movement_MomApproachPlayerAtTruck: @ 81E7F9A walk_down walk_in_place_fastest_left step_end -LittlerootTown_Movement_1E7F9D: @ 81E7F9D +LittlerootTown_Movement_MomApproachDoor: @ 81E7F9D delay_16 delay_8 walk_up step_end -LittlerootTown_Movement_1E7FA1: @ 81E7FA1 +LittlerootTown_Movement_MomEnterHouse: @ 81E7FA1 walk_up set_invisible step_end -LittlerootTown_Movement_1E7FA4: @ 81E7FA4 +LittlerootTown_Movement_PlayerApproachDoor: @ 81E7FA4 delay_16 delay_8 walk_right walk_in_place_fastest_up step_end -LittlerootTown_Movement_1E7FA9: @ 81E7FA9 +LittlerootTown_Movement_PlayerEnterHouse: @ 81E7FA9 walk_up walk_up step_end -LittlerootTown_Movement_1E7FAC: @ 81E7FAC +LittlerootTown_Movement_PlayerStepOffTruck: @ 81E7FAC jump_right delay_16 delay_16 delay_16 step_end -LittlerootTown_EventScript_1E7FB1:: @ 81E7FB1 +LittlerootTown_EventScript_BeginDexUpgradeScene:: @ 81E7FB1 lockall playse SE_PIN applymovement 8, Common_Movement_ExclamationMark waitmovement 0 delay 80 - msgbox LittlerootTown_Text_1E8DA2, MSGBOX_DEFAULT + msgbox LittlerootTown_Text_BirchSomethingToShowYouAtLab, MSGBOX_DEFAULT closemessage clearflag FLAG_HIDE_LITTLEROOT_TOWN_RIVAL clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCH @@ -200,51 +230,51 @@ LittlerootTown_EventScript_1E7FB1:: @ 81E7FB1 releaseall end -LittlerootTown_MapScript2_1E7FE2: @ 81E7FE2 - map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 1, LittlerootTown_EventScript_1E7FEC +LittlerootTown_OnWarp: @ 81E7FE2 + map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 1, LittlerootTown_EventScript_SetRivalBirchPosForDexUpgrade .2byte 0 -LittlerootTown_EventScript_1E7FEC:: @ 81E7FEC +LittlerootTown_EventScript_SetRivalBirchPosForDexUpgrade:: @ 81E7FEC addobject 8 addobject 7 checkplayergender compare VAR_RESULT, MALE - goto_if_eq LittlerootTown_EventScript_1E8004 - goto LittlerootTown_EventScript_1E8013 + goto_if_eq LittlerootTown_EventScript_SetRivalBirchPosForDexUpgradeMale + goto LittlerootTown_EventScript_SetRivalBirchPosForDexUpgradeFemale end -LittlerootTown_EventScript_1E8004:: @ 81E8004 +LittlerootTown_EventScript_SetRivalBirchPosForDexUpgradeMale:: @ 81E8004 setobjectxy 7, 6, 10 setobjectxy 8, 5, 10 end -LittlerootTown_EventScript_1E8013:: @ 81E8013 +LittlerootTown_EventScript_SetRivalBirchPosForDexUpgradeFemale:: @ 81E8013 setobjectxy 7, 13, 10 setobjectxy 8, 14, 10 end -LittlerootTown_EventScript_1E8022:: @ 81E8022 - msgbox LittlerootTown_Text_1E8ACF, MSGBOX_NPC +LittlerootTown_EventScript_FatMan:: @ 81E8022 + msgbox LittlerootTown_Text_CanUsePCToStoreItems, MSGBOX_NPC end -LittlerootTown_EventScript_1E802B:: @ 81E802B - msgbox LittlerootTown_Text_1E8B25, MSGBOX_NPC +LittlerootTown_EventScript_Boy:: @ 81E802B + msgbox LittlerootTown_Text_BirchSpendsDaysInLab, MSGBOX_NPC end -LittlerootTown_EventScript_1E8034:: @ 81E8034 +LittlerootTown_EventScript_Twin:: @ 81E8034 lock faceplayer - goto_if_set FLAG_ADVENTURE_STARTED, LittlerootTown_EventScript_1E8087 - goto_if_set FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_1E807A + goto_if_set FLAG_ADVENTURE_STARTED, LittlerootTown_EventScript_GoodLuck + goto_if_set FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_YouSavedBirch compare VAR_LITTLEROOT_TOWN_STATE, 0 - goto_if_ne LittlerootTown_EventScript_1E805D - msgbox LittlerootTown_Text_1E8BB8, MSGBOX_DEFAULT + goto_if_ne LittlerootTown_EventScript_GoSaveBirch + msgbox LittlerootTown_Text_IfYouGoInGrassPokemonWillJumpOut, MSGBOX_DEFAULT release end -LittlerootTown_EventScript_1E805D:: @ 81E805D +LittlerootTown_EventScript_GoSaveBirch:: @ 81E805D special GetPlayerBigGuyGirlString - msgbox LittlerootTown_Text_1E8C3A, MSGBOX_DEFAULT + msgbox LittlerootTown_Text_CanYouGoSeeWhatsHappening, MSGBOX_DEFAULT closemessage applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 @@ -252,38 +282,38 @@ LittlerootTown_EventScript_1E805D:: @ 81E805D release end -LittlerootTown_EventScript_1E807A:: @ 81E807A +LittlerootTown_EventScript_YouSavedBirch:: @ 81E807A special GetPlayerBigGuyGirlString - msgbox LittlerootTown_Text_1E8CE3, MSGBOX_DEFAULT + msgbox LittlerootTown_Text_YouSavedBirch, MSGBOX_DEFAULT release end -LittlerootTown_EventScript_1E8087:: @ 81E8087 - msgbox LittlerootTown_Text_1E8D07, MSGBOX_DEFAULT +LittlerootTown_EventScript_GoodLuck:: @ 81E8087 + msgbox LittlerootTown_Text_GoodLuckCatchingPokemon, MSGBOX_DEFAULT release end -LittlerootTown_EventScript_1E8091:: @ 81E8091 +LittlerootTown_EventScript_NeedPokemonTriggerLeft:: @ 81E8091 lockall - applymovement 1, LittlerootTown_Movement_1E80D1 + applymovement 1, LittlerootTown_Movement_TwinApproachPlayerLeft waitmovement 0 - call LittlerootTown_EventScript_1E80AD - applymovement 1, LittlerootTown_Movement_1E80E1 + call LittlerootTown_EventScript_DangerousWithoutPokemon + applymovement 1, LittlerootTown_Movement_TwinReturnLeft waitmovement 0 releaseall end -LittlerootTown_EventScript_1E80AD:: @ 81E80AD - msgbox LittlerootTown_Text_1E8BB8, MSGBOX_DEFAULT +LittlerootTown_EventScript_DangerousWithoutPokemon:: @ 81E80AD + msgbox LittlerootTown_Text_IfYouGoInGrassPokemonWillJumpOut, MSGBOX_DEFAULT closemessage - applymovement 1, LittlerootTown_Movement_1E80DF - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_1E80EB + applymovement 1, LittlerootTown_Movement_TwinPushPlayerFromRoute + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_PushPlayerBackFromRoute waitmovement 0 - msgbox LittlerootTown_Text_1E8C07, MSGBOX_DEFAULT + msgbox LittlerootTown_Text_DangerousIfYouDontHavePokemon, MSGBOX_DEFAULT closemessage return -LittlerootTown_Movement_1E80D1: @ 81E80D1 +LittlerootTown_Movement_TwinApproachPlayerLeft: @ 81E80D1 face_right delay_8 disable_jump_landing_ground_effect @@ -299,11 +329,11 @@ LittlerootTown_Movement_1E80D1: @ 81E80D1 face_down step_end -LittlerootTown_Movement_1E80DF: @ 81E80DF +LittlerootTown_Movement_TwinPushPlayerFromRoute: @ 81E80DF walk_down step_end -LittlerootTown_Movement_1E80E1: @ 81E80E1 +LittlerootTown_Movement_TwinReturnLeft: @ 81E80E1 walk_right walk_down walk_down @@ -315,23 +345,23 @@ LittlerootTown_Movement_1E80E1: @ 81E80E1 walk_in_place_fastest_down step_end -LittlerootTown_Movement_1E80EB: @ 81E80EB +LittlerootTown_Movement_PushPlayerBackFromRoute: @ 81E80EB lock_facing_direction walk_down unlock_facing_direction step_end -LittlerootTown_EventScript_1E80EF:: @ 81E80EF +LittlerootTown_EventScript_NeedPokemonTriggerRight:: @ 81E80EF lockall - applymovement 1, LittlerootTown_Movement_1E810B + applymovement 1, LittlerootTown_Movement_TwinApproachPlayerRight waitmovement 0 - call LittlerootTown_EventScript_1E80AD - applymovement 1, LittlerootTown_Movement_1E8118 + call LittlerootTown_EventScript_DangerousWithoutPokemon + applymovement 1, LittlerootTown_Movement_TwinReturnRight waitmovement 0 releaseall end -LittlerootTown_Movement_1E810B: @ 81E810B +LittlerootTown_Movement_TwinApproachPlayerRight: @ 81E810B face_right delay_8 disable_jump_landing_ground_effect @@ -346,7 +376,7 @@ LittlerootTown_Movement_1E810B: @ 81E810B face_down step_end -LittlerootTown_Movement_1E8118: @ 81E8118 +LittlerootTown_Movement_TwinReturnRight: @ 81E8118 walk_left walk_down walk_left @@ -355,14 +385,14 @@ LittlerootTown_Movement_1E8118: @ 81E8118 walk_in_place_fastest_down step_end -LittlerootTown_EventScript_1E811F:: @ 81E811F +LittlerootTown_EventScript_GoSaveBirchTrigger:: @ 81E811F lockall applymovement 1, Common_Movement_WalkInPlaceFastestRight waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 special GetPlayerBigGuyGirlString - msgbox LittlerootTown_Text_1E8C3A, MSGBOX_DEFAULT + msgbox LittlerootTown_Text_CanYouGoSeeWhatsHappening, MSGBOX_DEFAULT closemessage applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 @@ -370,372 +400,372 @@ LittlerootTown_EventScript_1E811F:: @ 81E811F releaseall end -LittlerootTown_EventScript_1E8151:: @ 81E8151 - msgbox LittlerootTown_Text_1E8D32, MSGBOX_SIGN +LittlerootTown_EventScript_TownSign:: @ 81E8151 + msgbox LittlerootTown_Text_TownSign, MSGBOX_SIGN end -LittlerootTown_EventScript_1E815A:: @ 81E815A - msgbox LittlerootTown_Text_1E8D69, MSGBOX_SIGN +LittlerootTown_EventScript_BirchsLabSign:: @ 81E815A + msgbox LittlerootTown_Text_ProfBirchsLab, MSGBOX_SIGN end -LittlerootTown_EventScript_1E8163:: @ 81E8163 +LittlerootTown_EventScript_BrendansHouseSign:: @ 81E8163 lockall checkplayergender compare VAR_RESULT, MALE - call_if_eq LittlerootTown_EventScript_1E817D + call_if_eq LittlerootTown_EventScript_PlayersHouseSignMale compare VAR_RESULT, FEMALE - call_if_eq LittlerootTown_EventScript_1E8186 + call_if_eq LittlerootTown_EventScript_BirchsHouseSignFemale releaseall end -LittlerootTown_EventScript_1E817D:: @ 81E817D - msgbox LittlerootTown_Text_1E8D83, MSGBOX_DEFAULT +LittlerootTown_EventScript_PlayersHouseSignMale:: @ 81E817D + msgbox LittlerootTown_Text_PlayersHouse, MSGBOX_DEFAULT return -LittlerootTown_EventScript_1E8186:: @ 81E8186 - msgbox LittlerootTown_Text_1E8D8E, MSGBOX_DEFAULT +LittlerootTown_EventScript_BirchsHouseSignFemale:: @ 81E8186 + msgbox LittlerootTown_Text_ProfBirchsHouse, MSGBOX_DEFAULT return -LittlerootTown_EventScript_1E818F:: @ 81E818F +LittlerootTown_EventScript_MaysHouseSign:: @ 81E818F lockall checkplayergender compare VAR_RESULT, MALE - call_if_eq LittlerootTown_EventScript_1E81A9 + call_if_eq LittlerootTown_EventScript_BirchsHouseSignMale compare VAR_RESULT, FEMALE - call_if_eq LittlerootTown_EventScript_1E81B2 + call_if_eq LittlerootTown_EventScript_PlayersHouseSignFemale releaseall end -LittlerootTown_EventScript_1E81A9:: @ 81E81A9 - msgbox LittlerootTown_Text_1E8D8E, MSGBOX_DEFAULT +LittlerootTown_EventScript_BirchsHouseSignMale:: @ 81E81A9 + msgbox LittlerootTown_Text_ProfBirchsHouse, MSGBOX_DEFAULT return -LittlerootTown_EventScript_1E81B2:: @ 81E81B2 - msgbox LittlerootTown_Text_1E8D83, MSGBOX_DEFAULT +LittlerootTown_EventScript_PlayersHouseSignFemale:: @ 81E81B2 + msgbox LittlerootTown_Text_PlayersHouse, MSGBOX_DEFAULT return -LittlerootTown_EventScript_1E81BB:: @ 81E81BB +LittlerootTown_EventScript_GiveRunningShoesTrigger0:: @ 81E81BB lockall setvar VAR_0x8008, 0 setobjectxy 4, 10, 9 - goto LittlerootTown_EventScript_1E8211 + goto LittlerootTown_EventScript_GiveRunningShoesTrigger end -LittlerootTown_EventScript_1E81CE:: @ 81E81CE +LittlerootTown_EventScript_GiveRunningShoesTrigger1:: @ 81E81CE lockall setvar VAR_0x8008, 1 setobjectxy 4, 11, 9 - goto LittlerootTown_EventScript_1E8211 + goto LittlerootTown_EventScript_GiveRunningShoesTrigger end -LittlerootTown_EventScript_1E81E1:: @ 81E81E1 +LittlerootTown_EventScript_GiveRunningShoesTrigger2:: @ 81E81E1 lockall setvar VAR_0x8008, 2 - goto LittlerootTown_EventScript_1E8211 + goto LittlerootTown_EventScript_GiveRunningShoesTrigger end -LittlerootTown_EventScript_1E81ED:: @ 81E81ED +LittlerootTown_EventScript_GiveRunningShoesTrigger3:: @ 81E81ED lockall setvar VAR_0x8008, 3 - goto LittlerootTown_EventScript_1E8211 + goto LittlerootTown_EventScript_GiveRunningShoesTrigger end -LittlerootTown_EventScript_1E81F9:: @ 81E81F9 +LittlerootTown_EventScript_GiveRunningShoesTrigger4:: @ 81E81F9 lockall setvar VAR_0x8008, 4 - goto LittlerootTown_EventScript_1E8211 + goto LittlerootTown_EventScript_GiveRunningShoesTrigger end -LittlerootTown_EventScript_1E8205:: @ 81E8205 +LittlerootTown_EventScript_GiveRunningShoesTrigger5:: @ 81E8205 lockall setvar VAR_0x8008, 5 - goto LittlerootTown_EventScript_1E8211 + goto LittlerootTown_EventScript_GiveRunningShoesTrigger end -LittlerootTown_EventScript_1E8211:: @ 81E8211 +LittlerootTown_EventScript_GiveRunningShoesTrigger:: @ 81E8211 checkplayergender compare VAR_RESULT, MALE - call_if_eq LittlerootTown_EventScript_1E8297 + call_if_eq LittlerootTown_EventScript_MomNoticePlayerMale compare VAR_RESULT, FEMALE - call_if_eq LittlerootTown_EventScript_1E82A2 + call_if_eq LittlerootTown_EventScript_MomNoticePlayerFemale checkplayergender compare VAR_RESULT, MALE - call_if_eq LittlerootTown_EventScript_1E8281 + call_if_eq LittlerootTown_EventScript_SetHomeDoorCoordsMale compare VAR_RESULT, FEMALE - call_if_eq LittlerootTown_EventScript_1E828C - msgbox LittlerootTown_Text_1E87E1, MSGBOX_DEFAULT + call_if_eq LittlerootTown_EventScript_SetHomeDoorCoordsFemale + msgbox LittlerootTown_Text_WaitPlayer, MSGBOX_DEFAULT closemessage checkplayergender compare VAR_RESULT, MALE - call_if_eq LittlerootTown_EventScript_1E82AD + call_if_eq LittlerootTown_EventScript_MomApproachPlayerMale compare VAR_RESULT, FEMALE - call_if_eq LittlerootTown_EventScript_1E82F0 - call LittlerootTown_EventScript_1E8693 + call_if_eq LittlerootTown_EventScript_MomApproachPlayerFemale + call LittlerootTown_EventScript_GiveRunningShoes checkplayergender compare VAR_RESULT, MALE - call_if_eq LittlerootTown_EventScript_1E8405 + call_if_eq LittlerootTown_EventScript_MomReturnHomeMale compare VAR_RESULT, FEMALE - call_if_eq LittlerootTown_EventScript_1E8448 - goto LittlerootTown_EventScript_1E8686 + call_if_eq LittlerootTown_EventScript_MomReturnHomeFemale + goto LittlerootTown_EventScript_SetReceivedRunningShoes end -LittlerootTown_EventScript_1E8281:: @ 81E8281 +LittlerootTown_EventScript_SetHomeDoorCoordsMale:: @ 81E8281 setvar VAR_0x8009, 5 setvar VAR_0x800A, 8 return -LittlerootTown_EventScript_1E828C:: @ 81E828C +LittlerootTown_EventScript_SetHomeDoorCoordsFemale:: @ 81E828C setvar VAR_0x8009, 14 setvar VAR_0x800A, 8 return -LittlerootTown_EventScript_1E8297:: @ 81E8297 +LittlerootTown_EventScript_MomNoticePlayerMale:: @ 81E8297 applymovement 4, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return -LittlerootTown_EventScript_1E82A2:: @ 81E82A2 +LittlerootTown_EventScript_MomNoticePlayerFemale:: @ 81E82A2 applymovement 4, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return -LittlerootTown_EventScript_1E82AD:: @ 81E82AD +LittlerootTown_EventScript_MomApproachPlayerMale:: @ 81E82AD compare VAR_0x8008, 0 - call_if_eq LittlerootTown_EventScript_1E8333 + call_if_eq LittlerootTown_EventScript_MomApproachPlayer0 compare VAR_0x8008, 1 - call_if_eq LittlerootTown_EventScript_1E8348 + call_if_eq LittlerootTown_EventScript_MomApproachPlayer1 compare VAR_0x8008, 2 - call_if_eq LittlerootTown_EventScript_1E835D + call_if_eq LittlerootTown_EventScript_MomApproachPlayerMale2 compare VAR_0x8008, 3 - call_if_eq LittlerootTown_EventScript_1E8372 + call_if_eq LittlerootTown_EventScript_MomApproachPlayerMale3 compare VAR_0x8008, 4 - call_if_eq LittlerootTown_EventScript_1E8387 + call_if_eq LittlerootTown_EventScript_MomApproachPlayerMale4 compare VAR_0x8008, 5 - call_if_eq LittlerootTown_EventScript_1E839C + call_if_eq LittlerootTown_EventScript_MomApproachPlayerMale5 return -LittlerootTown_EventScript_1E82F0:: @ 81E82F0 +LittlerootTown_EventScript_MomApproachPlayerFemale:: @ 81E82F0 compare VAR_0x8008, 0 - call_if_eq LittlerootTown_EventScript_1E8333 + call_if_eq LittlerootTown_EventScript_MomApproachPlayer0 compare VAR_0x8008, 1 - call_if_eq LittlerootTown_EventScript_1E8348 + call_if_eq LittlerootTown_EventScript_MomApproachPlayer1 compare VAR_0x8008, 2 - call_if_eq LittlerootTown_EventScript_1E83B1 + call_if_eq LittlerootTown_EventScript_MomApproachPlayerFemale2 compare VAR_0x8008, 3 - call_if_eq LittlerootTown_EventScript_1E83C6 + call_if_eq LittlerootTown_EventScript_MomApproachPlayerFemale3 compare VAR_0x8008, 4 - call_if_eq LittlerootTown_EventScript_1E83DB + call_if_eq LittlerootTown_EventScript_MomApproachPlayerFemale4 compare VAR_0x8008, 5 - call_if_eq LittlerootTown_EventScript_1E83F0 + call_if_eq LittlerootTown_EventScript_MomApproachPlayerFemale5 return -LittlerootTown_EventScript_1E8333:: @ 81E8333 +LittlerootTown_EventScript_MomApproachPlayer0:: @ 81E8333 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 - applymovement 4, LittlerootTown_Movement_1E85D1 + applymovement 4, LittlerootTown_Movement_MomApproachPlayer0 waitmovement 0 return -LittlerootTown_EventScript_1E8348:: @ 81E8348 +LittlerootTown_EventScript_MomApproachPlayer1:: @ 81E8348 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 - applymovement 4, LittlerootTown_Movement_1E85D8 + applymovement 4, LittlerootTown_Movement_MomApproachPlayer1 waitmovement 0 return -LittlerootTown_EventScript_1E835D:: @ 81E835D +LittlerootTown_EventScript_MomApproachPlayerMale2:: @ 81E835D applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - applymovement 4, LittlerootTown_Movement_1E85DF + applymovement 4, LittlerootTown_Movement_MomApproachPlayerMale2 waitmovement 0 return -LittlerootTown_EventScript_1E8372:: @ 81E8372 +LittlerootTown_EventScript_MomApproachPlayerMale3:: @ 81E8372 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - applymovement 4, LittlerootTown_Movement_1E85E4 + applymovement 4, LittlerootTown_Movement_MomApproachPlayerMale3 waitmovement 0 return -LittlerootTown_EventScript_1E8387:: @ 81E8387 +LittlerootTown_EventScript_MomApproachPlayerMale4:: @ 81E8387 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - applymovement 4, LittlerootTown_Movement_1E85EA + applymovement 4, LittlerootTown_Movement_MomApproachPlayerMale4 waitmovement 0 return -LittlerootTown_EventScript_1E839C:: @ 81E839C +LittlerootTown_EventScript_MomApproachPlayerMale5:: @ 81E839C applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - applymovement 4, LittlerootTown_Movement_1E85ED + applymovement 4, LittlerootTown_Movement_MomApproachPlayerMale5 waitmovement 0 return -LittlerootTown_EventScript_1E83B1:: @ 81E83B1 +LittlerootTown_EventScript_MomApproachPlayerFemale2:: @ 81E83B1 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - applymovement 4, LittlerootTown_Movement_1E85F1 + applymovement 4, LittlerootTown_Movement_MomApproachPlayerFemale2 waitmovement 0 return -LittlerootTown_EventScript_1E83C6:: @ 81E83C6 +LittlerootTown_EventScript_MomApproachPlayerFemale3:: @ 81E83C6 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - applymovement 4, LittlerootTown_Movement_1E85F5 + applymovement 4, LittlerootTown_Movement_MomApproachPlayerFemale3 waitmovement 0 return -LittlerootTown_EventScript_1E83DB:: @ 81E83DB +LittlerootTown_EventScript_MomApproachPlayerFemale4:: @ 81E83DB applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - applymovement 4, LittlerootTown_Movement_1E85F8 + applymovement 4, LittlerootTown_Movement_MomApproachPlayerFemale4 waitmovement 0 return -LittlerootTown_EventScript_1E83F0:: @ 81E83F0 +LittlerootTown_EventScript_MomApproachPlayerFemale5:: @ 81E83F0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - applymovement 4, LittlerootTown_Movement_1E85FE + applymovement 4, LittlerootTown_Movement_MomApproachPlayerFemale5 waitmovement 0 return -LittlerootTown_EventScript_1E8405:: @ 81E8405 +LittlerootTown_EventScript_MomReturnHomeMale:: @ 81E8405 compare VAR_0x8008, 0 - call_if_eq LittlerootTown_EventScript_1E848B + call_if_eq LittlerootTown_EventScript_MomReturnHome0 compare VAR_0x8008, 1 - call_if_eq LittlerootTown_EventScript_1E8496 + call_if_eq LittlerootTown_EventScript_MomReturnHome1 compare VAR_0x8008, 2 - call_if_eq LittlerootTown_EventScript_1E84A1 + call_if_eq LittlerootTown_EventScript_MomReturnHomeMale2 compare VAR_0x8008, 3 - call_if_eq LittlerootTown_EventScript_1E84C7 + call_if_eq LittlerootTown_EventScript_MomReturnHomeMale3 compare VAR_0x8008, 4 - call_if_eq LittlerootTown_EventScript_1E84ED + call_if_eq LittlerootTown_EventScript_MomReturnHomeMale4 compare VAR_0x8008, 5 - call_if_eq LittlerootTown_EventScript_1E8513 + call_if_eq LittlerootTown_EventScript_MomReturnHomeMale5 return -LittlerootTown_EventScript_1E8448:: @ 81E8448 +LittlerootTown_EventScript_MomReturnHomeFemale:: @ 81E8448 compare VAR_0x8008, 0 - call_if_eq LittlerootTown_EventScript_1E848B + call_if_eq LittlerootTown_EventScript_MomReturnHome0 compare VAR_0x8008, 1 - call_if_eq LittlerootTown_EventScript_1E8496 + call_if_eq LittlerootTown_EventScript_MomReturnHome1 compare VAR_0x8008, 2 - call_if_eq LittlerootTown_EventScript_1E8539 + call_if_eq LittlerootTown_EventScript_MomReturnHomeFemale2 compare VAR_0x8008, 3 - call_if_eq LittlerootTown_EventScript_1E855F + call_if_eq LittlerootTown_EventScript_MomReturnHomeFemale3 compare VAR_0x8008, 4 - call_if_eq LittlerootTown_EventScript_1E8585 + call_if_eq LittlerootTown_EventScript_MomReturnHomeFemale4 compare VAR_0x8008, 5 - call_if_eq LittlerootTown_EventScript_1E85AB + call_if_eq LittlerootTown_EventScript_MomReturnHomeFemale5 return -LittlerootTown_EventScript_1E848B:: @ 81E848B - applymovement 4, LittlerootTown_Movement_1E8603 +LittlerootTown_EventScript_MomReturnHome0:: @ 81E848B + applymovement 4, LittlerootTown_Movement_MomReturnHome0 waitmovement 0 return -LittlerootTown_EventScript_1E8496:: @ 81E8496 - applymovement 4, LittlerootTown_Movement_1E8609 +LittlerootTown_EventScript_MomReturnHome1:: @ 81E8496 + applymovement 4, LittlerootTown_Movement_MomReturnHome1 waitmovement 0 return -LittlerootTown_EventScript_1E84A1:: @ 81E84A1 - applymovement 4, LittlerootTown_Movement_1E860F +LittlerootTown_EventScript_MomReturnHomeMale2:: @ 81E84A1 + applymovement 4, LittlerootTown_Movement_MomReturnHomeMale2 waitmovement 0 opendoor VAR_0x8009, VAR_0x800A waitdooranim - applymovement 4, LittlerootTown_Movement_1E863B + applymovement 4, LittlerootTown_Movement_MomExitThroughDoor waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim return -LittlerootTown_EventScript_1E84C7:: @ 81E84C7 - applymovement 4, LittlerootTown_Movement_1E8615 +LittlerootTown_EventScript_MomReturnHomeMale3:: @ 81E84C7 + applymovement 4, LittlerootTown_Movement_MomReturnHomeMale3 waitmovement 0 opendoor VAR_0x8009, VAR_0x800A waitdooranim - applymovement 4, LittlerootTown_Movement_1E863B + applymovement 4, LittlerootTown_Movement_MomExitThroughDoor waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim return -LittlerootTown_EventScript_1E84ED:: @ 81E84ED - applymovement 4, LittlerootTown_Movement_1E861C +LittlerootTown_EventScript_MomReturnHomeMale4:: @ 81E84ED + applymovement 4, LittlerootTown_Movement_MomReturnHomeMale4 waitmovement 0 opendoor VAR_0x8009, VAR_0x800A waitdooranim - applymovement 4, LittlerootTown_Movement_1E863B + applymovement 4, LittlerootTown_Movement_MomExitThroughDoor waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim return -LittlerootTown_EventScript_1E8513:: @ 81E8513 - applymovement 4, LittlerootTown_Movement_1E8620 +LittlerootTown_EventScript_MomReturnHomeMale5:: @ 81E8513 + applymovement 4, LittlerootTown_Movement_MomReturnHomeMale5 waitmovement 0 opendoor VAR_0x8009, VAR_0x800A waitdooranim - applymovement 4, LittlerootTown_Movement_1E863B + applymovement 4, LittlerootTown_Movement_MomExitThroughDoor waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim return -LittlerootTown_EventScript_1E8539:: @ 81E8539 - applymovement 4, LittlerootTown_Movement_1E8625 +LittlerootTown_EventScript_MomReturnHomeFemale2:: @ 81E8539 + applymovement 4, LittlerootTown_Movement_MomReturnHomeFemale2 waitmovement 0 opendoor VAR_0x8009, VAR_0x800A waitdooranim - applymovement 4, LittlerootTown_Movement_1E863B + applymovement 4, LittlerootTown_Movement_MomExitThroughDoor waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim return -LittlerootTown_EventScript_1E855F:: @ 81E855F - applymovement 4, LittlerootTown_Movement_1E862A +LittlerootTown_EventScript_MomReturnHomeFemale3:: @ 81E855F + applymovement 4, LittlerootTown_Movement_MomReturnHomeFemale3 waitmovement 0 opendoor VAR_0x8009, VAR_0x800A waitdooranim - applymovement 4, LittlerootTown_Movement_1E863B + applymovement 4, LittlerootTown_Movement_MomExitThroughDoor waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim return -LittlerootTown_EventScript_1E8585:: @ 81E8585 - applymovement 4, LittlerootTown_Movement_1E862E +LittlerootTown_EventScript_MomReturnHomeFemale4:: @ 81E8585 + applymovement 4, LittlerootTown_Movement_MomReturnHomeFemale4 waitmovement 0 opendoor VAR_0x8009, VAR_0x800A waitdooranim - applymovement 4, LittlerootTown_Movement_1E863B + applymovement 4, LittlerootTown_Movement_MomExitThroughDoor waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim return -LittlerootTown_EventScript_1E85AB:: @ 81E85AB - applymovement 4, LittlerootTown_Movement_1E8635 +LittlerootTown_EventScript_MomReturnHomeFemale5:: @ 81E85AB + applymovement 4, LittlerootTown_Movement_MomReturnHomeFemale5 waitmovement 0 opendoor VAR_0x8009, VAR_0x800A waitdooranim - applymovement 4, LittlerootTown_Movement_1E863B + applymovement 4, LittlerootTown_Movement_MomExitThroughDoor waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim return -LittlerootTown_Movement_1E85D1: @ 81E85D1 +LittlerootTown_Movement_MomApproachPlayer0: @ 81E85D1 walk_up walk_up walk_up @@ -744,7 +774,7 @@ LittlerootTown_Movement_1E85D1: @ 81E85D1 walk_up step_end -LittlerootTown_Movement_1E85D8: @ 81E85D8 +LittlerootTown_Movement_MomApproachPlayer1: @ 81E85D8 walk_up walk_up walk_up @@ -753,14 +783,14 @@ LittlerootTown_Movement_1E85D8: @ 81E85D8 walk_up step_end -LittlerootTown_Movement_1E85DF: @ 81E85DF +LittlerootTown_Movement_MomApproachPlayerMale2: @ 81E85DF walk_right walk_right walk_right walk_right step_end -LittlerootTown_Movement_1E85E4: @ 81E85E4 +LittlerootTown_Movement_MomApproachPlayerMale3: @ 81E85E4 walk_right walk_right walk_right @@ -768,29 +798,29 @@ LittlerootTown_Movement_1E85E4: @ 81E85E4 walk_right step_end -LittlerootTown_Movement_1E85EA: @ 81E85EA +LittlerootTown_Movement_MomApproachPlayerMale4: @ 81E85EA walk_right walk_right step_end -LittlerootTown_Movement_1E85ED: @ 81E85ED +LittlerootTown_Movement_MomApproachPlayerMale5: @ 81E85ED walk_right walk_right walk_right step_end -LittlerootTown_Movement_1E85F1: @ 81E85F1 +LittlerootTown_Movement_MomApproachPlayerFemale2: @ 81E85F1 walk_left walk_left walk_left step_end -LittlerootTown_Movement_1E85F5: @ 81E85F5 +LittlerootTown_Movement_MomApproachPlayerFemale3: @ 81E85F5 walk_left walk_left step_end -LittlerootTown_Movement_1E85F8: @ 81E85F8 +LittlerootTown_Movement_MomApproachPlayerFemale4: @ 81E85F8 walk_left walk_left walk_left @@ -798,14 +828,14 @@ LittlerootTown_Movement_1E85F8: @ 81E85F8 walk_left step_end -LittlerootTown_Movement_1E85FE: @ 81E85FE +LittlerootTown_Movement_MomApproachPlayerFemale5: @ 81E85FE walk_left walk_left walk_left walk_left step_end -LittlerootTown_Movement_1E8603: @ 81E8603 +LittlerootTown_Movement_MomReturnHome0: @ 81E8603 walk_down walk_down walk_down @@ -813,7 +843,7 @@ LittlerootTown_Movement_1E8603: @ 81E8603 walk_down step_end -LittlerootTown_Movement_1E8609: @ 81E8609 +LittlerootTown_Movement_MomReturnHome1: @ 81E8609 walk_down walk_down walk_down @@ -821,7 +851,7 @@ LittlerootTown_Movement_1E8609: @ 81E8609 walk_down step_end -LittlerootTown_Movement_1E860F: @ 81E860F +LittlerootTown_Movement_MomReturnHomeMale2: @ 81E860F walk_left walk_left walk_left @@ -829,7 +859,7 @@ LittlerootTown_Movement_1E860F: @ 81E860F walk_in_place_fastest_up step_end -LittlerootTown_Movement_1E8615: @ 81E8615 +LittlerootTown_Movement_MomReturnHomeMale3: @ 81E8615 walk_left walk_left walk_left @@ -838,33 +868,33 @@ LittlerootTown_Movement_1E8615: @ 81E8615 walk_in_place_fastest_up step_end -LittlerootTown_Movement_1E861C: @ 81E861C +LittlerootTown_Movement_MomReturnHomeMale4: @ 81E861C walk_left walk_left walk_in_place_fastest_up step_end -LittlerootTown_Movement_1E8620: @ 81E8620 +LittlerootTown_Movement_MomReturnHomeMale5: @ 81E8620 walk_left walk_left walk_left walk_in_place_fastest_up step_end -LittlerootTown_Movement_1E8625: @ 81E8625 +LittlerootTown_Movement_MomReturnHomeFemale2: @ 81E8625 walk_right walk_right walk_right walk_in_place_fastest_up step_end -LittlerootTown_Movement_1E862A: @ 81E862A +LittlerootTown_Movement_MomReturnHomeFemale3: @ 81E862A walk_right walk_right walk_in_place_fastest_up step_end -LittlerootTown_Movement_1E862E: @ 81E862E +LittlerootTown_Movement_MomReturnHomeFemale4: @ 81E862E walk_right walk_right walk_right @@ -873,7 +903,7 @@ LittlerootTown_Movement_1E862E: @ 81E862E walk_in_place_fastest_up step_end -LittlerootTown_Movement_1E8635: @ 81E8635 +LittlerootTown_Movement_MomReturnHomeFemale5: @ 81E8635 walk_right walk_right walk_right @@ -881,51 +911,51 @@ LittlerootTown_Movement_1E8635: @ 81E8635 walk_in_place_fastest_up step_end -LittlerootTown_Movement_1E863B: @ 81E863B +LittlerootTown_Movement_MomExitThroughDoor: @ 81E863B walk_up step_end -LittlerootTown_EventScript_1E863D:: @ 81E863D +LittlerootTown_EventScript_Mom:: @ 81E863D lock faceplayer checkplayergender compare VAR_RESULT, MALE - call_if_eq LittlerootTown_EventScript_1E8281 + call_if_eq LittlerootTown_EventScript_SetHomeDoorCoordsMale compare VAR_RESULT, FEMALE - call_if_eq LittlerootTown_EventScript_1E828C - call LittlerootTown_EventScript_1E8693 + call_if_eq LittlerootTown_EventScript_SetHomeDoorCoordsFemale + call LittlerootTown_EventScript_GiveRunningShoes applymovement 4, Common_Movement_WalkInPlaceFastestUp waitmovement 0 opendoor VAR_0x8009, VAR_0x800A waitdooranim - applymovement 4, LittlerootTown_Movement_1E863B + applymovement 4, LittlerootTown_Movement_MomExitThroughDoor waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim - goto LittlerootTown_EventScript_1E8686 + goto LittlerootTown_EventScript_SetReceivedRunningShoes end -LittlerootTown_EventScript_1E8686:: @ 81E8686 +LittlerootTown_EventScript_SetReceivedRunningShoes:: @ 81E8686 removeobject 4 setflag FLAG_SYS_B_DASH setvar VAR_LITTLEROOT_TOWN_STATE, 4 release end -LittlerootTown_EventScript_1E8693:: @ 81E8693 - msgbox LittlerootTown_Text_1E87F0, MSGBOX_DEFAULT +LittlerootTown_EventScript_GiveRunningShoes:: @ 81E8693 + msgbox LittlerootTown_Text_WearTheseRunningShoes, MSGBOX_DEFAULT playfanfare MUS_FANFA4 - message LittlerootTown_Text_1E8925 + message LittlerootTown_Text_SwitchShoesWithRunningShoes waitfanfare setflag FLAG_RECEIVED_RUNNING_SHOES - msgbox LittlerootTown_Text_1E894F, MSGBOX_DEFAULT - msgbox LittlerootTown_Text_1E8A03, MSGBOX_DEFAULT + msgbox LittlerootTown_Text_ExplainRunningShoes, MSGBOX_DEFAULT + msgbox LittlerootTown_Text_ComeHomeIfAnythingHappens, MSGBOX_DEFAULT closemessage delay 30 return -LittlerootTown_Text_1E86BC: @ 81E86BC +LittlerootTown_Text_OurNewHomeLetsGoInside: @ 81E86BC .string "MOM: {PLAYER}, we're here, honey!\p" .string "It must be tiring riding with our things\n" .string "in the moving truck.\p" @@ -937,10 +967,10 @@ LittlerootTown_Text_1E86BC: @ 81E86BC .string "And, you get your own room, {PLAYER}!\n" .string "Let's go inside.$" -LittlerootTown_Text_1E87E1: @ 81E87E1 +LittlerootTown_Text_WaitPlayer: @ 81E87E1 .string "MOM: Wait, {PLAYER}!$" -LittlerootTown_Text_1E87F0: @ 81E87F0 +LittlerootTown_Text_WearTheseRunningShoes: @ 81E87F0 .string "MOM: {PLAYER}! {PLAYER}! Did you\n" .string "introduce yourself to PROF. BIRCH?\p" .string "Oh! What an adorable POKéMON!\n" @@ -951,11 +981,11 @@ LittlerootTown_Text_1E87F0: @ 81E87F0 .string "adventure, wear these RUNNING SHOES.\p" .string "They'll put a zip in your step!$" -LittlerootTown_Text_1E8925: @ 81E8925 +LittlerootTown_Text_SwitchShoesWithRunningShoes: @ 81E8925 .string "{PLAYER} switched shoes with the\n" .string "RUNNING SHOES.$" -LittlerootTown_Text_1E894F: @ 81E894F +LittlerootTown_Text_ExplainRunningShoes: @ 81E894F .string "MOM: {PLAYER}, those shoes came with\n" .string "instructions.\p" .string "“Press the B Button while wearing these\n" @@ -963,7 +993,7 @@ LittlerootTown_Text_1E894F: @ 81E894F .string "“Slip on these RUNNING SHOES and race\n" .string "in the great outdoors!”$" -LittlerootTown_Text_1E8A03: @ 81E8A03 +LittlerootTown_Text_ComeHomeIfAnythingHappens: @ 81E8A03 .string "… … … … … … … …\n" .string "… … … … … … … …\p" .string "To think that you have your very own\n" @@ -973,28 +1003,28 @@ LittlerootTown_Text_1E8A03: @ 81E8A03 .string "If anything happens, you can come home.\p" .string "Go on, go get them, honey!$" -LittlerootTown_Text_1E8ACF: @ 81E8ACF +LittlerootTown_Text_CanUsePCToStoreItems: @ 81E8ACF .string "If you use a PC, you can store items\n" .string "and POKéMON.\p" .string "The power of science is staggering!$" -LittlerootTown_Text_1E8B25: @ 81E8B25 +LittlerootTown_Text_BirchSpendsDaysInLab: @ 81E8B25 .string "PROF. BIRCH spends days in his LAB\n" .string "studying, then he'll suddenly go out in\l" .string "the wild to do more research…\p" .string "When does PROF. BIRCH spend time\n" .string "at home?$" -LittlerootTown_Text_1E8BB8: @ 81E8BB8 +LittlerootTown_Text_IfYouGoInGrassPokemonWillJumpOut: @ 81E8BB8 .string "Um, um, um!\p" .string "If you go outside and go in the grass,\n" .string "wild POKéMON will jump out!$" -LittlerootTown_Text_1E8C07: @ 81E8C07 +LittlerootTown_Text_DangerousIfYouDontHavePokemon: @ 81E8C07 .string "It's dangerous if you don't have\n" .string "your own POKéMON.$" -LittlerootTown_Text_1E8C3A: @ 81E8C3A +LittlerootTown_Text_CanYouGoSeeWhatsHappening: @ 81E8C3A .string "Um, hi!\p" .string "There are scary POKéMON outside!\n" .string "I can hear their cries!\p" @@ -1003,28 +1033,28 @@ LittlerootTown_Text_1E8C3A: @ 81E8C3A .string "Can you go see what's happening\n" .string "for me?$" -LittlerootTown_Text_1E8CE3: @ 81E8CE3 +LittlerootTown_Text_YouSavedBirch: @ 81E8CE3 .string "You saved PROF. BIRCH!\n" .string "I'm so glad!$" -LittlerootTown_Text_1E8D07: @ 81E8D07 +LittlerootTown_Text_GoodLuckCatchingPokemon: @ 81E8D07 .string "Are you going to catch POKéMON?\n" .string "Good luck!$" -LittlerootTown_Text_1E8D32: @ 81E8D32 +LittlerootTown_Text_TownSign: @ 81E8D32 .string "LITTLEROOT TOWN\n" .string "“A town that can't be shaded any hue.”$" -LittlerootTown_Text_1E8D69: @ 81E8D69 +LittlerootTown_Text_ProfBirchsLab: @ 81E8D69 .string "PROF. BIRCH'S POKéMON LAB$" -LittlerootTown_Text_1E8D83: @ 81E8D83 +LittlerootTown_Text_PlayersHouse: @ 81E8D83 .string "{PLAYER}'s HOUSE$" -LittlerootTown_Text_1E8D8E: @ 81E8D8E +LittlerootTown_Text_ProfBirchsHouse: @ 81E8D8E .string "PROF. BIRCH'S HOUSE$" -LittlerootTown_Text_1E8DA2: @ 81E8DA2 +LittlerootTown_Text_BirchSomethingToShowYouAtLab: @ 81E8DA2 .string "PROF. BIRCH: Well, well, {PLAYER}{KUN}!\n" .string "That was good work out there!\p" .string "I knew there was something special\n" diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc index 59c173cf9..ee8d67cd9 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc @@ -50,12 +50,13 @@ LittlerootTown_BrendansHouse_1F_EventScript_MoveMomToDoor:: @ 81F77DE return @ Many of the below scripts have no gender check because they assume youre in the correct house +@ The below SS Ticket script uses Mays house state by accident(?), but theyre both set identically after the intro LittlerootTown_BrendansHouse_1F_OnFrame: @ 81F77EA map_script_2 VAR_LITTLEROOT_INTRO_STATE, 3, LittlerootTown_BrendansHouse_1F_EventScript_EnterHouseMovingIn map_script_2 VAR_LITTLEROOT_INTRO_STATE, 5, LittlerootTown_BrendansHouse_1F_EventScript_GoUpstairsToSetClock map_script_2 VAR_LITTLEROOT_INTRO_STATE, 6, LittlerootTown_BrendansHouse_1F_EventScript_PetalburgGymReport - map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 1, LittlerootTown_BrendansHouse_1F_EventScript_YoureNewNeighbor - map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 3, PlayersHouse_1F_EventScript_GetSSTicketAndSeeLatiTV + map_script_2 VAR_LITTLEROOT_HOUSES_STATE_MAY, 1, LittlerootTown_BrendansHouse_1F_EventScript_YoureNewNeighbor + map_script_2 VAR_LITTLEROOT_HOUSES_STATE_MAY, 3, PlayersHouse_1F_EventScript_GetSSTicketAndSeeLatiTV .2byte 0 LittlerootTown_BrendansHouse_1F_EventScript_GoUpstairsToSetClock:: @ 81F7814 @@ -101,7 +102,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_YoureNewNeighbor:: @ 81F785E special GetRivalSonDaughterString msgbox RivalsHouse_1F_Text_OhYoureTheNewNeighbor, MSGBOX_DEFAULT setflag FLAG_MET_RIVAL_MOM - setvar VAR_LITTLEROOT_HOUSES_STATE, 2 + setvar VAR_LITTLEROOT_HOUSES_STATE_MAY, 2 releaseall end diff --git a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc index 55736f652..f016031df 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc @@ -54,8 +54,8 @@ LittlerootTown_MaysHouse_1F_OnFrame: @ 81F893A map_script_2 VAR_LITTLEROOT_INTRO_STATE, 3, LittlerootTown_MaysHouse_1F_EventScript_EnterHouseMovingIn map_script_2 VAR_LITTLEROOT_INTRO_STATE, 5, LittlerootTown_MaysHouse_1F_EventScript_GoUpstairsToSetClock map_script_2 VAR_LITTLEROOT_INTRO_STATE, 6, LittlerootTown_MaysHouse_1F_EventScript_PetalburgGymReport - map_script_2 VAR_LITTLEROOT_HOUSES_STATE_2, 1, LittlerootTown_MaysHouse_1F_EventScript_YoureNewNeighbor - map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 3, PlayersHouse_1F_EventScript_GetSSTicketAndSeeLatiTV + map_script_2 VAR_LITTLEROOT_HOUSES_STATE_BRENDAN, 1, LittlerootTown_MaysHouse_1F_EventScript_YoureNewNeighbor + map_script_2 VAR_LITTLEROOT_HOUSES_STATE_MAY, 3, PlayersHouse_1F_EventScript_GetSSTicketAndSeeLatiTV .2byte 0 LittlerootTown_MaysHouse_1F_EventScript_GoUpstairsToSetClock:: @ 81F8964 @@ -101,7 +101,7 @@ LittlerootTown_MaysHouse_1F_EventScript_YoureNewNeighbor:: @ 81F89AE special GetRivalSonDaughterString msgbox RivalsHouse_1F_Text_OhYoureTheNewNeighbor, MSGBOX_DEFAULT setflag FLAG_MET_RIVAL_MOM - setvar VAR_LITTLEROOT_HOUSES_STATE_2, 2 + setvar VAR_LITTLEROOT_HOUSES_STATE_BRENDAN, 2 releaseall end diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/map.json b/data/maps/LittlerootTown_ProfessorBirchsLab/map.json index 25ec2e745..7aadfe03a 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/map.json +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Aide", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Birch", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Rival", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Cyndaquil", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CYNDAQUIL" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Totodile", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_TOTODILE" }, { @@ -89,7 +89,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA023", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Chikorita", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CHIKORITA" } ], @@ -117,7 +117,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3" + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Machine" }, { "type": "sign", @@ -125,7 +125,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3" + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Machine" }, { "type": "sign", @@ -133,7 +133,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4CD" + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Book" }, { "type": "sign", @@ -141,7 +141,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4CD" + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Book" }, { "type": "sign", @@ -149,7 +149,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4" + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Bookshelf" }, { "type": "sign", @@ -157,7 +157,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4" + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Bookshelf" }, { "type": "sign", @@ -165,7 +165,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4" + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Bookshelf" }, { "type": "sign", @@ -173,7 +173,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4" + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Bookshelf" }, { "type": "sign", @@ -181,7 +181,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4" + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Bookshelf" }, { "type": "sign", @@ -189,7 +189,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB" + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_PC" }, { "type": "sign", @@ -197,7 +197,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB" + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_PC" }, { "type": "sign", @@ -205,7 +205,7 @@ "y": 10, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB" + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_PC" }, { "type": "sign", @@ -213,7 +213,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB" + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_PC" }, { "type": "sign", @@ -221,7 +221,7 @@ "y": 10, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB" + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_PC" }, { "type": "sign", @@ -229,7 +229,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB" + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_PC" } ] } \ No newline at end of file diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index bdf05dd92..ce7ebf3b6 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -1,57 +1,72 @@ LittlerootTown_ProfessorBirchsLab_MapScripts:: @ 81F9C91 - map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_ProfessorBirchsLab_MapScript1_1F9CA1 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_ProfessorBirchsLab_MapScript2_1F9D06 - map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_ProfessorBirchsLab_MapScript2_1F9DB9 + map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_ProfessorBirchsLab_OnTransition + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_ProfessorBirchsLab_OnWarp + map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_ProfessorBirchsLab_OnFrame .byte 0 -LittlerootTown_ProfessorBirchsLab_MapScript1_1F9CA1: @ 81F9CA1 + @ State descriptions for VAR_DEX_UPGRADE_JOHTO_STARTER_STATE + @ 1: Beat Elite Four, Dex upgrade ready + @ 2: Received National Dex + @ 3: Left lab after receiving National Dex + @ 4: Entered lab after catching all Hoenn mons + @ 5: Birch told player to choose Johto starter + @ 6: Chose Johto starter + + @ State descriptions for VAR_BIRCH_LAB_STATE + @ 1: Never occurs + @ 2: Chose starter + @ 3: Received starter in lab + @ 4: Defeated rival on Route 103 + @ 5: Received pokedex + +LittlerootTown_ProfessorBirchsLab_OnTransition: @ 81F9CA1 call Common_EventScript_SetupRivalGfxId call ProfBirch_EventScript_UpdateLocation compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6 - goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF7 + goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_SetAfterJohtoStarterLayout compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 4 - goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF3 + goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_SetJohtoStarterLayout compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 3 - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9CCD + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_CheckReadyForJohtoStarter end -LittlerootTown_ProfessorBirchsLab_EventScript_1F9CCD:: @ 81F9CCD +LittlerootTown_ProfessorBirchsLab_EventScript_CheckReadyForJohtoStarter:: @ 81F9CCD specialvar VAR_RESULT, HasAllHoennMons - compare VAR_RESULT, 1 - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9CE9 + compare VAR_RESULT, TRUE + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_SetReadyForJohtoStarter setobjectmovementtype 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN setobjectxyperm 3, 5, 10 end -LittlerootTown_ProfessorBirchsLab_EventScript_1F9CE9:: @ 81F9CE9 +LittlerootTown_ProfessorBirchsLab_EventScript_SetReadyForJohtoStarter:: @ 81F9CE9 setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 4 - goto LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF3 + goto LittlerootTown_ProfessorBirchsLab_EventScript_SetJohtoStarterLayout -LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF3:: @ 81F9CF3 +LittlerootTown_ProfessorBirchsLab_EventScript_SetJohtoStarterLayout:: @ 81F9CF3 setmaplayoutindex LAYOUT_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB_WITH_TABLE end -LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF7:: @ 81F9CF7 +LittlerootTown_ProfessorBirchsLab_EventScript_SetAfterJohtoStarterLayout:: @ 81F9CF7 setmaplayoutindex LAYOUT_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB_WITH_TABLE setobjectmovementtype 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN setobjectxyperm 3, 5, 10 end -LittlerootTown_ProfessorBirchsLab_MapScript2_1F9D06: @ 81F9D06 - map_script_2 VAR_BIRCH_LAB_STATE, 2, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D40 - map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 1, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D45 - map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 2, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D45 - map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 3, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D71 - map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D71 - map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D75 - map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 5, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D75 +LittlerootTown_ProfessorBirchsLab_OnWarp: @ 81F9D06 + map_script_2 VAR_BIRCH_LAB_STATE, 2, LittlerootTown_ProfessorBirchsLab_EventScript_SetPlayerPosForReceiveStarter + map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 1, LittlerootTown_ProfessorBirchsLab_EventScript_SetObjectPosForDexUpgrade + map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 2, LittlerootTown_ProfessorBirchsLab_EventScript_SetObjectPosForDexUpgrade + map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 3, LittlerootTown_ProfessorBirchsLab_EventScript_AddRivalObject + map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6, LittlerootTown_ProfessorBirchsLab_EventScript_AddRivalObject + map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 4, LittlerootTown_ProfessorBirchsLab_EventScript_SetObjectPosForJohtoStarters + map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 5, LittlerootTown_ProfessorBirchsLab_EventScript_SetObjectPosForJohtoStarters .2byte 0 -LittlerootTown_ProfessorBirchsLab_EventScript_1F9D40:: @ 81F9D40 +LittlerootTown_ProfessorBirchsLab_EventScript_SetPlayerPosForReceiveStarter:: @ 81F9D40 turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH end -LittlerootTown_ProfessorBirchsLab_EventScript_1F9D45:: @ 81F9D45 +LittlerootTown_ProfessorBirchsLab_EventScript_SetObjectPosForDexUpgrade:: @ 81F9D45 turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH addobject 2 addobject 3 @@ -63,11 +78,11 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9D45:: @ 81F9D45 setobjectxy 1, 10, 10 end -LittlerootTown_ProfessorBirchsLab_EventScript_1F9D71:: @ 81F9D71 +LittlerootTown_ProfessorBirchsLab_EventScript_AddRivalObject:: @ 81F9D71 addobject 3 end -LittlerootTown_ProfessorBirchsLab_EventScript_1F9D75:: @ 81F9D75 +LittlerootTown_ProfessorBirchsLab_EventScript_SetObjectPosForJohtoStarters:: @ 81F9D75 addobject 4 addobject 5 addobject 6 @@ -84,64 +99,66 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9D75:: @ 81F9D75 setobjectxy 3, 5, 5 end -LittlerootTown_ProfessorBirchsLab_MapScript2_1F9DB9: @ 81F9DB9 - map_script_2 VAR_BIRCH_LAB_STATE, 2, LittlerootTown_ProfessorBirchsLab_EventScript_1F9DDB - map_script_2 VAR_BIRCH_LAB_STATE, 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9E67 - map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 1, LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80 - map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F62 +LittlerootTown_ProfessorBirchsLab_OnFrame: @ 81F9DB9 + map_script_2 VAR_BIRCH_LAB_STATE, 2, LittlerootTown_ProfessorBirchsLab_EventScript_GiveStarterEvent + map_script_2 VAR_BIRCH_LAB_STATE, 4, LittlerootTown_ProfessorBirchsLab_EventScript_GivePokedexEvent + map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 1, LittlerootTown_ProfessorBirchsLab_EventScript_UpgradeToNationalDex + map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 4, LittlerootTown_ProfessorBirchsLab_EventScript_ChooseJohtoStarter .2byte 0 -LittlerootTown_ProfessorBirchsLab_EventScript_1F9DDB:: @ 81F9DDB +@ The starter is technically given prior to this on Route 101 by special ChooseStarter +@ This is just where the game tells you its yours and lets you nickname it +LittlerootTown_ProfessorBirchsLab_EventScript_GiveStarterEvent:: @ 81F9DDB lockall bufferleadmonspeciesname 0 - message LittlerootTown_ProfessorBirchsLab_Text_1FA74D + message LittlerootTown_ProfessorBirchsLab_Text_LikeYouToHavePokemon waitmessage playfanfare MUS_FANFA4 waitfanfare - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA8B1, MSGBOX_YESNO + msgbox LittlerootTown_ProfessorBirchsLab_Text_WhyNotGiveNicknameToMon, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E07 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_NicknameStarter compare VAR_RESULT, NO - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E17 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_GoSeeRival end -LittlerootTown_ProfessorBirchsLab_EventScript_1F9E07:: @ 81F9E07 +LittlerootTown_ProfessorBirchsLab_EventScript_NicknameStarter:: @ 81F9E07 setvar VAR_0x8004, 0 call Common_EventScript_NameReceivedPartyMon - goto LittlerootTown_ProfessorBirchsLab_EventScript_1F9E17 + goto LittlerootTown_ProfessorBirchsLab_EventScript_GoSeeRival end -LittlerootTown_ProfessorBirchsLab_EventScript_1F9E17:: @ 81F9E17 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA8F6, MSGBOX_YESNO +LittlerootTown_ProfessorBirchsLab_EventScript_GoSeeRival:: @ 81F9E17 + msgbox LittlerootTown_ProfessorBirchsLab_Text_MightBeGoodIdeaToGoSeeRival, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_AgreeToSeeRival compare VAR_RESULT, NO - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E48 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_DeclineSeeingRival end -LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36:: @ 81F9E36 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA9D5, MSGBOX_DEFAULT +LittlerootTown_ProfessorBirchsLab_EventScript_AgreeToSeeRival:: @ 81F9E36 + msgbox LittlerootTown_ProfessorBirchsLab_Text_GetRivalToTeachYou, MSGBOX_DEFAULT clearflag FLAG_HIDE_ROUTE_101_BOY setvar VAR_BIRCH_LAB_STATE, 3 releaseall end -LittlerootTown_ProfessorBirchsLab_EventScript_1F9E48:: @ 81F9E48 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAA35, MSGBOX_YESNO +LittlerootTown_ProfessorBirchsLab_EventScript_DeclineSeeingRival:: @ 81F9E48 + msgbox LittlerootTown_ProfessorBirchsLab_Text_DontBeThatWay, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_AgreeToSeeRival compare VAR_RESULT, NO - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E48 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_DeclineSeeingRival end -LittlerootTown_ProfessorBirchsLab_EventScript_1F9E67:: @ 81F9E67 +LittlerootTown_ProfessorBirchsLab_EventScript_GivePokedexEvent:: @ 81F9E67 lockall - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_1F9E78 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_PlayerEnterLabForPokedex waitmovement 0 - goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA2F8 + goto LittlerootTown_ProfessorBirchsLab_EventScript_GivePokedex end -LittlerootTown_ProfessorBirchsLab_Movement_1F9E78: @ 81F9E78 +LittlerootTown_ProfessorBirchsLab_Movement_PlayerEnterLabForPokedex: @ 81F9E78 walk_up walk_up walk_up @@ -151,12 +168,12 @@ LittlerootTown_ProfessorBirchsLab_Movement_1F9E78: @ 81F9E78 walk_up step_end -LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80 +LittlerootTown_ProfessorBirchsLab_EventScript_UpgradeToNationalDex:: @ 81F9E80 lockall delay 30 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB16D, MSGBOX_DEFAULT + msgbox LittlerootTown_ProfessorBirchsLab_Text_OtherRegionsUpgradeToNational, MSGBOX_DEFAULT closemessage - applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_1F9F46 + applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_BirchRetrievePokedexes waitmovement 0 delay 20 playse SE_TK_KASYA @@ -172,25 +189,25 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80 waitmovement 0 checkplayergender compare VAR_RESULT, MALE - call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9F32 + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_MayUpgradeComment compare VAR_RESULT, FEMALE - call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9F3C + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_BrendanUpgradeComment playse SE_PC_ON waitse delay 20 - applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_1F9F58 + applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_BirchReturnPokedex waitmovement 0 applymovement 3, Common_Movement_WalkInPlaceFastestUp applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB419, MSGBOX_DEFAULT + msgbox LittlerootTown_ProfessorBirchsLab_Text_OkayAllDone, MSGBOX_DEFAULT playfanfare MUS_FANFA4 - message LittlerootTown_ProfessorBirchsLab_Text_1FB436 + message LittlerootTown_ProfessorBirchsLab_Text_PokedexUpgradedToNational waitmessage waitfanfare setflag FLAG_SYS_NATIONAL_DEX special EnableNationalPokedex - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB466, MSGBOX_DEFAULT + msgbox LittlerootTown_ProfessorBirchsLab_Text_GrassyPatchWaiting2, MSGBOX_DEFAULT closemessage setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCH setflag FLAG_HIDE_LITTLEROOT_TOWN_RIVAL @@ -200,17 +217,17 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80 releaseall end -LittlerootTown_ProfessorBirchsLab_EventScript_1F9F32:: @ 81F9F32 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB30F, MSGBOX_DEFAULT +LittlerootTown_ProfessorBirchsLab_EventScript_MayUpgradeComment:: @ 81F9F32 + msgbox LittlerootTown_ProfessorBirchsLab_Text_MayUpgradeSoCool, MSGBOX_DEFAULT closemessage return -LittlerootTown_ProfessorBirchsLab_EventScript_1F9F3C:: @ 81F9F3C - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB38E, MSGBOX_DEFAULT +LittlerootTown_ProfessorBirchsLab_EventScript_BrendanUpgradeComment:: @ 81F9F3C + msgbox LittlerootTown_ProfessorBirchsLab_Text_BrendanYouCanThankMe, MSGBOX_DEFAULT closemessage return -LittlerootTown_ProfessorBirchsLab_Movement_1F9F46: @ 81F9F46 +LittlerootTown_ProfessorBirchsLab_Movement_BirchRetrievePokedexes: @ 81F9F46 walk_left walk_in_place_fastest_down delay_16 @@ -230,7 +247,7 @@ LittlerootTown_ProfessorBirchsLab_Movement_1F9F46: @ 81F9F46 walk_in_place_fastest_up step_end -LittlerootTown_ProfessorBirchsLab_Movement_1F9F58: @ 81F9F58 +LittlerootTown_ProfessorBirchsLab_Movement_BirchReturnPokedex: @ 81F9F58 walk_left walk_left walk_left @@ -242,16 +259,16 @@ LittlerootTown_ProfessorBirchsLab_Movement_1F9F58: @ 81F9F58 walk_in_place_fastest_down step_end -LittlerootTown_ProfessorBirchsLab_EventScript_1F9F62:: @ 81F9F62 +LittlerootTown_ProfessorBirchsLab_EventScript_ChooseJohtoStarter:: @ 81F9F62 lockall - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_1F9F7C + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_PlayerEnterLabForJohtoStarter waitmovement 0 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB5F9, MSGBOX_DEFAULT + msgbox LittlerootTown_ProfessorBirchsLab_Text_CompletedDexChoosePokemon, MSGBOX_DEFAULT setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 5 releaseall end -LittlerootTown_ProfessorBirchsLab_Movement_1F9F7C: @ 81F9F7C +LittlerootTown_ProfessorBirchsLab_Movement_PlayerEnterLabForJohtoStarter: @ 81F9F7C walk_up walk_up walk_up @@ -261,259 +278,259 @@ LittlerootTown_ProfessorBirchsLab_Movement_1F9F7C: @ 81F9F7C walk_up step_end -LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84:: @ 81F9F84 +LittlerootTown_ProfessorBirchsLab_EventScript_Aide:: @ 81F9F84 lock faceplayer compare VAR_BIRCH_LAB_STATE, 3 - goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1F9FB1 - goto_if_set FLAG_BIRCH_AIDE_MET, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FA7 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA4E2, MSGBOX_DEFAULT + goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_AideReceivedStarter + goto_if_set FLAG_BIRCH_AIDE_MET, LittlerootTown_ProfessorBirchsLab_EventScript_AideAlreadyMet + msgbox LittlerootTown_ProfessorBirchsLab_Text_BirchAwayOnFieldwork, MSGBOX_DEFAULT setflag FLAG_BIRCH_AIDE_MET release end -LittlerootTown_ProfessorBirchsLab_EventScript_1F9FA7:: @ 81F9FA7 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA641, MSGBOX_DEFAULT +LittlerootTown_ProfessorBirchsLab_EventScript_AideAlreadyMet:: @ 81F9FA7 + msgbox LittlerootTown_ProfessorBirchsLab_Text_BirchIsntOneForDeskWork, MSGBOX_DEFAULT release end -LittlerootTown_ProfessorBirchsLab_EventScript_1F9FB1:: @ 81F9FB1 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA6CE, MSGBOX_DEFAULT +LittlerootTown_ProfessorBirchsLab_EventScript_AideReceivedStarter:: @ 81F9FB1 + msgbox LittlerootTown_ProfessorBirchsLab_Text_BirchEnjoysRivalsHelpToo, MSGBOX_DEFAULT release end -LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB:: @ 81F9FBB +LittlerootTown_ProfessorBirchsLab_EventScript_Cyndaquil:: @ 81F9FBB release compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6 - goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 + goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_AlreadyChoseJohtoStarter applymovement 2, Common_Movement_WalkInPlaceFastestRight waitmovement 0 showmonpic SPECIES_CYNDAQUIL, 10, 3 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB7F6, MSGBOX_YESNO + msgbox LittlerootTown_ProfessorBirchsLab_Text_YoullTakeCyndaquil, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061 - goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA06C + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_TakeYourTime + goto LittlerootTown_ProfessorBirchsLab_EventScript_GiveCyndaquil end -LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF:: @ 81F9FEF +LittlerootTown_ProfessorBirchsLab_EventScript_Totodile:: @ 81F9FEF release compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6 - goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 + goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_AlreadyChoseJohtoStarter applymovement 2, Common_Movement_WalkInPlaceFastestRight waitmovement 0 showmonpic SPECIES_TOTODILE, 10, 3 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB869, MSGBOX_YESNO + msgbox LittlerootTown_ProfessorBirchsLab_Text_YoullTakeTotodile, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061 - goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA10D + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_TakeYourTime + goto LittlerootTown_ProfessorBirchsLab_EventScript_GiveTotodile end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA023:: @ 81FA023 +LittlerootTown_ProfessorBirchsLab_EventScript_Chikorita:: @ 81FA023 release compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6 - goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 + goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_AlreadyChoseJohtoStarter applymovement 2, Common_Movement_WalkInPlaceFastestRight waitmovement 0 showmonpic SPECIES_CHIKORITA, 10, 3 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB8E0, MSGBOX_YESNO + msgbox LittlerootTown_ProfessorBirchsLab_Text_YoullTakeChikorita, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061 - goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA1AE + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_TakeYourTime + goto LittlerootTown_ProfessorBirchsLab_EventScript_GiveChikorita end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA057:: @ 81FA057 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBAF8, MSGBOX_DEFAULT +LittlerootTown_ProfessorBirchsLab_EventScript_AlreadyChoseJohtoStarter:: @ 81FA057 + msgbox LittlerootTown_ProfessorBirchsLab_Text_BetterLeaveOthersAlone, MSGBOX_DEFAULT releaseall end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA061:: @ 81FA061 +LittlerootTown_ProfessorBirchsLab_EventScript_TakeYourTime:: @ 81FA061 hidemonpic - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB959, MSGBOX_DEFAULT + msgbox LittlerootTown_ProfessorBirchsLab_Text_TakeYourTimeAllInvaluable, MSGBOX_DEFAULT releaseall end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA06C:: @ 81FA06C +LittlerootTown_ProfessorBirchsLab_EventScript_GiveCyndaquil:: @ 81FA06C bufferspeciesname 0, SPECIES_CYNDAQUIL setvar VAR_TEMP_1, SPECIES_CYNDAQUIL givemon SPECIES_CYNDAQUIL, 5, ITEM_NONE compare VAR_RESULT, 0 - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_SendCyndaquilToParty compare VAR_RESULT, 1 - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0CC + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_SendCyndaquilToPC hidemonpic goto Common_EventScript_NoMoreRoomForPokemon end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1:: @ 81FA0A1 - call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F +LittlerootTown_ProfessorBirchsLab_EventScript_SendCyndaquilToParty:: @ 81FA0A1 + call LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedJohtoStarter removeobject 4 msgbox gText_NicknameThisPokemon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedCyndaquil call Common_EventScript_GetGiftMonPartySlot call Common_EventScript_NameReceivedPartyMon - goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD + goto LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedCyndaquil end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA0CC:: @ 81FA0CC - call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F +LittlerootTown_ProfessorBirchsLab_EventScript_SendCyndaquilToPC:: @ 81FA0CC + call LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedJohtoStarter removeobject 4 msgbox gText_NicknameThisPokemon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_CyndaquilTransferredToPC call Common_EventScript_NameReceivedBoxMon - goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2 + goto LittlerootTown_ProfessorBirchsLab_EventScript_CyndaquilTransferredToPC end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2:: @ 81FA0F2 +LittlerootTown_ProfessorBirchsLab_EventScript_CyndaquilTransferredToPC:: @ 81FA0F2 call Common_EventScript_TransferredToPC - goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD + goto LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedCyndaquil end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD:: @ 81FA0FD +LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedCyndaquil:: @ 81FA0FD hidemonpic - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, MSGBOX_DEFAULT + msgbox LittlerootTown_ProfessorBirchsLab_Text_GrassyPatchWaiting, MSGBOX_DEFAULT setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6 releaseall end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA10D:: @ 81FA10D +LittlerootTown_ProfessorBirchsLab_EventScript_GiveTotodile:: @ 81FA10D bufferspeciesname 0, SPECIES_TOTODILE setvar VAR_TEMP_1, SPECIES_TOTODILE givemon SPECIES_TOTODILE, 5, ITEM_NONE compare VAR_RESULT, 0 - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA142 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_SendTotodileToParty compare VAR_RESULT, 1 - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA16D + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_SendTotodileToPC hidemonpic goto Common_EventScript_NoMoreRoomForPokemon end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA142:: @ 81FA142 - call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F +LittlerootTown_ProfessorBirchsLab_EventScript_SendTotodileToParty:: @ 81FA142 + call LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedJohtoStarter removeobject 5 msgbox gText_NicknameThisPokemon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedTotodile call Common_EventScript_GetGiftMonPartySlot call Common_EventScript_NameReceivedPartyMon - goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E + goto LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedTotodile end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA16D:: @ 81FA16D - call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F +LittlerootTown_ProfessorBirchsLab_EventScript_SendTotodileToPC:: @ 81FA16D + call LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedJohtoStarter removeobject 5 msgbox gText_NicknameThisPokemon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA193 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_TotodileTransferredToPC call Common_EventScript_NameReceivedBoxMon - goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA193 + goto LittlerootTown_ProfessorBirchsLab_EventScript_TotodileTransferredToPC end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA193:: @ 81FA193 +LittlerootTown_ProfessorBirchsLab_EventScript_TotodileTransferredToPC:: @ 81FA193 call Common_EventScript_TransferredToPC - goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E + goto LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedTotodile end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E:: @ 81FA19E +LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedTotodile:: @ 81FA19E hidemonpic - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, MSGBOX_DEFAULT + msgbox LittlerootTown_ProfessorBirchsLab_Text_GrassyPatchWaiting, MSGBOX_DEFAULT setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6 releaseall end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA1AE:: @ 81FA1AE +LittlerootTown_ProfessorBirchsLab_EventScript_GiveChikorita:: @ 81FA1AE bufferspeciesname 0, SPECIES_CHIKORITA setvar VAR_TEMP_1, SPECIES_CHIKORITA givemon SPECIES_CHIKORITA, 5, ITEM_NONE compare VAR_RESULT, 0 - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_SendChikoritaToParty compare VAR_RESULT, 1 - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA20E + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_SendChikoritaToPC hidemonpic goto Common_EventScript_NoMoreRoomForPokemon end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3:: @ 81FA1E3 - call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F +LittlerootTown_ProfessorBirchsLab_EventScript_SendChikoritaToParty:: @ 81FA1E3 + call LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedJohtoStarter removeobject 6 msgbox gText_NicknameThisPokemon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedChikorita call Common_EventScript_GetGiftMonPartySlot call Common_EventScript_NameReceivedPartyMon - goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F + goto LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedChikorita end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA20E:: @ 81FA20E - call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F +LittlerootTown_ProfessorBirchsLab_EventScript_SendChikoritaToPC:: @ 81FA20E + call LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedJohtoStarter removeobject 6 msgbox gText_NicknameThisPokemon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA234 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_ChikoritaTransferredToPC call Common_EventScript_NameReceivedBoxMon - goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA234 + goto LittlerootTown_ProfessorBirchsLab_EventScript_ChikoritaTransferredToPC end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA234:: @ 81FA234 +LittlerootTown_ProfessorBirchsLab_EventScript_ChikoritaTransferredToPC:: @ 81FA234 call Common_EventScript_TransferredToPC - goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F + goto LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedChikorita end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F:: @ 81FA23F +LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedChikorita:: @ 81FA23F hidemonpic - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, MSGBOX_DEFAULT + msgbox LittlerootTown_ProfessorBirchsLab_Text_GrassyPatchWaiting, MSGBOX_DEFAULT setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6 releaseall end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F:: @ 81FA24F +LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedJohtoStarter:: @ 81FA24F playfanfare MUS_FANFA4 - message LittlerootTown_ProfessorBirchsLab_Text_1FB9D7 + message LittlerootTown_ProfessorBirchsLab_Text_ReceivedJohtoStarter waitmessage waitfanfare return -LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A:: @ 81FA25A +LittlerootTown_ProfessorBirchsLab_EventScript_Birch:: @ 81FA25A lock faceplayer compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 5 - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA28A + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_CanHaveAnyOneOfRarePokemon compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 2 - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA294 - goto_if_unset FLAG_HAS_MATCH_CALL, LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_GrassyPatchWaiting + goto_if_unset FLAG_HAS_MATCH_CALL, LittlerootTown_ProfessorBirchsLab_EventScript_TryRatePokedexOrRegister goto_if_unset FLAG_ENABLE_PROF_BIRCH_MATCH_CALL, EventScript_RegisterProfBirch - goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E + goto LittlerootTown_ProfessorBirchsLab_EventScript_TryRatePokedexOrRegister end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA28A:: @ 81FA28A - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB787, MSGBOX_DEFAULT +LittlerootTown_ProfessorBirchsLab_EventScript_CanHaveAnyOneOfRarePokemon:: @ 81FA28A + msgbox LittlerootTown_ProfessorBirchsLab_Text_CanHaveAnyOneOfRarePokemon, MSGBOX_DEFAULT release end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA294:: @ 81FA294 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB466, MSGBOX_DEFAULT +LittlerootTown_ProfessorBirchsLab_EventScript_GrassyPatchWaiting:: @ 81FA294 + msgbox LittlerootTown_ProfessorBirchsLab_Text_GrassyPatchWaiting2, MSGBOX_DEFAULT release end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E:: @ 81FA29E +LittlerootTown_ProfessorBirchsLab_EventScript_TryRatePokedexOrRegister:: @ 81FA29E goto_if_unset FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380, ProfBirch_EventScript_RatePokedexOrRegister compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 3 goto_if_eq ProfBirch_EventScript_RatePokedexOrRegister compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6 goto_if_ge ProfBirch_EventScript_RatePokedexOrRegister compare VAR_BIRCH_LAB_STATE, 5 - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA3C4 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAA74, MSGBOX_DEFAULT + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_PokemonAwait + msgbox LittlerootTown_ProfessorBirchsLab_Text_BirchRivalGoneHome, MSGBOX_DEFAULT release end EventScript_RegisterProfBirch:: @ 81FA2D2 - msgbox Route101_Text_2B5F52, MSGBOX_DEFAULT + msgbox MatchCall_Text_BirchRegisterCall, MSGBOX_DEFAULT closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox Route101_Text_2B603A, MSGBOX_DEFAULT + msgbox MatchCall_Text_RegisteredBirch, MSGBOX_DEFAULT waitfanfare closemessage delay 30 @@ -522,20 +539,20 @@ EventScript_RegisterProfBirch:: @ 81FA2D2 release end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA2F8:: @ 81FA2F8 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAB22, MSGBOX_DEFAULT - call LittlerootTown_ProfessorBirchsLab_EventScript_1FA3AC - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAC4B, MSGBOX_DEFAULT +LittlerootTown_ProfessorBirchsLab_EventScript_GivePokedex:: @ 81FA2F8 + msgbox LittlerootTown_ProfessorBirchsLab_Text_HeardYouBeatRivalTakePokedex, MSGBOX_DEFAULT + call LittlerootTown_ProfessorBirchsLab_EventScript_ReceivePokedex + msgbox LittlerootTown_ProfessorBirchsLab_Text_ExplainPokedex, MSGBOX_DEFAULT closemessage - applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_1FA3E0 + applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_RivalApproachPlayer waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 checkplayergender compare VAR_RESULT, MALE - call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA352 + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_MayGivePokeBalls compare VAR_RESULT, FEMALE - call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA37F + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_BrendanGivePokeBalls setvar VAR_BIRCH_LAB_STATE, 5 setflag FLAG_ADVENTURE_STARTED setvar VAR_OLDALE_TOWN_STATE, 1 @@ -544,153 +561,153 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA2F8:: @ 81FA2F8 releaseall end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA352:: @ 81FA352 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FADD7, MSGBOX_DEFAULT +LittlerootTown_ProfessorBirchsLab_EventScript_MayGivePokeBalls:: @ 81FA352 + msgbox LittlerootTown_ProfessorBirchsLab_Text_MayGotPokedexTooTakeThese, MSGBOX_DEFAULT giveitem_std ITEM_POKE_BALL, 5 - compare VAR_RESULT, 0 - call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA3CE - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAE40, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_MayNoRoomForPokeBalls + msgbox LittlerootTown_ProfessorBirchsLab_Text_CatchCutePokemonWithPokeBalls, MSGBOX_DEFAULT setvar VAR_RESULT, 0 return -LittlerootTown_ProfessorBirchsLab_EventScript_1FA37F:: @ 81FA37F - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAF3F, MSGBOX_DEFAULT +LittlerootTown_ProfessorBirchsLab_EventScript_BrendanGivePokeBalls:: @ 81FA37F + msgbox LittlerootTown_ProfessorBirchsLab_Text_BrendanGotPokedexTooTakeThese, MSGBOX_DEFAULT giveitem_std ITEM_POKE_BALL, 5 - compare VAR_RESULT, 0 - call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA3D7 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAF8E, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_BrendanNoRoomForPokeBalls + msgbox LittlerootTown_ProfessorBirchsLab_Text_CatchCoolPokemonWithPokeBalls, MSGBOX_DEFAULT setvar VAR_RESULT, 1 return -LittlerootTown_ProfessorBirchsLab_EventScript_1FA3AC:: @ 81FA3AC +LittlerootTown_ProfessorBirchsLab_EventScript_ReceivePokedex:: @ 81FA3AC playfanfare MUS_FANFA4 - message LittlerootTown_ProfessorBirchsLab_Text_1FAC32 + message LittlerootTown_ProfessorBirchsLab_Text_ReceivedPokedex waitfanfare setflag FLAG_SYS_POKEDEX_GET - special sub_81AFDA0 + special sub_81AFDA0 @ sets flags that are never read setflag FLAG_RECEIVED_POKEDEX_FROM_BIRCH setvar VAR_CABLE_CLUB_TUTORIAL_STATE, 1 return -LittlerootTown_ProfessorBirchsLab_EventScript_1FA3C4:: @ 81FA3C4 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAD6F, MSGBOX_DEFAULT +LittlerootTown_ProfessorBirchsLab_EventScript_PokemonAwait:: @ 81FA3C4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_CountlessPokemonAwait, MSGBOX_DEFAULT release end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA3CE:: @ 81FA3CE - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAEF3, MSGBOX_DEFAULT +LittlerootTown_ProfessorBirchsLab_EventScript_MayNoRoomForPokeBalls:: @ 81FA3CE + msgbox LittlerootTown_ProfessorBirchsLab_Text_OhYourBagsFull, MSGBOX_DEFAULT return -LittlerootTown_ProfessorBirchsLab_EventScript_1FA3D7:: @ 81FA3D7 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB05D, MSGBOX_DEFAULT +LittlerootTown_ProfessorBirchsLab_EventScript_BrendanNoRoomForPokeBalls:: @ 81FA3D7 + msgbox LittlerootTown_ProfessorBirchsLab_Text_HeyYourBagsFull, MSGBOX_DEFAULT return -LittlerootTown_ProfessorBirchsLab_Movement_1FA3E0: @ 81FA3E0 +LittlerootTown_ProfessorBirchsLab_Movement_RivalApproachPlayer: @ 81FA3E0 walk_down walk_in_place_fastest_left step_end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3:: @ 81FA3E3 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB0A2, MSGBOX_SIGN +LittlerootTown_ProfessorBirchsLab_EventScript_Machine:: @ 81FA3E3 + msgbox LittlerootTown_ProfessorBirchsLab_Text_SeriousLookingMachine, MSGBOX_SIGN end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC:: @ 81FA3EC +LittlerootTown_ProfessorBirchsLab_EventScript_Rival:: @ 81FA3EC lock faceplayer compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 5 - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA43A + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_RivalFuturePlans compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6 - goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA465 + goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_RivalHaveYouGoneToBattleFrontier compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 2 - goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA490 + goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_RivalTakeBreakFromFieldwork checkplayergender compare VAR_RESULT, MALE - call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA428 + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_MayWhereShouldIGoNext compare VAR_RESULT, FEMALE - call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA431 + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_BrendanWhereShouldIGoNext release end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA428:: @ 81FA428 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAF08, MSGBOX_DEFAULT +LittlerootTown_ProfessorBirchsLab_EventScript_MayWhereShouldIGoNext:: @ 81FA428 + msgbox LittlerootTown_ProfessorBirchsLab_Text_MayWhereShouldIGoNext, MSGBOX_DEFAULT return -LittlerootTown_ProfessorBirchsLab_EventScript_1FA431:: @ 81FA431 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB073, MSGBOX_DEFAULT +LittlerootTown_ProfessorBirchsLab_EventScript_BrendanWhereShouldIGoNext:: @ 81FA431 + msgbox LittlerootTown_ProfessorBirchsLab_Text_BrendanWhereShouldIGoNext, MSGBOX_DEFAULT return -LittlerootTown_ProfessorBirchsLab_EventScript_1FA43A:: @ 81FA43A +LittlerootTown_ProfessorBirchsLab_EventScript_RivalFuturePlans:: @ 81FA43A checkplayergender compare VAR_RESULT, MALE - call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA453 + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_MayWhatNextImStayingHere compare VAR_RESULT, FEMALE - call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA45C + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_BrendanPreferCollectingSlowly release end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA453:: @ 81FA453 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBB68, MSGBOX_DEFAULT +LittlerootTown_ProfessorBirchsLab_EventScript_MayWhatNextImStayingHere:: @ 81FA453 + msgbox LittlerootTown_ProfessorBirchsLab_Text_MayWhatNextImStayingHere, MSGBOX_DEFAULT return -LittlerootTown_ProfessorBirchsLab_EventScript_1FA45C:: @ 81FA45C - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBC2D, MSGBOX_DEFAULT +LittlerootTown_ProfessorBirchsLab_EventScript_BrendanPreferCollectingSlowly: @ 81FA45C + msgbox LittlerootTown_ProfessorBirchsLab_Text_BrendanPreferCollectingSlowly, MSGBOX_DEFAULT return -LittlerootTown_ProfessorBirchsLab_EventScript_1FA465:: @ 81FA465 +LittlerootTown_ProfessorBirchsLab_EventScript_RivalHaveYouGoneToBattleFrontier:: @ 81FA465 checkplayergender compare VAR_RESULT, MALE - call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA47E + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_MayHaveYouGoneToBattleFrontier compare VAR_RESULT, FEMALE - call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA487 + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_BrendanHaveYouGoneToBattleFrontier release end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA47E:: @ 81FA47E - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBC8D, MSGBOX_DEFAULT +LittlerootTown_ProfessorBirchsLab_EventScript_MayHaveYouGoneToBattleFrontier:: @ 81FA47E + msgbox LittlerootTown_ProfessorBirchsLab_Text_MayHaveYouGoneToBattleFrontier, MSGBOX_DEFAULT return -LittlerootTown_ProfessorBirchsLab_EventScript_1FA487:: @ 81FA487 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBCD2, MSGBOX_DEFAULT +LittlerootTown_ProfessorBirchsLab_EventScript_BrendanHaveYouGoneToBattleFrontier:: @ 81FA487 + msgbox LittlerootTown_ProfessorBirchsLab_Text_BrendanHaveYouGoneToBattleFrontier, MSGBOX_DEFAULT return -LittlerootTown_ProfessorBirchsLab_EventScript_1FA490:: @ 81FA490 +LittlerootTown_ProfessorBirchsLab_EventScript_RivalTakeBreakFromFieldwork:: @ 81FA490 checkplayergender compare VAR_RESULT, MALE - call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA4A9 + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_MayTakeBreakFromFieldwork compare VAR_RESULT, FEMALE - call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA4B2 + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_BrendanTakeBreakFromFieldwork release end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA4A9:: @ 81FA4A9 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB528, MSGBOX_DEFAULT +LittlerootTown_ProfessorBirchsLab_EventScript_MayTakeBreakFromFieldwork:: @ 81FA4A9 + msgbox LittlerootTown_ProfessorBirchsLab_Text_MayTakeBreakFromFieldwork, MSGBOX_DEFAULT return -LittlerootTown_ProfessorBirchsLab_EventScript_1FA4B2:: @ 81FA4B2 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB58A, MSGBOX_DEFAULT +LittlerootTown_ProfessorBirchsLab_EventScript_BrendanTakeBreakFromFieldwork:: @ 81FA4B2 + msgbox LittlerootTown_ProfessorBirchsLab_Text_BrendanTakeBreakFromFieldwork, MSGBOX_DEFAULT return -LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB:: @ 81FA4BB - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB0E7, MSGBOX_SIGN +LittlerootTown_ProfessorBirchsLab_EventScript_PC:: @ 81FA4BB + msgbox LittlerootTown_ProfessorBirchsLab_Text_PCUsedForResearch, MSGBOX_SIGN end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4:: @ 81FA4C4 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB124, MSGBOX_SIGN +LittlerootTown_ProfessorBirchsLab_EventScript_Bookshelf:: @ 81FA4C4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_CrammedWithBooksOnPokemon, MSGBOX_SIGN end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA4CD:: @ 81FA4CD - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB148, MSGBOX_SIGN +LittlerootTown_ProfessorBirchsLab_EventScript_Book:: @ 81FA4CD + msgbox LittlerootTown_ProfessorBirchsLab_Text_BookTooHardToRead, MSGBOX_SIGN end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA4D6:: @ 81FA4D6 +LittlerootTown_ProfessorBirchsLab_EventScript_ScottAboardSSTidalCall:: @ 81FA4D6 lockall - pokenavcall LittlerootTown_ProfessorBirchsLab_Text_1FBD1A + pokenavcall LittlerootTown_ProfessorBirchsLab_Text_ScottAboardSSTidalCall waitmessage clearflag FLAG_SCOTT_CALL_NATIONAL_DEX releaseall end -LittlerootTown_ProfessorBirchsLab_Text_1FA4E2: @ 81FA4E2 +LittlerootTown_ProfessorBirchsLab_Text_BirchAwayOnFieldwork: @ 81FA4E2 .string "Hunh? PROF. BIRCH?\p" .string "The PROF's away on fieldwork.\n" .string "Ergo, he isn't here.\p" @@ -703,19 +720,19 @@ LittlerootTown_ProfessorBirchsLab_Text_1FA4E2: @ 81FA4E2 .string "rather go outside and experience\l" .string "things than read about them here.$" -LittlerootTown_ProfessorBirchsLab_Text_1FA641: @ 81FA641 +LittlerootTown_ProfessorBirchsLab_Text_BirchIsntOneForDeskWork: @ 81FA641 .string "The PROF isn't one for doing desk work.\n" .string "He's the type of person who would\l" .string "rather go outside and experience\l" .string "things than read about them here.$" -LittlerootTown_ProfessorBirchsLab_Text_1FA6CE: @ 81FA6CE +LittlerootTown_ProfessorBirchsLab_Text_BirchEnjoysRivalsHelpToo: @ 81FA6CE .string "PROF. BIRCH is studying the habitats\n" .string "and distribution of POKéMON.\p" .string "The PROF enjoys {RIVAL}'s help, too.\n" .string "There's a lot of love there.$" -LittlerootTown_ProfessorBirchsLab_Text_1FA74D: @ 81FA74D +LittlerootTown_ProfessorBirchsLab_Text_LikeYouToHavePokemon: @ 81FA74D .string "PROF. BIRCH: So, {PLAYER}{KUN}.\p" .string "I've heard so much about you from\n" .string "your father.\p" @@ -730,11 +747,11 @@ LittlerootTown_ProfessorBirchsLab_Text_1FA74D: @ 81FA74D .string "used earlier.\p" .string "{PLAYER} received the {STR_VAR_1}!$" -LittlerootTown_ProfessorBirchsLab_Text_1FA8B1: @ 81FA8B1 +LittlerootTown_ProfessorBirchsLab_Text_WhyNotGiveNicknameToMon: @ 81FA8B1 .string "PROF. BIRCH: While you're at it, why not\n" .string "give a nickname to that {STR_VAR_1}?$" -LittlerootTown_ProfessorBirchsLab_Text_1FA8F6: @ 81FA8F6 +LittlerootTown_ProfessorBirchsLab_Text_MightBeGoodIdeaToGoSeeRival: @ 81FA8F6 .string "PROF. BIRCH: If you work at POKéMON\n" .string "and gain experience, I think you'll make\l" .string "an extremely good TRAINER.\p" @@ -743,17 +760,17 @@ LittlerootTown_ProfessorBirchsLab_Text_1FA8F6: @ 81FA8F6 .string "{PLAYER}{KUN}, don't you think it might be\n" .string "a good idea to go see {RIVAL}?$" -LittlerootTown_ProfessorBirchsLab_Text_1FA9D5: @ 81FA9D5 +LittlerootTown_ProfessorBirchsLab_Text_GetRivalToTeachYou: @ 81FA9D5 .string "PROF. BIRCH: Great!\n" .string "{RIVAL} should be happy, too.\p" .string "Get {RIVAL} to teach you what it\n" .string "means to be a TRAINER.$" -LittlerootTown_ProfessorBirchsLab_Text_1FAA35: @ 81FAA35 +LittlerootTown_ProfessorBirchsLab_Text_DontBeThatWay: @ 81FAA35 .string "PROF. BIRCH: Oh, don't be that way.\n" .string "You should go meet my kid.$" -LittlerootTown_ProfessorBirchsLab_Text_1FAA74: @ 81FAA74 +LittlerootTown_ProfessorBirchsLab_Text_BirchRivalGoneHome: @ 81FAA74 .string "PROF. BIRCH: {RIVAL}?\n" .string "Gone home, I think.\p" .string "Or maybe that kid's scrabbling around\n" @@ -761,7 +778,7 @@ LittlerootTown_ProfessorBirchsLab_Text_1FAA74: @ 81FAA74 .string "If you or your POKéMON get tired,\n" .string "you should get some rest at home.$" -LittlerootTown_ProfessorBirchsLab_Text_1FAB22: @ 81FAB22 +LittlerootTown_ProfessorBirchsLab_Text_HeardYouBeatRivalTakePokedex: @ 81FAB22 .string "PROF. BIRCH: Oh, hi, {PLAYER}{KUN}!\p" .string "I heard you beat {RIVAL} on\n" .string "your first try. That's excellent!\p" @@ -773,10 +790,10 @@ LittlerootTown_ProfessorBirchsLab_Text_1FAB22: @ 81FAB22 .string "research, but I think you should have\l" .string "this POKéDEX.$" -LittlerootTown_ProfessorBirchsLab_Text_1FAC32: @ 81FAC32 +LittlerootTown_ProfessorBirchsLab_Text_ReceivedPokedex: @ 81FAC32 .string "{PLAYER} received the POKéDEX!$" -LittlerootTown_ProfessorBirchsLab_Text_1FAC4B: @ 81FAC4B +LittlerootTown_ProfessorBirchsLab_Text_ExplainPokedex: @ 81FAC4B .string "PROF. BIRCH: The POKéDEX is a high-tech\n" .string "tool that automatically makes a record\l" .string "of any POKéMON you meet or catch.\p" @@ -787,19 +804,19 @@ LittlerootTown_ProfessorBirchsLab_Text_1FAC4B: @ 81FAC4B .string "why, {RIVAL} looks for me while I'm out\l" .string "doing fieldwork, and shows me.$" -LittlerootTown_ProfessorBirchsLab_Text_1FAD6F: @ 81FAD6F +LittlerootTown_ProfessorBirchsLab_Text_CountlessPokemonAwait: @ 81FAD6F .string "PROF. BIRCH: Countless POKéMON\n" .string "await you!\p" .string "Argh, I'm getting the itch to get out\n" .string "and do fieldwork again!$" -LittlerootTown_ProfessorBirchsLab_Text_1FADD7: @ 81FADD7 +LittlerootTown_ProfessorBirchsLab_Text_MayGotPokedexTooTakeThese: @ 81FADD7 .string "MAY: Oh, wow, {PLAYER}{KUN}!\n" .string "You got a POKéDEX, too!\p" .string "That's great! Just like me!\n" .string "I've got something for you, too!$" -LittlerootTown_ProfessorBirchsLab_Text_1FAE40: @ 81FAE40 +LittlerootTown_ProfessorBirchsLab_Text_CatchCutePokemonWithPokeBalls: @ 81FAE40 .string "MAY: It's fun if you can get a lot of\n" .string "POKéMON!\p" .string "I'm going to look all over the place\n" @@ -807,20 +824,20 @@ LittlerootTown_ProfessorBirchsLab_Text_1FAE40: @ 81FAE40 .string "If I find any cute POKéMON, I'll catch\n" .string "them with POKé BALLS!$" -LittlerootTown_ProfessorBirchsLab_Text_1FAEF3: @ 81FAEF3 +LittlerootTown_ProfessorBirchsLab_Text_OhYourBagsFull: @ 81FAEF3 .string "Oh? Your BAG's full.$" -LittlerootTown_ProfessorBirchsLab_Text_1FAF08: @ 81FAF08 +LittlerootTown_ProfessorBirchsLab_Text_MayWhereShouldIGoNext: @ 81FAF08 .string "MAY: I wonder where I should go look\n" .string "for POKéMON next?$" -LittlerootTown_ProfessorBirchsLab_Text_1FAF3F: @ 81FAF3F +LittlerootTown_ProfessorBirchsLab_Text_BrendanGotPokedexTooTakeThese: @ 81FAF3F .string "BRENDAN: Huh…\n" .string "So you got a POKéDEX, too.\p" .string "Well then, here.\n" .string "I'll give you these.$" -LittlerootTown_ProfessorBirchsLab_Text_1FAF8E: @ 81FAF8E +LittlerootTown_ProfessorBirchsLab_Text_CatchCoolPokemonWithPokeBalls: @ 81FAF8E .string "BRENDAN: You know it's more fun to\n" .string "have a whole bunch of POKéMON.\p" .string "I'm going to explore all over the place\n" @@ -828,28 +845,28 @@ LittlerootTown_ProfessorBirchsLab_Text_1FAF8E: @ 81FAF8E .string "If I find any cool POKéMON, you bet\n" .string "I'll try to get them with POKé BALLS.$" -LittlerootTown_ProfessorBirchsLab_Text_1FB05D: @ 81FB05D +LittlerootTown_ProfessorBirchsLab_Text_HeyYourBagsFull: @ 81FB05D .string "Hey, your BAG's full.$" -LittlerootTown_ProfessorBirchsLab_Text_1FB073: @ 81FB073 +LittlerootTown_ProfessorBirchsLab_Text_BrendanWhereShouldIGoNext: @ 81FB073 .string "BRENDAN: Where should I look for\n" .string "POKéMON next…$" -LittlerootTown_ProfessorBirchsLab_Text_1FB0A2: @ 81FB0A2 +LittlerootTown_ProfessorBirchsLab_Text_SeriousLookingMachine: @ 81FB0A2 .string "It's a serious-looking machine.\n" .string "The PROF must use this for research.$" -LittlerootTown_ProfessorBirchsLab_Text_1FB0E7: @ 81FB0E7 +LittlerootTown_ProfessorBirchsLab_Text_PCUsedForResearch: @ 81FB0E7 .string "It's a PC used for research.\n" .string "Better not mess around with it.$" -LittlerootTown_ProfessorBirchsLab_Text_1FB124: @ 81FB124 +LittlerootTown_ProfessorBirchsLab_Text_CrammedWithBooksOnPokemon: @ 81FB124 .string "It's crammed with books on POKéMON.$" -LittlerootTown_ProfessorBirchsLab_Text_1FB148: @ 81FB148 +LittlerootTown_ProfessorBirchsLab_Text_BookTooHardToRead: @ 81FB148 .string "It's a book that's too hard to read.$" -LittlerootTown_ProfessorBirchsLab_Text_1FB16D: @ 81FB16D +LittlerootTown_ProfessorBirchsLab_Text_OtherRegionsUpgradeToNational: @ 81FB16D .string "PROF. BIRCH: Now…\p" .string "{PLAYER}{KUN} and {RIVAL}, I've had the two\n" .string "of you help me study POKéMON.\p" @@ -866,28 +883,28 @@ LittlerootTown_ProfessorBirchsLab_Text_1FB16D: @ 81FB16D .string "the NATIONAL Mode.\p" .string "Here, let me see your POKéDEX units.$" -LittlerootTown_ProfessorBirchsLab_Text_1FB30F: @ 81FB30F +LittlerootTown_ProfessorBirchsLab_Text_MayUpgradeSoCool: @ 81FB30F .string "MAY: Eheheh!\p" .string "It's so cool that even my POKéDEX\n" .string "is getting updated!\p" .string "It's because you went out and caught\n" .string "so many POKéMON, {PLAYER}{KUN}!$" -LittlerootTown_ProfessorBirchsLab_Text_1FB38E: @ 81FB38E +LittlerootTown_ProfessorBirchsLab_Text_BrendanYouCanThankMe: @ 81FB38E .string "BRENDAN: I went out all over HOENN\n" .string "and checked out POKéMON.\p" .string "You can thank me for getting\n" .string "the NATIONAL Mode POKéDEX.\p" .string "Yep, you're lucky, {PLAYER}!$" -LittlerootTown_ProfessorBirchsLab_Text_1FB419: @ 81FB419 +LittlerootTown_ProfessorBirchsLab_Text_OkayAllDone: @ 81FB419 .string "PROF. BIRCH: Okay, all done!$" -LittlerootTown_ProfessorBirchsLab_Text_1FB436: @ 81FB436 +LittlerootTown_ProfessorBirchsLab_Text_PokedexUpgradedToNational: @ 81FB436 .string "{PLAYER}'s POKéDEX was upgraded\n" .string "to the NATIONAL Mode!$" -LittlerootTown_ProfessorBirchsLab_Text_1FB466: @ 81FB466 +LittlerootTown_ProfessorBirchsLab_Text_GrassyPatchWaiting2: @ 81FB466 .string "PROF. BIRCH: But listen.\n" .string "You've become the CHAMPION,\l" .string "but your POKéMON journey isn't over.\p" @@ -896,19 +913,19 @@ LittlerootTown_ProfessorBirchsLab_Text_1FB466: @ 81FB466 .string "Somewhere, there is a grassy patch\n" .string "that's waiting for you!$" -LittlerootTown_ProfessorBirchsLab_Text_1FB528: @ 81FB528 +LittlerootTown_ProfessorBirchsLab_Text_MayTakeBreakFromFieldwork: @ 81FB528 .string "MAY: I think I'll take a short break\n" .string "from fieldwork.\p" .string "I think I'll help the PROF here for\n" .string "a while.$" -LittlerootTown_ProfessorBirchsLab_Text_1FB58A: @ 81FB58A +LittlerootTown_ProfessorBirchsLab_Text_BrendanTakeBreakFromFieldwork: @ 81FB58A .string "BRENDAN: For the time being,\n" .string "I'm taking a break from fieldwork.\p" .string "I'll be helping out the PROF here\n" .string "for a while.$" -LittlerootTown_ProfessorBirchsLab_Text_1FB5F9: @ 81FB5F9 +LittlerootTown_ProfessorBirchsLab_Text_CompletedDexChoosePokemon: @ 81FB5F9 .string "PROF. BIRCH: Oh, {PLAYER}{KUN}!\n" .string "Let's have a look at your POKéDEX.\p" .string "… … … … … …\n" @@ -925,48 +942,50 @@ LittlerootTown_ProfessorBirchsLab_Text_1FB5F9: @ 81FB5F9 .string "You can have any one of these\n" .string "three POKéMON!$" -LittlerootTown_ProfessorBirchsLab_Text_1FB787: @ 81FB787 +LittlerootTown_ProfessorBirchsLab_Text_CanHaveAnyOneOfRarePokemon: @ 81FB787 .string "PROF. BIRCH: These are rare POKéMON\n" .string "only found in another region!\p" .string "You can have any one of these\n" .string "three POKéMON!$" -LittlerootTown_ProfessorBirchsLab_Text_1FB7F6: @ 81FB7F6 +LittlerootTown_ProfessorBirchsLab_Text_YoullTakeCyndaquil: @ 81FB7F6 .string "PROF. BIRCH: The FIRE POKéMON\n" .string "CYNDAQUIL caught your eye!\p" .string "You're as sharp as ever!\p" .string "So the CYNDAQUIL is your choice?$" -LittlerootTown_ProfessorBirchsLab_Text_1FB869: @ 81FB869 +LittlerootTown_ProfessorBirchsLab_Text_YoullTakeTotodile: @ 81FB869 .string "PROF. BIRCH: The WATER POKéMON\n" .string "TOTODILE is your choice!\p" .string "You know how to pick a good one.\p" .string "So, you'll take the TOTODILE?$" -LittlerootTown_ProfessorBirchsLab_Text_1FB8E0: @ 81FB8E0 +LittlerootTown_ProfessorBirchsLab_Text_YoullTakeChikorita: @ 81FB8E0 .string "PROF. BIRCH: The GRASS POKéMON\n" .string "CHIKORITA is your choice!\p" .string "You sure know what you're doing.\p" .string "So, you'll take the CHIKORITA?$" -LittlerootTown_ProfessorBirchsLab_Text_1FB959: @ 81FB959 +LittlerootTown_ProfessorBirchsLab_Text_TakeYourTimeAllInvaluable: @ 81FB959 .string "PROF. BIRCH: Take your time before\n" .string "you decide.\p" .string "They're all invaluable POKéMON.$" -LittlerootTown_ProfessorBirchsLab_Text_1FB9A8: @ 81FB9A8 +@ Unused +LittlerootTown_ProfessorBirchsLab_Text_PickedFinePokemon: @ 81FB9A8 .string "PROF. BIRCH: I see!\n" .string "You picked a fine POKéMON!$" -LittlerootTown_ProfessorBirchsLab_Text_1FB9D7: @ 81FB9D7 +LittlerootTown_ProfessorBirchsLab_Text_ReceivedJohtoStarter: @ 81FB9D7 .string "{PLAYER} received the {STR_VAR_1}\n" .string "from PROF. BIRCH!$" -LittlerootTown_ProfessorBirchsLab_Text_1FB9FC: @ 81FB9FC +@ Unused +LittlerootTown_ProfessorBirchsLab_Text_NicknameJohtoStarter: @ 81FB9FC .string "Want to give a nickname to\n" .string "the {STR_VAR_1} you received?$" -LittlerootTown_ProfessorBirchsLab_Text_1FBA2C: @ 81FBA2C +LittlerootTown_ProfessorBirchsLab_Text_GrassyPatchWaiting: @ 81FBA2C .string "PROF. BIRCH: Listen, {PLAYER}{KUN}.\n" .string "You've completed the HOENN POKéDEX,\l" .string "but your POKéMON journey isn't over.\p" @@ -975,15 +994,16 @@ LittlerootTown_ProfessorBirchsLab_Text_1FBA2C: @ 81FBA2C .string "Somewhere, there is a grassy patch\n" .string "that's waiting for you!$" -LittlerootTown_ProfessorBirchsLab_Text_1FBAF8: @ 81FBAF8 +LittlerootTown_ProfessorBirchsLab_Text_BetterLeaveOthersAlone: @ 81FBAF8 .string "You received the promised POKéMON.\n" .string "Better leave the others alone.$" -LittlerootTown_ProfessorBirchsLab_Text_1FBB3A: @ 81FBB3A +@ Unused +LittlerootTown_ProfessorBirchsLab_Text_DontHaveAnyRoomForPokemon: @ 81FBB3A .string "Oh, you don't have any room for\n" .string "this POKéMON.$" -LittlerootTown_ProfessorBirchsLab_Text_1FBB68: @ 81FBB68 +LittlerootTown_ProfessorBirchsLab_Text_MayWhatNextImStayingHere: @ 81FBB68 .string "MAY: {PLAYER}{KUN}, after this…\n" .string "What are you going to do?\p" .string "Are you going to keep battling\n" @@ -992,22 +1012,22 @@ LittlerootTown_ProfessorBirchsLab_Text_1FBB68: @ 81FBB68 .string "the NATIONAL POKéDEX?\p" .string "I'm staying here to help the PROF.$" -LittlerootTown_ProfessorBirchsLab_Text_1FBC2D: @ 81FBC2D +LittlerootTown_ProfessorBirchsLab_Text_BrendanPreferCollectingSlowly: @ 81FBC2D .string "BRENDAN: Rather than collecting\n" .string "POKéMON, I prefer slowly and \l" .string "steadily raising the one I chose.$" -LittlerootTown_ProfessorBirchsLab_Text_1FBC8D: @ 81FBC8D +LittlerootTown_ProfessorBirchsLab_Text_MayHaveYouGoneToBattleFrontier: @ 81FBC8D .string "MAY: Oh, hi, {PLAYER}{KUN}!\n" .string "Have you gone to that place,\l" .string "the BATTLE FRONTIER?$" -LittlerootTown_ProfessorBirchsLab_Text_1FBCD2: @ 81FBCD2 +LittlerootTown_ProfessorBirchsLab_Text_BrendanHaveYouGoneToBattleFrontier: @ 81FBCD2 .string "BRENDAN: Hey, {PLAYER}!\n" .string "Have you gone out to that place,\l" .string "the BATTLE FRONTIER?$" -LittlerootTown_ProfessorBirchsLab_Text_1FBD1A: @ 81FBD1A +LittlerootTown_ProfessorBirchsLab_Text_ScottAboardSSTidalCall: @ 81FBD1A .string "… … … … … …\n" .string "… … … … … Beep!\p" .string "SCOTT: Hi, hi, {PLAYER}!\n" diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index acb1536e8..3a0675e5e 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -305,9 +305,9 @@ PlayersHouse_1F_Movement_MomReturnToSeatFemale: @ 82929C1 PlayersHouse_1F_EventScript_Mom:: @ 82929C5 lock faceplayer - compare VAR_LITTLEROOT_HOUSES_STATE, 4 + compare VAR_LITTLEROOT_HOUSES_STATE_MAY, 4 goto_if_eq PlayersHouse_1F_EventScript_DontPushYourselfTooHard - compare VAR_LITTLEROOT_HOUSES_STATE_2, 4 + compare VAR_LITTLEROOT_HOUSES_STATE_BRENDAN, 4 goto_if_eq PlayersHouse_1F_EventScript_DontPushYourselfTooHard goto_if_set FLAG_HAS_MATCH_CALL, PlayersHouse_1F_EventScript_TryRegisterMom goto_if_set FLAG_RESCUED_BIRCH, PlayersHouse_1F_EventScript_MomHealsParty @@ -502,8 +502,8 @@ PlayersHouse_1F_EventScript_GetSSTicketAndSeeLatiTV:: @ 8292AF2 copyvar VAR_ROAMER_POKEMON, VAR_RESULT msgbox PlayersHouse_1F_Text_StillUnknownPokemon, MSGBOX_DEFAULT closemessage - setvar VAR_LITTLEROOT_HOUSES_STATE, 4 - setvar VAR_LITTLEROOT_HOUSES_STATE_2, 4 + setvar VAR_LITTLEROOT_HOUSES_STATE_MAY, 4 + setvar VAR_LITTLEROOT_HOUSES_STATE_BRENDAN, 4 releaseall end diff --git a/data/text/match_call.inc b/data/text/match_call.inc index a695b1b80..9ecdd03c7 100644 --- a/data/text/match_call.inc +++ b/data/text/match_call.inc @@ -2831,7 +2831,7 @@ gText_Steven_Pokenav_2B5ED9:: @ 82B5ED9 .string "I hope we can meet again\n" .string "somewhere!$" -Route101_Text_2B5F52: @ 82B5F52 +MatchCall_Text_BirchRegisterCall: @ 82B5F52 .string "PROF. BIRCH: Oh, {PLAYER}{KUN}!\n" .string "I've already heard about you!\p" .string "It seems your POKéNAV's been\n" @@ -2842,10 +2842,11 @@ Route101_Text_2B5F52: @ 82B5F52 .string "out in the field.\p" .string "… … … … … …$" -Route101_Text_2B603A: @ 82B603A +MatchCall_Text_RegisteredBirch: @ 82B603A .string "Registered PROF. BIRCH\n" .string "in the POKéNAV.$" +MatchCall_Text_UnusedProfBirch: .string "PROF. BIRCH: When one has both\n" .string "the POKéDEX and POKéNAV, studying\l" .string "POKéMON becomes more fun, eh?$" diff --git a/include/constants/vars.h b/include/constants/vars.h index 64ff6622b..2e3ec758e 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -144,7 +144,7 @@ #define VAR_ROUTE132_STATE 0x407F // Unused Var #define VAR_ROUTE133_STATE 0x4080 // Unused Var #define VAR_ROUTE134_STATE 0x4081 // Unused Var -#define VAR_LITTLEROOT_HOUSES_STATE 0x4082 +#define VAR_LITTLEROOT_HOUSES_STATE_MAY 0x4082 #define VAR_UNUSED_0x4083 0x4083 // Unused Var #define VAR_BIRCH_LAB_STATE 0x4084 #define VAR_PETALBURG_GYM_STATE 0x4085 // 0-1: Wally tutorial, 2-6: 0-4 badges, 7: Defeated Norman, 8: Rematch Norman @@ -154,7 +154,7 @@ #define VAR_SECRET_BASE_INITIALIZED 0x4089 #define VAR_CONTEST_PRIZE_PICKUP 0x408A #define VAR_UNUSED_0x408B 0x408B // Unused Var -#define VAR_LITTLEROOT_HOUSES_STATE_2 0x408C +#define VAR_LITTLEROOT_HOUSES_STATE_BRENDAN 0x408C #define VAR_LITTLEROOT_RIVAL_STATE 0x408D #define VAR_BOARD_BRINEY_BOAT_STATE 0x408E #define VAR_DEVON_CORP_3F_STATE 0x408F diff --git a/include/event_scripts.h b/include/event_scripts.h index b86c46df0..1a3230b31 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -554,7 +554,7 @@ extern const u8 UnusualWeather_EventScript_EndEventAndCleanup_1[]; extern const u8 IslandCave_EventScript_OpenRegiEntrance[]; extern const u8 MauvilleCity_EventScript_1DF7BA[]; extern const u8 Route119_EventScript_1F49EC[]; -extern const u8 LittlerootTown_ProfessorBirchsLab_EventScript_1FA4D6[]; +extern const u8 LittlerootTown_ProfessorBirchsLab_EventScript_ScottAboardSSTidalCall[]; extern const u8 RustboroCity_Gym_EventScript_RegisterRoxanne[]; extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_RivalRayquazaCall[]; extern const u8 SSTidalCorridor_EventScript_23C050[]; diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index bbd2ebda9..64410ff7f 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -578,7 +578,7 @@ static bool8 TryStartStepCountScript(u16 metatileBehavior) } if (ShouldDoScottCall() == TRUE) { - ScriptContext1_SetupScript(LittlerootTown_ProfessorBirchsLab_EventScript_1FA4D6); + ScriptContext1_SetupScript(LittlerootTown_ProfessorBirchsLab_EventScript_ScottAboardSSTidalCall); return TRUE; } if (ShouldDoRoxanneCall() == TRUE) diff --git a/src/save_location.c b/src/save_location.c index 2443b3161..7a9b08a09 100644 --- a/src/save_location.c +++ b/src/save_location.c @@ -118,6 +118,8 @@ void TrySetMapSaveWarpStatus(void) sub_81AFD5C(); } +// Called when receiving the Pokedex +// Only place field_A8 is written (aside from clearing on new game), never read void sub_81AFDA0(void) { gSaveBlock2Ptr->field_A8 |= 0x8000; From e19b9c9d467aa51c1ca550d2d9af4e3e9e5fd11e Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 8 Nov 2019 03:07:19 -0500 Subject: [PATCH 32/40] Resolve Littleroot merge conflict --- data/event_scripts.s | 56 +------------------ .../EverGrandeCity_HallOfFame/scripts.inc | 2 +- data/scripts/hall_of_fame.inc | 53 ++++++++++++++++++ data/specials.inc | 4 +- include/save_location.h | 2 +- src/field_specials.c | 2 +- src/save_location.c | 2 +- 7 files changed, 60 insertions(+), 61 deletions(-) create mode 100644 data/scripts/hall_of_fame.inc diff --git a/data/event_scripts.s b/data/event_scripts.s index 213784708..7bd77505c 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -645,61 +645,7 @@ Std_MsgboxAutoclose:: @ 8271494 return .include "data/scripts/new_game.inc" - -@ Below seems to be hall_of_fame.inc and briney.inc together? -EverGrandeCity_HallOfFame_EventScript_2717C1:: @ 82717C1 - special sub_81AFDD0 - setflag FLAG_IS_CHAMPION - call EverGrandeCity_HallOfFame_EventScript_ResetDefeatedEventLegendaries - compare VAR_FOSSIL_MANIAC_STATE, 0 - call_if_eq EverGrandeCity_HallOfFame_EventScript_271839 - clearflag FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS - call EverGrandeCity_HallOfFame_EventScript_ResetEliteFour - setflag FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY - clearflag FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY - clearflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY - setvar VAR_STEVENS_HOUSE_STATE, 2 - setflag FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY - clearflag FLAG_HIDE_VICTORY_ROAD_EXIT_WALLY - clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL - clearflag FLAG_HIDE_LILYCOVE_HARBOR_SSTIDAL - setflag FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS - clearflag FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION - setflag FLAG_HIDE_LILYCOVE_CITY_RIVAL - special sub_813BA60 - call_if_unset FLAG_RECEIVED_SS_TICKET, EverGrandeCity_HallOfFame_EventScript_271843 - call_if_unset FLAG_RECEIVED_BELDUM, EverGrandeCity_HallOfFame_EventScript_27183F - setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM - setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM - compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 0 - call_if_eq EverGrandeCity_HallOfFame_EventScript_271851 - return - -EverGrandeCity_HallOfFame_EventScript_ResetDefeatedEventLegendaries:: @ 8271829 - clearflag FLAG_DEFEATED_MEW - clearflag FLAG_DEFEATED_LATIAS_OR_LATIOS - clearflag FLAG_DEFEATED_DEOXYS - clearflag FLAG_DEFEATED_LUGIA - clearflag FLAG_DEFEATED_HO_OH - return - -EverGrandeCity_HallOfFame_EventScript_271839:: @ 8271839 - setvar VAR_FOSSIL_MANIAC_STATE, 1 - return - -EverGrandeCity_HallOfFame_EventScript_27183F:: @ 827183F - clearflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL - return - -EverGrandeCity_HallOfFame_EventScript_271843:: @ 8271843 - setvar VAR_LITTLEROOT_HOUSES_STATE_MAY, 3 - setvar VAR_LITTLEROOT_HOUSES_STATE_BRENDAN, 3 - clearflag FLAG_HIDE_PLAYERS_HOUSE_DAD - return - -EverGrandeCity_HallOfFame_EventScript_271851:: @ 8271851 - setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 1 - return + .include "data/scripts/hall_of_fame.inc" EventScript_WhiteOut:: @ 8271857 call EverGrandeCity_HallOfFame_EventScript_ResetEliteFour diff --git a/data/maps/EverGrandeCity_HallOfFame/scripts.inc b/data/maps/EverGrandeCity_HallOfFame/scripts.inc index 638e18eb5..53b6626a1 100644 --- a/data/maps/EverGrandeCity_HallOfFame/scripts.inc +++ b/data/maps/EverGrandeCity_HallOfFame/scripts.inc @@ -42,7 +42,7 @@ EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850 waitfieldeffect FLDEFF_HALL_OF_FAME_RECORD delay 40 setvar VAR_TEMP_1, 1 - call EverGrandeCity_HallOfFame_EventScript_2717C1 + call EverGrandeCity_HallOfFame_EventScript_SetGameClearFlags checkplayergender compare VAR_RESULT, MALE goto_if_eq EverGrandeCity_HallOfFame_EventScript_2298E9 diff --git a/data/scripts/hall_of_fame.inc b/data/scripts/hall_of_fame.inc new file mode 100644 index 000000000..91a88f348 --- /dev/null +++ b/data/scripts/hall_of_fame.inc @@ -0,0 +1,53 @@ +EverGrandeCity_HallOfFame_EventScript_SetGameClearFlags:: @ 82717C1 + special SetChampionSaveWarp + setflag FLAG_IS_CHAMPION + call EverGrandeCity_HallOfFame_EventScript_ResetDefeatedEventLegendaries + compare VAR_FOSSIL_MANIAC_STATE, 0 + call_if_eq EverGrandeCity_HallOfFame_EventScript_SetDesertUnderpassCommentReady + clearflag FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS + call EverGrandeCity_HallOfFame_EventScript_ResetEliteFour + setflag FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY + clearflag FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY + clearflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY + setvar VAR_STEVENS_HOUSE_STATE, 2 + setflag FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY + clearflag FLAG_HIDE_VICTORY_ROAD_EXIT_WALLY + clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL + clearflag FLAG_HIDE_LILYCOVE_HARBOR_SSTIDAL + setflag FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS + clearflag FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION + setflag FLAG_HIDE_LILYCOVE_CITY_RIVAL + special UpdateTrainerFanClubGameClear + call_if_unset FLAG_RECEIVED_SS_TICKET, EverGrandeCity_HallOfFame_EventScript_ReadyReceiveSSTicketEvent + call_if_unset FLAG_RECEIVED_BELDUM, EverGrandeCity_HallOfFame_EventScript_ShowStevensHouseBeldum + setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM + setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM + compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 0 + call_if_eq EverGrandeCity_HallOfFame_EventScript_ReadyDexUpgradeEvent + return + +EverGrandeCity_HallOfFame_EventScript_ResetDefeatedEventLegendaries:: @ 8271829 + clearflag FLAG_DEFEATED_MEW + clearflag FLAG_DEFEATED_LATIAS_OR_LATIOS + clearflag FLAG_DEFEATED_DEOXYS + clearflag FLAG_DEFEATED_LUGIA + clearflag FLAG_DEFEATED_HO_OH + return + +EverGrandeCity_HallOfFame_EventScript_SetDesertUnderpassCommentReady:: @ 8271839 + setvar VAR_FOSSIL_MANIAC_STATE, 1 + return + +EverGrandeCity_HallOfFame_EventScript_ShowStevensHouseBeldum:: @ 827183F + clearflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL + return + +EverGrandeCity_HallOfFame_EventScript_ReadyReceiveSSTicketEvent:: @ 8271843 + setvar VAR_LITTLEROOT_HOUSES_STATE_MAY, 3 + setvar VAR_LITTLEROOT_HOUSES_STATE_BRENDAN, 3 + clearflag FLAG_HIDE_PLAYERS_HOUSE_DAD + return + +EverGrandeCity_HallOfFame_EventScript_ReadyDexUpgradeEvent:: @ 8271851 + setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 1 + return diff --git a/data/specials.inc b/data/specials.inc index 1ec8bb230..9954ba9dc 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -180,7 +180,7 @@ gSpecials:: @ 81DBA64 def_special sub_813BA30 def_special UpdateMovedLilycoveFanClubMembers def_special sub_813BF60 - def_special sub_813BA60 + def_special UpdateTrainerFanClubGameClear def_special sub_813BF7C def_special RockSmashWildEncounter def_special GabbyAndTyGetBattleNum @@ -351,7 +351,7 @@ gSpecials:: @ 81DBA64 def_special sub_81653CC def_special DoesPartyHaveEnigmaBerry def_special ScriptRandom - def_special sub_81AFDD0 + def_special SetChampionSaveWarp def_special TryPutTreasureInvestigatorsOnAir def_special TryPutLotteryWinnerReportOnAir def_special sub_80EE72C diff --git a/include/save_location.h b/include/save_location.h index c330124ad..2eb550b1a 100644 --- a/include/save_location.h +++ b/include/save_location.h @@ -9,6 +9,6 @@ void TrySetMapSaveWarpStatus(void); void sub_81AFDA0(void); -void sub_81AFDD0(void); +void SetChampionSaveWarp(void); #endif // GUARD_SAVE_LOCATION_H diff --git a/src/field_specials.c b/src/field_specials.c index 65bc3a095..b84e4dde9 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -4033,7 +4033,7 @@ void sub_813BA30(void) } } -void sub_813BA60(void) +void UpdateTrainerFanClubGameClear(void) { if (!((gSaveBlock1Ptr->vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] >> 7) & 1)) { diff --git a/src/save_location.c b/src/save_location.c index 7a9b08a09..b31d1ac9e 100644 --- a/src/save_location.c +++ b/src/save_location.c @@ -131,7 +131,7 @@ void sub_81AFDA0(void) gSaveBlock2Ptr->field_A8 |= 0x8; } -void sub_81AFDD0(void) +void SetChampionSaveWarp(void) { gSaveBlock2Ptr->specialSaveWarpFlags |= 0x80; } From 1174a20a17aacab509cb4ea1df7b8c4689dfd4d4 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sat, 9 Nov 2019 00:49:56 -0500 Subject: [PATCH 33/40] Document Fallarbor and Verdanturf scripts --- data/event_scripts.s | 4 +- data/maps/FallarborTown/map.json | 14 +-- data/maps/FallarborTown/scripts.inc | 50 +++++----- .../RustboroCity_DevonCorp_3F/scripts.inc | 4 +- data/maps/RusturfTunnel/map.json | 4 +- data/maps/VerdanturfTown/map.json | 16 ++-- data/maps/VerdanturfTown/scripts.inc | 64 ++++++------- .../map.json | 4 +- .../scripts.inc | 68 +++++++------- data/maps/VerdanturfTown_House/map.json | 4 +- data/maps/VerdanturfTown_House/scripts.inc | 12 +-- data/maps/VerdanturfTown_WandasHouse/map.json | 14 +-- .../VerdanturfTown_WandasHouse/scripts.inc | 92 +++++++++---------- data/scripts/new_game.inc | 8 +- include/constants/flags.h | 8 +- 15 files changed, 183 insertions(+), 183 deletions(-) diff --git a/data/event_scripts.s b/data/event_scripts.s index 5600b1793..03caecd62 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -850,8 +850,8 @@ EventScript_HideMrBriney:: @ 82721F8 RusturfTunnel_EventScript_SetRusturfTunnelOpen:: @ 8272216 removeobject 1 removeobject 10 - clearflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_MAN - clearflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_WOMAN + clearflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WANDAS_BOYFRIEND + clearflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WANDA setvar VAR_RUSTURF_TUNNEL_STATE, 6 setflag FLAG_RUSTURF_TUNNEL_OPENED return diff --git a/data/maps/FallarborTown/map.json b/data/maps/FallarborTown/map.json index 9f4acc988..b0475451a 100644 --- a/data/maps/FallarborTown/map.json +++ b/data/maps/FallarborTown/map.json @@ -35,7 +35,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_EventScript_1EB22B", + "script": "FallarborTown_EventScript_Girl", "flag": "0" }, { @@ -48,7 +48,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_EventScript_1EB20C", + "script": "FallarborTown_EventScript_ExpertM", "flag": "0" }, { @@ -61,7 +61,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_EventScript_1EB234", + "script": "FallarborTown_EventScript_Gentleman", "flag": "0" }, { @@ -74,7 +74,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_EventScript_1EB23D", + "script": "FallarborTown_EventScript_Azurill", "flag": "FLAG_HIDE_FALLARBOR_AZURILL" } ], @@ -139,7 +139,7 @@ "y": 8, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "FallarborTown_EventScript_1EB250" + "script": "FallarborTown_EventScript_BattleTentSign" }, { "type": "sign", @@ -155,7 +155,7 @@ "y": 11, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "FallarborTown_EventScript_1EB259" + "script": "FallarborTown_EventScript_TownSign" }, { "type": "sign", @@ -171,7 +171,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "FallarborTown_EventScript_1EB262" + "script": "FallarborTown_EventScript_MoveTutorSign" }, { "type": "hidden_item", diff --git a/data/maps/FallarborTown/scripts.inc b/data/maps/FallarborTown/scripts.inc index 15942007b..f5e09a026 100644 --- a/data/maps/FallarborTown/scripts.inc +++ b/data/maps/FallarborTown/scripts.inc @@ -8,70 +8,70 @@ FallarborTown_OnTransition: @ 81EB200 clearflag FLAG_CONTEST_SKETCH_CREATED end -FallarborTown_EventScript_1EB20C:: @ 81EB20C +FallarborTown_EventScript_ExpertM:: @ 81EB20C lock faceplayer - goto_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, FallarborTown_EventScript_1EB221 - msgbox FallarborTown_Text_1EB26B, MSGBOX_DEFAULT + goto_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, FallarborTown_EventScript_ExpertMNormal + msgbox FallarborTown_Text_ShadyCharactersCozmosHome, MSGBOX_DEFAULT release end -FallarborTown_EventScript_1EB221:: @ 81EB221 - msgbox FallarborTown_Text_1EB2DE, MSGBOX_DEFAULT +FallarborTown_EventScript_ExpertMNormal:: @ 81EB221 + msgbox FallarborTown_Text_RegionKnownForMeteors, MSGBOX_DEFAULT release end -FallarborTown_EventScript_1EB22B:: @ 81EB22B - msgbox FallarborTown_Text_1EB35F, MSGBOX_NPC +FallarborTown_EventScript_Girl:: @ 81EB22B + msgbox FallarborTown_Text_MyPreciousAzurill, MSGBOX_NPC end -FallarborTown_EventScript_1EB234:: @ 81EB234 - msgbox FallarborTown_Text_1EB3CA, MSGBOX_NPC +FallarborTown_EventScript_Gentleman:: @ 81EB234 + msgbox FallarborTown_Text_HaveYouChallengedFlannery, MSGBOX_NPC end -FallarborTown_EventScript_1EB23D:: @ 81EB23D +FallarborTown_EventScript_Azurill:: @ 81EB23D lock faceplayer waitse playmoncry SPECIES_AZURILL, 0 - msgbox FallarborTown_Text_1EB3B5, MSGBOX_DEFAULT + msgbox FallarborTown_Text_Azurill, MSGBOX_DEFAULT waitmoncry release end -FallarborTown_EventScript_1EB250:: @ 81EB250 - msgbox FallarborTown_Text_1EB4C2, MSGBOX_SIGN +FallarborTown_EventScript_BattleTentSign:: @ 81EB250 + msgbox FallarborTown_Text_BattleTentSign, MSGBOX_SIGN end -FallarborTown_EventScript_1EB259:: @ 81EB259 - msgbox FallarborTown_Text_1EB4FE, MSGBOX_SIGN +FallarborTown_EventScript_TownSign:: @ 81EB259 + msgbox FallarborTown_Text_TownSign, MSGBOX_SIGN end -FallarborTown_EventScript_1EB262:: @ 81EB262 - msgbox FallarborTown_Text_1EB534, MSGBOX_SIGN +FallarborTown_EventScript_MoveTutorSign:: @ 81EB262 + msgbox FallarborTown_Text_MoveTutorSign, MSGBOX_SIGN end -FallarborTown_Text_1EB26B: @ 81EB26B +FallarborTown_Text_ShadyCharactersCozmosHome: @ 81EB26B .string "Something's happening,\n" .string "and I don't like it!\p" .string "I've seen shady characters wandering\n" .string "in and out of PROF. COZMO's home…$" -FallarborTown_Text_1EB2DE: @ 81EB2DE +FallarborTown_Text_RegionKnownForMeteors: @ 81EB2DE .string "This region's been known for meteors\n" .string "since the olden days.\p" .string "They say METEOR FALLS was gouged out\n" .string "by a falling meteorite long ago.$" -FallarborTown_Text_1EB35F: @ 81EB35F +FallarborTown_Text_MyPreciousAzurill: @ 81EB35F .string "See! Take a look!\n" .string "This is my precious AZURILL!\p" .string "It's slick and smooth and plushy, too!$" -FallarborTown_Text_1EB3B5: @ 81EB3B5 +FallarborTown_Text_Azurill: @ 81EB3B5 .string "AZURILL: Rooreelooo.$" -FallarborTown_Text_1EB3CA: @ 81EB3CA +FallarborTown_Text_HaveYouChallengedFlannery: @ 81EB3CA .string "Have you already challenged FLANNERY,\n" .string "the LEADER of LAVARIDGE GYM?\p" .string "The girl's grandfather was famous.\n" @@ -81,15 +81,15 @@ FallarborTown_Text_1EB3CA: @ 81EB3CA .string "become a great TRAINER in her own\l" .string "right.$" -FallarborTown_Text_1EB4C2: @ 81EB4C2 +FallarborTown_Text_BattleTentSign: @ 81EB4C2 .string "BATTLE TENT FALLARBOR SITE\n" .string "“May the Greatest Teams Gather!”$" -FallarborTown_Text_1EB4FE: @ 81EB4FE +FallarborTown_Text_TownSign: @ 81EB4FE .string "FALLARBOR TOWN\n" .string "“A farm community with small gardens.”$" -FallarborTown_Text_1EB534: @ 81EB534 +FallarborTown_Text_MoveTutorSign: @ 81EB534 .string "MOVE TUTOR'S HOUSE\n" .string "“New moves taught to POKéMON.”$" diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc index 27152e8d6..349ec616e 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc @@ -61,8 +61,8 @@ RustboroCity_DevonCorp_3F_EventScript_MeetPresident:: @ 821246E call Common_EventScript_OutOfCenterPartyHeal msgbox RustboroCity_DevonCorp_3F_Text_MrStoneGoWithCautionAndCare, MSGBOX_DEFAULT setflag FLAG_HIDE_ROUTE_116_TUNNELER - clearflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN - clearflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN + clearflag FLAG_HIDE_RUSTURF_TUNNEL_WANDAS_BOYFRIEND + clearflag FLAG_HIDE_RUSTURF_TUNNEL_WANDA clearflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY clearflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO setvar VAR_BRINEY_LOCATION, 1 diff --git a/data/maps/RusturfTunnel/map.json b/data/maps/RusturfTunnel/map.json index f01096ad4..b682f84a2 100644 --- a/data/maps/RusturfTunnel/map.json +++ b/data/maps/RusturfTunnel/map.json @@ -25,7 +25,7 @@ "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", "script": "RusturfTunnel_EventScript_WandasBoyfriend", - "flag": "FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN" + "flag": "FLAG_HIDE_RUSTURF_TUNNEL_WANDAS_BOYFRIEND" }, { "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", @@ -142,7 +142,7 @@ "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", "script": "RusturfTunnel_EventScript_Wanda", - "flag": "FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN" + "flag": "FLAG_HIDE_RUSTURF_TUNNEL_WANDA" } ], "warp_events": [ diff --git a/data/maps/VerdanturfTown/map.json b/data/maps/VerdanturfTown/map.json index 7aef48724..e3fa08b03 100644 --- a/data/maps/VerdanturfTown/map.json +++ b/data/maps/VerdanturfTown/map.json @@ -35,7 +35,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "VerdanturfTown_EventScript_1EB5A8", + "script": "VerdanturfTown_EventScript_Man", "flag": "0" }, { @@ -48,7 +48,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "VerdanturfTown_EventScript_1EB575", + "script": "VerdanturfTown_EventScript_Twin", "flag": "0" }, { @@ -61,7 +61,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "VerdanturfTown_EventScript_1EB5BA", + "script": "VerdanturfTown_EventScript_Boy", "flag": "0" }, { @@ -74,7 +74,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "VerdanturfTown_EventScript_1EB5B1", + "script": "VerdanturfTown_EventScript_Camper", "flag": "0" } ], @@ -145,7 +145,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "VerdanturfTown_EventScript_1EB5D9" + "script": "VerdanturfTown_EventScript_TownSign" }, { "type": "sign", @@ -161,7 +161,7 @@ "y": 14, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "VerdanturfTown_EventScript_1EB5E2" + "script": "VerdanturfTown_EventScript_WandasHouseSign" }, { "type": "sign", @@ -185,7 +185,7 @@ "y": 8, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "VerdanturfTown_EventScript_1EB5EB" + "script": "VerdanturfTown_EventScript_BattleTentSign" }, { "type": "sign", @@ -193,7 +193,7 @@ "y": 3, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "VerdanturfTown_EventScript_1EB5F4" + "script": "VerdanturfTown_EventScript_RusturfTunnelSign" } ] } \ No newline at end of file diff --git a/data/maps/VerdanturfTown/scripts.inc b/data/maps/VerdanturfTown/scripts.inc index bd8328db8..a4eeb00d8 100644 --- a/data/maps/VerdanturfTown/scripts.inc +++ b/data/maps/VerdanturfTown/scripts.inc @@ -7,61 +7,61 @@ VerdanturfTown_OnTransition: @ 81EB56C setvar VAR_LINK_CONTEST_ROOM_STATE, 0 end -VerdanturfTown_EventScript_1EB575:: @ 81EB575 +VerdanturfTown_EventScript_Twin:: @ 81EB575 lock faceplayer - goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_EventScript_1EB594 - msgbox VerdanturfTown_Text_1EB5FD, MSGBOX_DEFAULT + goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_EventScript_TwinTunnelOpen + msgbox VerdanturfTown_Text_ManTryingToDigTunnel, MSGBOX_DEFAULT applymovement 2, Common_Movement_FaceOriginalDirection waitmovement 0 release end -VerdanturfTown_EventScript_1EB594:: @ 81EB594 - msgbox VerdanturfTown_Text_1EB6E0, MSGBOX_DEFAULT +VerdanturfTown_EventScript_TwinTunnelOpen:: @ 81EB594 + msgbox VerdanturfTown_Text_ManDugTunnelForLove, MSGBOX_DEFAULT applymovement 2, Common_Movement_FaceOriginalDirection waitmovement 0 release end -VerdanturfTown_EventScript_1EB5A8:: @ 81EB5A8 - msgbox VerdanturfTown_Text_1EB736, MSGBOX_NPC +VerdanturfTown_EventScript_Man:: @ 81EB5A8 + msgbox VerdanturfTown_Text_AirCleanHere, MSGBOX_NPC end -VerdanturfTown_EventScript_1EB5B1:: @ 81EB5B1 - msgbox VerdanturfTown_Text_1EB7E2, MSGBOX_NPC +VerdanturfTown_EventScript_Camper:: @ 81EB5B1 + msgbox VerdanturfTown_Text_MakeBattleTentDebut, MSGBOX_NPC end -VerdanturfTown_EventScript_1EB5BA:: @ 81EB5BA +VerdanturfTown_EventScript_Boy:: @ 81EB5BA lock faceplayer - goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_EventScript_1EB5CF - msgbox VerdanturfTown_Text_1EB854, MSGBOX_DEFAULT + goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_EventScript_BoyTunnelOpen + msgbox VerdanturfTown_Text_GuyTryingToBustThroughCave, MSGBOX_DEFAULT release end -VerdanturfTown_EventScript_1EB5CF:: @ 81EB5CF - msgbox VerdanturfTown_Text_1EB935, MSGBOX_DEFAULT +VerdanturfTown_EventScript_BoyTunnelOpen:: @ 81EB5CF + msgbox VerdanturfTown_Text_EasyToGetToRustboroNow, MSGBOX_DEFAULT release end -VerdanturfTown_EventScript_1EB5D9:: @ 81EB5D9 - msgbox VerdanturfTown_Text_1EB9C4, MSGBOX_SIGN +VerdanturfTown_EventScript_TownSign:: @ 81EB5D9 + msgbox VerdanturfTown_Text_TownSign, MSGBOX_SIGN end -VerdanturfTown_EventScript_1EB5E2:: @ 81EB5E2 - msgbox VerdanturfTown_Text_1EBA11, MSGBOX_SIGN +VerdanturfTown_EventScript_WandasHouseSign:: @ 81EB5E2 + msgbox VerdanturfTown_Text_WandasHouse, MSGBOX_SIGN end -VerdanturfTown_EventScript_1EB5EB:: @ 81EB5EB - msgbox VerdanturfTown_Text_1EBA1F, MSGBOX_SIGN +VerdanturfTown_EventScript_BattleTentSign:: @ 81EB5EB + msgbox VerdanturfTown_Text_BattleTentSign, MSGBOX_SIGN end -VerdanturfTown_EventScript_1EB5F4:: @ 81EB5F4 - msgbox VerdanturfTown_Text_1EBA59, MSGBOX_SIGN +VerdanturfTown_EventScript_RusturfTunnelSign:: @ 81EB5F4 + msgbox VerdanturfTown_Text_RusturfTunnelSign, MSGBOX_SIGN end -VerdanturfTown_Text_1EB5FD: @ 81EB5FD +VerdanturfTown_Text_ManTryingToDigTunnel: @ 81EB5FD .string "My papa told me.\p" .string "He says this tunnel is full of\n" .string "timid POKéMON.\p" @@ -72,25 +72,25 @@ VerdanturfTown_Text_1EB5FD: @ 81EB5FD .string "But there's one man. He's trying to dig\n" .string "the tunnel by himself!$" -VerdanturfTown_Text_1EB6E0: @ 81EB6E0 +VerdanturfTown_Text_ManDugTunnelForLove: @ 81EB6E0 .string "There was a man who dug a tunnel for\n" .string "a lady he loved.\p" .string "I don't really get it, but hey!$" -VerdanturfTown_Text_1EB736: @ 81EB736 +VerdanturfTown_Text_AirCleanHere: @ 81EB736 .string "The way the winds blow, volcanic ash\n" .string "is never blown in this direction.\p" .string "The air is clean and delicious here.\n" .string "Living here should do wonders for even\l" .string "frail and sickly people.$" -VerdanturfTown_Text_1EB7E2: @ 81EB7E2 +VerdanturfTown_Text_MakeBattleTentDebut: @ 81EB7E2 .string "My POKéMON and I, we've been riding\n" .string "a hot winning streak.\p" .string "So I decided to make my BATTLE TENT\n" .string "debut in this town.$" -VerdanturfTown_Text_1EB854: @ 81EB854 +VerdanturfTown_Text_GuyTryingToBustThroughCave: @ 81EB854 .string "Did you see the cave next to the\n" .string "POKéMON MART?\p" .string "There's a guy in there who's trying to\n" @@ -99,25 +99,25 @@ VerdanturfTown_Text_1EB854: @ 81EB854 .string "It'd be great if we could go through…\n" .string "It'll make it easy to visit RUSTBORO.$" -VerdanturfTown_Text_1EB935: @ 81EB935 +VerdanturfTown_Text_EasyToGetToRustboroNow: @ 81EB935 .string "That cave next to the POKéMON MART\n" .string "is now a tunnel to the other side.\p" .string "It's great--it's easy to go shop for\n" .string "new DEVON products in RUSTBORO now.$" -VerdanturfTown_Text_1EB9C4: @ 81EB9C4 +VerdanturfTown_Text_TownSign: @ 81EB9C4 .string "VERDANTURF TOWN\p" .string "“The windswept highlands with the\n" .string "sweet fragrance of grass.”$" -VerdanturfTown_Text_1EBA11: @ 81EBA11 +VerdanturfTown_Text_WandasHouse: @ 81EBA11 .string "WANDA'S HOUSE$" -VerdanturfTown_Text_1EBA1F: @ 81EBA1F +VerdanturfTown_Text_BattleTentSign: @ 81EBA1F .string "BATTLE TENT VERDANTURF SITE\n" .string "“Feast Your Eyes on Battles!”$" -VerdanturfTown_Text_1EBA59: @ 81EBA59 +VerdanturfTown_Text_RusturfTunnelSign: @ 81EBA59 .string "RUSTURF TUNNEL\n" .string "“Linking RUSTBORO and VERDANTURF\p" .string "“The tunnel project has been\n" diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json b/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json index 955e00a83..fa620e682 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "VerdanturfTown_FriendshipRatersHouse_EventScript_203031", + "script": "VerdanturfTown_FriendshipRatersHouse_EventScript_FriendshipRater", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "VerdanturfTown_FriendshipRatersHouse_EventScript_2030DA", + "script": "VerdanturfTown_FriendshipRatersHouse_EventScript_Pikachu", "flag": "0" } ], diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc index 01b1e5030..993188cb2 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc @@ -1,104 +1,104 @@ VerdanturfTown_FriendshipRatersHouse_MapScripts:: @ 8203030 .byte 0 -VerdanturfTown_FriendshipRatersHouse_EventScript_203031:: @ 8203031 +VerdanturfTown_FriendshipRatersHouse_EventScript_FriendshipRater:: @ 8203031 lock faceplayer - msgbox VerdanturfTown_FriendshipRatersHouse_Text_2030ED, MSGBOX_DEFAULT + msgbox VerdanturfTown_FriendshipRatersHouse_Text_SeeHowMuchPokemonLikesYou, MSGBOX_DEFAULT specialvar VAR_RESULT, GetLeadMonFriendshipScore switch VAR_RESULT - case 0, VerdanturfTown_FriendshipRatersHouse_EventScript_203094 - case 1, VerdanturfTown_FriendshipRatersHouse_EventScript_20309E - case 2, VerdanturfTown_FriendshipRatersHouse_EventScript_2030A8 - case 3, VerdanturfTown_FriendshipRatersHouse_EventScript_2030B2 - case 4, VerdanturfTown_FriendshipRatersHouse_EventScript_2030BC - case 5, VerdanturfTown_FriendshipRatersHouse_EventScript_2030C6 - case 6, VerdanturfTown_FriendshipRatersHouse_EventScript_2030D0 + case 0, VerdanturfTown_FriendshipRatersHouse_EventScript_DetestsYou + case 1, VerdanturfTown_FriendshipRatersHouse_EventScript_VeryWary + case 2, VerdanturfTown_FriendshipRatersHouse_EventScript_NotUsedToYou + case 3, VerdanturfTown_FriendshipRatersHouse_EventScript_GettingUsedToYou + case 4, VerdanturfTown_FriendshipRatersHouse_EventScript_LikesYouQuiteALot + case 5, VerdanturfTown_FriendshipRatersHouse_EventScript_VeryHappy + case 6, VerdanturfTown_FriendshipRatersHouse_EventScript_AdoresYou release end -VerdanturfTown_FriendshipRatersHouse_EventScript_203094:: @ 8203094 - msgbox VerdanturfTown_FriendshipRatersHouse_Text_2032DF, MSGBOX_DEFAULT +VerdanturfTown_FriendshipRatersHouse_EventScript_DetestsYou:: @ 8203094 + msgbox VerdanturfTown_FriendshipRatersHouse_Text_DetestsYou, MSGBOX_DEFAULT release end -VerdanturfTown_FriendshipRatersHouse_EventScript_20309E:: @ 820309E - msgbox VerdanturfTown_FriendshipRatersHouse_Text_203288, MSGBOX_DEFAULT +VerdanturfTown_FriendshipRatersHouse_EventScript_VeryWary:: @ 820309E + msgbox VerdanturfTown_FriendshipRatersHouse_Text_VeryWary, MSGBOX_DEFAULT release end -VerdanturfTown_FriendshipRatersHouse_EventScript_2030A8:: @ 82030A8 - msgbox VerdanturfTown_FriendshipRatersHouse_Text_203249, MSGBOX_DEFAULT +VerdanturfTown_FriendshipRatersHouse_EventScript_NotUsedToYou:: @ 82030A8 + msgbox VerdanturfTown_FriendshipRatersHouse_Text_NotUsedToYou, MSGBOX_DEFAULT release end -VerdanturfTown_FriendshipRatersHouse_EventScript_2030B2:: @ 82030B2 - msgbox VerdanturfTown_FriendshipRatersHouse_Text_203213, MSGBOX_DEFAULT +VerdanturfTown_FriendshipRatersHouse_EventScript_GettingUsedToYou:: @ 82030B2 + msgbox VerdanturfTown_FriendshipRatersHouse_Text_GettingUsedToYou, MSGBOX_DEFAULT release end -VerdanturfTown_FriendshipRatersHouse_EventScript_2030BC:: @ 82030BC - msgbox VerdanturfTown_FriendshipRatersHouse_Text_2031D1, MSGBOX_DEFAULT +VerdanturfTown_FriendshipRatersHouse_EventScript_LikesYouQuiteALot:: @ 82030BC + msgbox VerdanturfTown_FriendshipRatersHouse_Text_LikesYouQuiteALot, MSGBOX_DEFAULT release end -VerdanturfTown_FriendshipRatersHouse_EventScript_2030C6:: @ 82030C6 - msgbox VerdanturfTown_FriendshipRatersHouse_Text_203192, MSGBOX_DEFAULT +VerdanturfTown_FriendshipRatersHouse_EventScript_VeryHappy:: @ 82030C6 + msgbox VerdanturfTown_FriendshipRatersHouse_Text_VeryHappy, MSGBOX_DEFAULT release end -VerdanturfTown_FriendshipRatersHouse_EventScript_2030D0:: @ 82030D0 - msgbox VerdanturfTown_FriendshipRatersHouse_Text_203141, MSGBOX_DEFAULT +VerdanturfTown_FriendshipRatersHouse_EventScript_AdoresYou:: @ 82030D0 + msgbox VerdanturfTown_FriendshipRatersHouse_Text_AdoresYou, MSGBOX_DEFAULT release end -VerdanturfTown_FriendshipRatersHouse_EventScript_2030DA:: @ 82030DA +VerdanturfTown_FriendshipRatersHouse_EventScript_Pikachu:: @ 82030DA lock faceplayer waitse playmoncry SPECIES_PIKACHU, 0 - msgbox VerdanturfTown_FriendshipRatersHouse_Text_20334A, MSGBOX_DEFAULT + msgbox VerdanturfTown_FriendshipRatersHouse_Text_Pikachu, MSGBOX_DEFAULT waitmoncry release end -VerdanturfTown_FriendshipRatersHouse_Text_2030ED: @ 82030ED +VerdanturfTown_FriendshipRatersHouse_Text_SeeHowMuchPokemonLikesYou: @ 82030ED .string "Let me see your POKéMON.\n" .string "I'll check to see how much it likes you.\p" .string "Oh.\n" .string "Your POKéMON…$" -VerdanturfTown_FriendshipRatersHouse_Text_203141: @ 8203141 +VerdanturfTown_FriendshipRatersHouse_Text_AdoresYou: @ 8203141 .string "It adores you.\n" .string "It can't possibly love you any more.\l" .string "I even feel happy seeing it.$" -VerdanturfTown_FriendshipRatersHouse_Text_203192: @ 8203192 +VerdanturfTown_FriendshipRatersHouse_Text_VeryHappy: @ 8203192 .string "It seems to be very happy.\n" .string "It obviously likes you a whole lot.$" -VerdanturfTown_FriendshipRatersHouse_Text_2031D1: @ 82031D1 +VerdanturfTown_FriendshipRatersHouse_Text_LikesYouQuiteALot: @ 82031D1 .string "It likes you quite a lot.\n" .string "It seems to want to be babied a little.$" -VerdanturfTown_FriendshipRatersHouse_Text_203213: @ 8203213 +VerdanturfTown_FriendshipRatersHouse_Text_GettingUsedToYou: @ 8203213 .string "It's getting used to you.\n" .string "It seems to believe in you.$" -VerdanturfTown_FriendshipRatersHouse_Text_203249: @ 8203249 +VerdanturfTown_FriendshipRatersHouse_Text_NotUsedToYou: @ 8203249 .string "It's not very used to you yet.\n" .string "It neither loves nor hates you.$" -VerdanturfTown_FriendshipRatersHouse_Text_203288: @ 8203288 +VerdanturfTown_FriendshipRatersHouse_Text_VeryWary: @ 8203288 .string "It's very wary.\n" .string "It has scary viciousness in its eyes.\l" .string "It doesn't like you much at all.$" -VerdanturfTown_FriendshipRatersHouse_Text_2032DF: @ 82032DF +VerdanturfTown_FriendshipRatersHouse_Text_DetestsYou: @ 82032DF .string "This is a little hard for me to say…\p" .string "Your POKéMON simply detests you.\n" .string "Doesn't that make you uncomfortable?$" -VerdanturfTown_FriendshipRatersHouse_Text_20334A: @ 820334A +VerdanturfTown_FriendshipRatersHouse_Text_Pikachu: @ 820334A .string "PIKACHU: Pika pika!$" diff --git a/data/maps/VerdanturfTown_House/map.json b/data/maps/VerdanturfTown_House/map.json index 9a357b495..f50e62a4e 100644 --- a/data/maps/VerdanturfTown_House/map.json +++ b/data/maps/VerdanturfTown_House/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "VerdanturfTown_House_EventScript_20335F", + "script": "VerdanturfTown_House_EventScript_Woman1", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "VerdanturfTown_House_EventScript_203368", + "script": "VerdanturfTown_House_EventScript_Woman2", "flag": "0" } ], diff --git a/data/maps/VerdanturfTown_House/scripts.inc b/data/maps/VerdanturfTown_House/scripts.inc index c6028c784..5f47e52fa 100644 --- a/data/maps/VerdanturfTown_House/scripts.inc +++ b/data/maps/VerdanturfTown_House/scripts.inc @@ -1,21 +1,21 @@ VerdanturfTown_House_MapScripts:: @ 820335E .byte 0 -VerdanturfTown_House_EventScript_20335F:: @ 820335F - msgbox VerdanturfTown_House_Text_203371, MSGBOX_NPC +VerdanturfTown_House_EventScript_Woman1:: @ 820335F + msgbox VerdanturfTown_House_Text_TrainersGatherAtPokemonLeague, MSGBOX_NPC end -VerdanturfTown_House_EventScript_203368:: @ 8203368 - msgbox VerdanturfTown_House_Text_2033EE, MSGBOX_NPC +VerdanturfTown_House_EventScript_Woman2:: @ 8203368 + msgbox VerdanturfTown_House_Text_DefeatEliteFourInARow, MSGBOX_NPC end -VerdanturfTown_House_Text_203371: @ 8203371 +VerdanturfTown_House_Text_TrainersGatherAtPokemonLeague: @ 8203371 .string "Far away, deep in EVER GRANDE CITY,\n" .string "is the POKéMON LEAGUE.\p" .string "The TRAINERS who gather there are\n" .string "all frighteningly well skilled.$" -VerdanturfTown_House_Text_2033EE: @ 82033EE +VerdanturfTown_House_Text_DefeatEliteFourInARow: @ 82033EE .string "In the POKéMON LEAGUE, I think the\n" .string "rules say that you have to battle the\l" .string "ELITE FOUR all in a row.\p" diff --git a/data/maps/VerdanturfTown_WandasHouse/map.json b/data/maps/VerdanturfTown_WandasHouse/map.json index 514b2581e..c09a61274 100644 --- a/data/maps/VerdanturfTown_WandasHouse/map.json +++ b/data/maps/VerdanturfTown_WandasHouse/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "VerdanturfTown_WandasHouse_EventScript_2028BF", + "script": "VerdanturfTown_WandasHouse_EventScript_Wally", "flag": "FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY" }, { @@ -37,8 +37,8 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "VerdanturfTown_WandasHouse_EventScript_202913", - "flag": "FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_MAN" + "script": "VerdanturfTown_WandasHouse_EventScript_WandasBoyfriend", + "flag": "FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WANDAS_BOYFRIEND" }, { "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "VerdanturfTown_WandasHouse_EventScript_2028E1", + "script": "VerdanturfTown_WandasHouse_EventScript_WallysUncle", "flag": "FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "VerdanturfTown_WandasHouse_EventScript_20294E", + "script": "VerdanturfTown_WandasHouse_EventScript_WallysAunt", "flag": "0" }, { @@ -76,8 +76,8 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "VerdanturfTown_WandasHouse_EventScript_20291C", - "flag": "FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_WOMAN" + "script": "VerdanturfTown_WandasHouse_EventScript_Wanda", + "flag": "FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WANDA" } ], "warp_events": [ diff --git a/data/maps/VerdanturfTown_WandasHouse/scripts.inc b/data/maps/VerdanturfTown_WandasHouse/scripts.inc index c63aa3fa1..25d37a762 100644 --- a/data/maps/VerdanturfTown_WandasHouse/scripts.inc +++ b/data/maps/VerdanturfTown_WandasHouse/scripts.inc @@ -1,88 +1,88 @@ VerdanturfTown_WandasHouse_MapScripts:: @ 82028BE .byte 0 -VerdanturfTown_WandasHouse_EventScript_2028BF:: @ 82028BF +VerdanturfTown_WandasHouse_EventScript_Wally:: @ 82028BF lock faceplayer - goto_if_set FLAG_WALLY_SPEECH, VerdanturfTown_WandasHouse_EventScript_2028D7 - msgbox VerdanturfTown_WandasHouse_Text_202993, MSGBOX_DEFAULT + goto_if_set FLAG_WALLY_SPEECH, VerdanturfTown_WandasHouse_EventScript_WallyShortSpeech + msgbox VerdanturfTown_WandasHouse_Text_StrongerSpeech, MSGBOX_DEFAULT setflag FLAG_WALLY_SPEECH release end -VerdanturfTown_WandasHouse_EventScript_2028D7:: @ 82028D7 - msgbox VerdanturfTown_WandasHouse_Text_202ABE, MSGBOX_DEFAULT +VerdanturfTown_WandasHouse_EventScript_WallyShortSpeech:: @ 82028D7 + msgbox VerdanturfTown_WandasHouse_Text_StrongerSpeechShort, MSGBOX_DEFAULT release end -VerdanturfTown_WandasHouse_EventScript_2028E1:: @ 82028E1 +VerdanturfTown_WandasHouse_EventScript_WallysUncle:: @ 82028E1 lock faceplayer - goto_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, VerdanturfTown_WandasHouse_EventScript_202909 - goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, VerdanturfTown_WandasHouse_EventScript_2028FF - msgbox VerdanturfTown_WandasHouse_Text_202B37, MSGBOX_DEFAULT + goto_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, VerdanturfTown_WandasHouse_EventScript_WallysUncleEverGrande + goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, VerdanturfTown_WandasHouse_EventScript_WallysUncleSlippedOff + msgbox VerdanturfTown_WandasHouse_Text_WallysNextDoor, MSGBOX_DEFAULT release end -VerdanturfTown_WandasHouse_EventScript_2028FF:: @ 82028FF - msgbox VerdanturfTown_WandasHouse_Text_202C20, MSGBOX_DEFAULT +VerdanturfTown_WandasHouse_EventScript_WallysUncleSlippedOff:: @ 82028FF + msgbox VerdanturfTown_WandasHouse_Text_WallySlippedOff, MSGBOX_DEFAULT release end -VerdanturfTown_WandasHouse_EventScript_202909:: @ 8202909 - msgbox VerdanturfTown_WandasHouse_Text_202C4E, MSGBOX_DEFAULT +VerdanturfTown_WandasHouse_EventScript_WallysUncleEverGrande:: @ 8202909 + msgbox VerdanturfTown_WandasHouse_Text_WallyGoneThatFar, MSGBOX_DEFAULT release end -VerdanturfTown_WandasHouse_EventScript_202913:: @ 8202913 - msgbox VerdanturfTown_WandasHouse_Text_202E00, MSGBOX_NPC +VerdanturfTown_WandasHouse_EventScript_WandasBoyfriend:: @ 8202913 + msgbox VerdanturfTown_WandasHouse_Text_CanSeeGirlfriendEveryDay, MSGBOX_NPC end -VerdanturfTown_WandasHouse_EventScript_20291C:: @ 820291C +VerdanturfTown_WandasHouse_EventScript_Wanda:: @ 820291C lock faceplayer - goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, VerdanturfTown_WandasHouse_EventScript_202944 - goto_if_set FLAG_DEFEATED_WALLY_MAUVILLE, VerdanturfTown_WandasHouse_EventScript_20293A - msgbox VerdanturfTown_WandasHouse_Text_202D91, MSGBOX_DEFAULT + goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, VerdanturfTown_WandasHouse_EventScript_WandaDontWorry + goto_if_set FLAG_DEFEATED_WALLY_MAUVILLE, VerdanturfTown_WandasHouse_EventScript_MeetWanda + msgbox VerdanturfTown_WandasHouse_Text_DontWorryAboutWally, MSGBOX_DEFAULT release end -VerdanturfTown_WandasHouse_EventScript_20293A:: @ 820293A - msgbox VerdanturfTown_WandasHouse_Text_202CCF, MSGBOX_DEFAULT +VerdanturfTown_WandasHouse_EventScript_MeetWanda:: @ 820293A + msgbox VerdanturfTown_WandasHouse_Text_MeetWanda, MSGBOX_DEFAULT release end -VerdanturfTown_WandasHouse_EventScript_202944:: @ 8202944 - msgbox VerdanturfTown_WandasHouse_Text_202D91, MSGBOX_DEFAULT +VerdanturfTown_WandasHouse_EventScript_WandaDontWorry:: @ 8202944 + msgbox VerdanturfTown_WandasHouse_Text_DontWorryAboutWally, MSGBOX_DEFAULT release end -VerdanturfTown_WandasHouse_EventScript_20294E:: @ 820294E +VerdanturfTown_WandasHouse_EventScript_WallysAunt:: @ 820294E lock faceplayer - goto_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, VerdanturfTown_WandasHouse_EventScript_202989 - goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, VerdanturfTown_WandasHouse_EventScript_20297F - goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_WandasHouse_EventScript_202975 - msgbox VerdanturfTown_WandasHouse_Text_202E47, MSGBOX_DEFAULT + goto_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, VerdanturfTown_WandasHouse_EventScript_WallysAuntEverGrande + goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, VerdanturfTown_WandasHouse_EventScript_WallysAuntAnythingHappened + goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_WandasHouse_EventScript_WallysAuntTunnelOpen + msgbox VerdanturfTown_WandasHouse_Text_DaughtersBoyfriendDriven, MSGBOX_DEFAULT release end -VerdanturfTown_WandasHouse_EventScript_202975:: @ 8202975 - msgbox VerdanturfTown_WandasHouse_Text_202F19, MSGBOX_DEFAULT +VerdanturfTown_WandasHouse_EventScript_WallysAuntTunnelOpen:: @ 8202975 + msgbox VerdanturfTown_WandasHouse_Text_DaughtersBoyfriendWasDigging, MSGBOX_DEFAULT release end -VerdanturfTown_WandasHouse_EventScript_20297F:: @ 820297F - msgbox VerdanturfTown_WandasHouse_Text_202F73, MSGBOX_DEFAULT +VerdanturfTown_WandasHouse_EventScript_WallysAuntAnythingHappened:: @ 820297F + msgbox VerdanturfTown_WandasHouse_Text_IfAnythingHappenedToWally, MSGBOX_DEFAULT release end -VerdanturfTown_WandasHouse_EventScript_202989:: @ 8202989 - msgbox VerdanturfTown_WandasHouse_Text_202FDB, MSGBOX_DEFAULT +VerdanturfTown_WandasHouse_EventScript_WallysAuntEverGrande:: @ 8202989 + msgbox VerdanturfTown_WandasHouse_Text_WallyWasInEverGrande, MSGBOX_DEFAULT release end -VerdanturfTown_WandasHouse_Text_202993: @ 8202993 +VerdanturfTown_WandasHouse_Text_StrongerSpeech: @ 8202993 .string "WALLY: I lost to you, {PLAYER}, but I'm\n" .string "not feeling down anymore.\p" .string "Because I have a new purpose in life.\n" @@ -94,13 +94,13 @@ VerdanturfTown_WandasHouse_Text_202993: @ 8202993 .string "When I do, I'm going to challenge you\n" .string "to another battle.$" -VerdanturfTown_WandasHouse_Text_202ABE: @ 8202ABE +VerdanturfTown_WandasHouse_Text_StrongerSpeechShort: @ 8202ABE .string "WALLY: Please watch me, {PLAYER}.\n" .string "I'm going to get stronger than you.\p" .string "When I do, I'm going to challenge you\n" .string "to another battle.$" -VerdanturfTown_WandasHouse_Text_202B37: @ 8202B37 +VerdanturfTown_WandasHouse_Text_WallysNextDoor: @ 8202B37 .string "UNCLE: Oh! {PLAYER}{KUN}!\n" .string "WALLY's next door.\p" .string "But, boy, there's something I have to\n" @@ -111,18 +111,18 @@ VerdanturfTown_WandasHouse_Text_202B37: @ 8202B37 .string "It could be POKéMON that are giving\l" .string "the boy hope.$" -VerdanturfTown_WandasHouse_Text_202C20: @ 8202C20 +VerdanturfTown_WandasHouse_Text_WallySlippedOff: @ 8202C20 .string "WALLY's gone away…\n" .string "He slipped off on his own…$" -VerdanturfTown_WandasHouse_Text_202C4E: @ 8202C4E +VerdanturfTown_WandasHouse_Text_WallyGoneThatFar: @ 8202C4E .string "UNCLE: Is that right?\n" .string "WALLY's gone away that far all by\l" .string "himself…\p" .string "Well, I have to give him credit--he is\n" .string "my little brother's son.$" -VerdanturfTown_WandasHouse_Text_202CCF: @ 8202CCF +VerdanturfTown_WandasHouse_Text_MeetWanda: @ 8202CCF .string "WANDA: You are?\n" .string "Oh, right, I get it!\p" .string "You're the {PLAYER} who WALLY was\n" @@ -132,18 +132,18 @@ VerdanturfTown_WandasHouse_Text_202CCF: @ 8202CCF .string "I think WALLY's become a lot more lively\n" .string "and healthy since he came here.$" -VerdanturfTown_WandasHouse_Text_202D91: @ 8202D91 +VerdanturfTown_WandasHouse_Text_DontWorryAboutWally: @ 8202D91 .string "WANDA: Don't worry about WALLY.\n" .string "He'll be just fine.\p" .string "I know my little cousin, and he has\n" .string "POKéMON with him, too.$" -VerdanturfTown_WandasHouse_Text_202E00: @ 8202E00 +VerdanturfTown_WandasHouse_Text_CanSeeGirlfriendEveryDay: @ 8202E00 .string "Thanks to you, I can see my girlfriend\n" .string "every day.\l" .string "Happy? You bet I am!$" -VerdanturfTown_WandasHouse_Text_202E47: @ 8202E47 +VerdanturfTown_WandasHouse_Text_DaughtersBoyfriendDriven: @ 8202E47 .string "My daughter's boyfriend is a very\n" .string "driven and passionate sort of person.\p" .string "He's been digging a tunnel nonstop\n" @@ -151,17 +151,17 @@ VerdanturfTown_WandasHouse_Text_202E47: @ 8202E47 .string "My daughter's a little concerned,\n" .string "so she goes out to the tunnel a lot.$" -VerdanturfTown_WandasHouse_Text_202F19: @ 8202F19 +VerdanturfTown_WandasHouse_Text_DaughtersBoyfriendWasDigging: @ 8202F19 .string "It's amazing. My daughter's boyfriend\n" .string "was digging the tunnel by hand!\p" .string "It's so incredible!$" -VerdanturfTown_WandasHouse_Text_202F73: @ 8202F73 +VerdanturfTown_WandasHouse_Text_IfAnythingHappenedToWally: @ 8202F73 .string "If anything were to happen to WALLY,\n" .string "I would never be able to look his\l" .string "parents in PETALBURG in the eye…$" -VerdanturfTown_WandasHouse_Text_202FDB: @ 8202FDB +VerdanturfTown_WandasHouse_Text_WallyWasInEverGrande: @ 8202FDB .string "WALLY was in EVER GRANDE?\p" .string "His parents in PETALBURG would be\n" .string "astonished to hear that!$" diff --git a/data/scripts/new_game.inc b/data/scripts/new_game.inc index cba1c68ba..b1ecae203 100644 --- a/data/scripts/new_game.inc +++ b/data/scripts/new_game.inc @@ -138,9 +138,9 @@ EventScript_ResetAllMapFlags:: @ 82715DE setflag FLAG_HIDE_SLATEPORT_CITY_CONTEST_REPORTER setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY - setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_MAN + setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WANDAS_BOYFRIEND setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE - setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_WOMAN + setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WANDA setflag FLAG_HIDE_VERDANTURF_TOWN_SCOTT setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE setflag FLAG_HIDE_PETALBURG_GYM_WALLY @@ -170,8 +170,8 @@ EventScript_ResetAllMapFlags:: @ 82715DE setflag FLAG_HIDE_ROUTE_116_MR_BRINEY setflag FLAG_HIDE_RUSTURF_TUNNEL_PEEKO setflag FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT - setflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN - setflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN + setflag FLAG_HIDE_RUSTURF_TUNNEL_WANDAS_BOYFRIEND + setflag FLAG_HIDE_RUSTURF_TUNNEL_WANDA setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_ARCHIE setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_1 setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_2 diff --git a/include/constants/flags.h b/include/constants/flags.h index 0ab22c1ef..4722593a9 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -847,8 +847,8 @@ #define FLAG_HIDE_MAUVILLE_CITY_WALLY 0x324 #define FLAG_HIDE_MAUVILLE_CITY_WALLYS_UNCLE 0x325 #define FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY 0x326 -#define FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN 0x327 -#define FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_MAN 0x328 +#define FLAG_HIDE_RUSTURF_TUNNEL_WANDAS_BOYFRIEND 0x327 +#define FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WANDAS_BOYFRIEND 0x328 #define FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE 0x329 #define FLAG_HIDE_SS_TIDAL_CORRIDOR_SCOTT 0x32A #define FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CYNDAQUIL 0x32B @@ -1023,8 +1023,8 @@ #define FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE 0x3D4 #define FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE_VISIBLE 0x3D5 #define FLAG_HIDE_ROUTE_120_KECLEON_1 0x3D6 -#define FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN 0x3D7 -#define FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_WOMAN 0x3D8 +#define FLAG_HIDE_RUSTURF_TUNNEL_WANDA 0x3D7 +#define FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WANDA 0x3D8 #define FLAG_HIDE_ROUTE_120_KECLEON_2 0x3D9 #define FLAG_HIDE_ROUTE_120_KECLEON_3 0x3DA #define FLAG_HIDE_ROUTE_120_KECLEON_4 0x3DB From a38bff8c17fa416bb7d74db45de0d24a136e2706 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sat, 9 Nov 2019 03:07:32 -0500 Subject: [PATCH 34/40] Document Slateport scripts --- asm/berry_crush.s | 6 +- data/event_scripts.s | 4 +- data/maps/SlateportCity/map.json | 92 +-- data/maps/SlateportCity/scripts.inc | 687 +++++++++--------- data/maps/SlateportCity_Harbor/map.json | 16 +- data/maps/SlateportCity_Harbor/scripts.inc | 329 ++++----- .../map.json | 8 +- data/maps/SlateportCity_House/scripts.inc | 23 + data/maps/SlateportCity_House1/scripts.inc | 121 --- data/maps/SlateportCity_House2/scripts.inc | 23 - .../map.json | 6 +- .../SlateportCity_NameRatersHouse/scripts.inc | 121 +++ .../SlateportCity_PokemonFanClub/map.json | 16 +- .../SlateportCity_PokemonFanClub/scripts.inc | 268 +++---- .../SlateportCity_SternsShipyard_1F/map.json | 8 +- .../scripts.inc | 60 +- .../SlateportCity_SternsShipyard_2F/map.json | 4 +- .../scripts.inc | 12 +- data/maps/map_groups.json | 4 +- data/scripts/interview.inc | 2 +- data/specials.inc | 10 +- include/constants/map_groups.h | 4 +- src/field_specials.c | 10 +- src/tv.c | 15 +- 24 files changed, 924 insertions(+), 925 deletions(-) rename data/maps/{SlateportCity_House2 => SlateportCity_House}/map.json (87%) create mode 100644 data/maps/SlateportCity_House/scripts.inc delete mode 100644 data/maps/SlateportCity_House1/scripts.inc delete mode 100644 data/maps/SlateportCity_House2/scripts.inc rename data/maps/{SlateportCity_House1 => SlateportCity_NameRatersHouse}/map.json (86%) create mode 100644 data/maps/SlateportCity_NameRatersHouse/scripts.inc diff --git a/asm/berry_crush.s b/asm/berry_crush.s index 8d44c7269..b6d07662e 100755 --- a/asm/berry_crush.s +++ b/asm/berry_crush.s @@ -1223,8 +1223,8 @@ _080224C0: bx r0 thumb_func_end sub_8022250 - thumb_func_start sub_80224D0 -sub_80224D0: @ 80224D0 + thumb_func_start ShowBerryCrushRankings +ShowBerryCrushRankings: @ 80224D0 push {lr} bl ScriptContext2_Enable ldr r0, =sub_8022250 @@ -1259,7 +1259,7 @@ sub_80224D0: @ 80224D0 pop {r0} bx r0 .pool - thumb_func_end sub_80224D0 + thumb_func_end ShowBerryCrushRankings thumb_func_start sub_8022524 sub_8022524: @ 8022524 diff --git a/data/event_scripts.s b/data/event_scripts.s index 03caecd62..fba1cce26 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -206,12 +206,12 @@ gStdScripts_End:: @ 81DC2CC .include "data/maps/SlateportCity_BattleTentLobby/scripts.inc" .include "data/maps/SlateportCity_BattleTentCorridor/scripts.inc" .include "data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc" - .include "data/maps/SlateportCity_House1/scripts.inc" + .include "data/maps/SlateportCity_NameRatersHouse/scripts.inc" .include "data/maps/SlateportCity_PokemonFanClub/scripts.inc" .include "data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc" .include "data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc" .include "data/maps/SlateportCity_Harbor/scripts.inc" - .include "data/maps/SlateportCity_House2/scripts.inc" + .include "data/maps/SlateportCity_House/scripts.inc" .include "data/maps/SlateportCity_PokemonCenter_1F/scripts.inc" .include "data/maps/SlateportCity_PokemonCenter_2F/scripts.inc" .include "data/maps/SlateportCity_Mart/scripts.inc" diff --git a/data/maps/SlateportCity/map.json b/data/maps/SlateportCity/map.json index f548b7349..53c482597 100644 --- a/data/maps/SlateportCity/map.json +++ b/data/maps/SlateportCity/map.json @@ -40,7 +40,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_1DCED9", + "script": "SlateportCity_EventScript_FatMan", "flag": "0" }, { @@ -53,7 +53,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_1DCEF6", + "script": "SlateportCity_EventScript_Man1", "flag": "0" }, { @@ -66,7 +66,7 @@ "movement_range_y": 2, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_1DCEB8", + "script": "SlateportCity_EventScript_RichBoy", "flag": "0" }, { @@ -79,7 +79,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_1DCF17", + "script": "SlateportCity_EventScript_Woman1", "flag": "0" }, { @@ -92,7 +92,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_1DD009", + "script": "SlateportCity_EventScript_AquaGrunt1", "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, { @@ -105,7 +105,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_1DCE42", + "script": "SlateportCity_EventScript_Cook", "flag": "0" }, { @@ -118,7 +118,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_1DCE63", + "script": "SlateportCity_EventScript_OldWoman", "flag": "0" }, { @@ -131,7 +131,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_1DCE84", + "script": "SlateportCity_EventScript_Girl", "flag": "0" }, { @@ -144,7 +144,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_1DD353", + "script": "SlateportCity_EventScript_Ty", "flag": "FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY" }, { @@ -157,7 +157,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_1DD35C", + "script": "SlateportCity_EventScript_Gabby", "flag": "FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY" }, { @@ -170,7 +170,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_1DD1F8", + "script": "SlateportCity_EventScript_CaptStern", "flag": "FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN" }, { @@ -183,7 +183,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_1DCFE5", + "script": "SlateportCity_EventScript_Sailor1", "flag": "0" }, { @@ -196,7 +196,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_1DCFEE", + "script": "SlateportCity_EventScript_Sailor2", "flag": "0" }, { @@ -209,7 +209,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_1DCFF7", + "script": "SlateportCity_EventScript_PokefanF", "flag": "0" }, { @@ -222,7 +222,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_1DD000", + "script": "SlateportCity_EventScript_Man2", "flag": "0" }, { @@ -235,7 +235,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_1DCFBB", + "script": "SlateportCity_EventScript_Maniac", "flag": "0" }, { @@ -248,7 +248,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_1DCFDC", + "script": "SlateportCity_EventScript_Woman2", "flag": "0" }, { @@ -261,7 +261,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_1DD020", + "script": "SlateportCity_EventScript_AquaGrunt2", "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, { @@ -274,7 +274,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_1DD037", + "script": "SlateportCity_EventScript_AquaGrunt3", "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, { @@ -287,7 +287,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_1DD198", + "script": "SlateportCity_EventScript_DecorClerk", "flag": "0" }, { @@ -300,7 +300,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_1DD16A", + "script": "SlateportCity_EventScript_DollClerk", "flag": "0" }, { @@ -313,7 +313,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_1DD365", + "script": "SlateportCity_EventScript_Man3", "flag": "0" }, { @@ -326,7 +326,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_1DCDE4", + "script": "SlateportCity_EventScript_EffortRibbonWoman", "flag": "0" }, { @@ -339,7 +339,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_1DD1D8", + "script": "SlateportCity_EventScript_PowerTMClerk", "flag": "FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN" }, { @@ -352,7 +352,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_1DCDBD", + "script": "SlateportCity_EventScript_EnergyGuru", "flag": "0" }, { @@ -365,7 +365,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_1DD04E", + "script": "SlateportCity_EventScript_AquaGrunt4", "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, { @@ -378,7 +378,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_1DD065", + "script": "SlateportCity_EventScript_AquaGrunt5", "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, { @@ -391,7 +391,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_1DD07C", + "script": "SlateportCity_EventScript_AquaGrunt6", "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, { @@ -404,7 +404,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_1DD093", + "script": "SlateportCity_EventScript_AquaGrunt7", "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, { @@ -417,7 +417,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_1DD0AA", + "script": "SlateportCity_EventScript_AquaGrunt8", "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, { @@ -430,7 +430,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_1DD0C1", + "script": "SlateportCity_EventScript_AquaGrunt9", "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, { @@ -443,7 +443,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_1DD14A", + "script": "SlateportCity_EventScript_AquaGrunt10", "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, { @@ -456,7 +456,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_1DD153", + "script": "SlateportCity_EventScript_AquaGrunt11", "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, { @@ -469,7 +469,7 @@ "movement_range_y": 2, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_1DD36E", + "script": "SlateportCity_EventScript_BerryPowderClerk", "flag": "0" }, { @@ -533,7 +533,7 @@ "x": 5, "y": 19, "elevation": 0, - "dest_map": "MAP_SLATEPORT_CITY_HOUSE1", + "dest_map": "MAP_SLATEPORT_CITY_NAME_RATERS_HOUSE", "dest_warp_id": 0 }, { @@ -561,7 +561,7 @@ "x": 21, "y": 44, "elevation": 0, - "dest_map": "MAP_SLATEPORT_CITY_HOUSE2", + "dest_map": "MAP_SLATEPORT_CITY_HOUSE", "dest_warp_id": 0 } ], @@ -573,7 +573,7 @@ "elevation": 3, "var": "VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE", "var_value": "2", - "script": "SlateportCity_EventScript_1DD5DC" + "script": "SlateportCity_EventScript_ScottBattleTentScene" } ], "bg_events": [ @@ -583,7 +583,7 @@ "y": 19, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_EventScript_1DCFB2" + "script": "SlateportCity_EventScript_NameRatersHouseSign" }, { "type": "sign", @@ -615,7 +615,7 @@ "y": 12, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_EventScript_1DCF94" + "script": "SlateportCity_EventScript_HarborSign" }, { "type": "sign", @@ -631,7 +631,7 @@ "y": 51, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_EventScript_1DCF8B" + "script": "SlateportCity_EventScript_MarketSign" }, { "type": "sign", @@ -639,7 +639,7 @@ "y": 26, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_EventScript_1DCF79" + "script": "SlateportCity_EventScript_OceanicMuseumSign" }, { "type": "sign", @@ -647,7 +647,7 @@ "y": 22, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_EventScript_1DCF82" + "script": "SlateportCity_EventScript_CitySign" }, { "type": "sign", @@ -655,7 +655,7 @@ "y": 26, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_EventScript_1DCF70" + "script": "SlateportCity_EventScript_PokemonFanClubSign" }, { "type": "sign", @@ -663,7 +663,7 @@ "y": 13, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_EventScript_1DCF36" + "script": "SlateportCity_EventScript_BattleTentSign" }, { "type": "sign", @@ -671,7 +671,7 @@ "y": 38, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_EventScript_1DCF3F" + "script": "SlateportCity_EventScript_SternsShipyardSign" }, { "type": "sign", @@ -679,7 +679,7 @@ "y": 36, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "SlateportCity_EventScript_1DD643" + "script": "SlateportCity_EventScript_BerryCrushRankingsSign" } ] } \ No newline at end of file diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index ee9c0c176..83dd8b420 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -1,24 +1,24 @@ SlateportCity_MapScripts:: @ 81DCC61 map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_OnTransition - map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_MapScript2_1DCD12 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_OnFrame .byte 0 SlateportCity_OnTransition: @ 81DCC6C setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 0 - call SlateportCity_EventScript_1DCC8D + call SlateportCity_EventScript_EnterSlateport compare VAR_SLATEPORT_CITY_STATE, 1 - call_if_eq SlateportCity_EventScript_1DCC99 + call_if_eq SlateportCity_EventScript_MovePeopleForSternInterview compare VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE, 1 - call_if_eq SlateportCity_EventScript_1DCCE7 + call_if_eq SlateportCity_EventScript_SetReadyForScottScene end -SlateportCity_EventScript_1DCC8D:: @ 81DCC8D +SlateportCity_EventScript_EnterSlateport:: @ 81DCC8D setflag FLAG_VISITED_SLATEPORT_CITY setvar VAR_LINK_CONTEST_ROOM_STATE, 0 setflag FLAG_HIDE_SLATEPORT_CITY_CONTEST_REPORTER return -SlateportCity_EventScript_1DCC99:: @ 81DCC99 +SlateportCity_EventScript_MovePeopleForSternInterview:: @ 81DCC99 setobjectxyperm 11, 28, 13 setobjectxyperm 7, 25, 13 setobjectxyperm 3, 25, 14 @@ -35,50 +35,50 @@ SlateportCity_EventScript_1DCC99:: @ 81DCC99 setobjectmovementtype 2, MOVEMENT_TYPE_FACE_LEFT return -SlateportCity_EventScript_1DCCE7:: @ 81DCCE7 +SlateportCity_EventScript_SetReadyForScottScene:: @ 81DCCE7 setflag FLAG_HIDE_MAP_NAME_POPUP getplayerxy VAR_0x8004, VAR_0x8005 compare VAR_0x8004, 30 - goto_if_eq SlateportCity_EventScript_1DCD06 + goto_if_eq SlateportCity_EventScript_MoveScottLeft setobjectxyperm 35, 23, 27 setobjectmovementtype 35, MOVEMENT_TYPE_FACE_RIGHT return -SlateportCity_EventScript_1DCD06:: @ 81DCD06 +SlateportCity_EventScript_MoveScottLeft:: @ 81DCD06 setobjectxyperm 35, 22, 27 setobjectmovementtype 35, MOVEMENT_TYPE_FACE_RIGHT return -SlateportCity_MapScript2_1DCD12: @ 81DCD12 - map_script_2 VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE, 1, SlateportCity_EventScript_1DCD1C +SlateportCity_OnFrame: @ 81DCD12 + map_script_2 VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE, 1, SlateportCity_EventScript_ScottScene .2byte 0 -SlateportCity_EventScript_1DCD1C:: @ 81DCD1C +SlateportCity_EventScript_ScottScene:: @ 81DCD1C lockall addobject 35 - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_1DCDA8 - applymovement 35, SlateportCity_Movement_1DCDAC + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_PlayerFaceScott + applymovement 35, SlateportCity_Movement_ScottApproachPlayer waitmovement 0 - msgbox SlateportCity_Text_1DF032, MSGBOX_DEFAULT + msgbox SlateportCity_Text_YouDroveTeamAquaAway, MSGBOX_DEFAULT closemessage applymovement 35, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 delay 60 - msgbox SlateportCity_Text_1DF0FE, MSGBOX_DEFAULT + msgbox SlateportCity_Text_MaybeThisTrainer, MSGBOX_DEFAULT applymovement 35, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - msgbox SlateportCity_Text_1DF12B, MSGBOX_DEFAULT + msgbox SlateportCity_Text_LetsRegisterEachOther, MSGBOX_DEFAULT closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox SlateportCity_Text_1DF1A6, MSGBOX_DEFAULT + msgbox SlateportCity_Text_RegisteredScott, MSGBOX_DEFAULT waitfanfare closemessage delay 30 setflag FLAG_ENABLE_SCOTT_MATCH_CALL - msgbox SlateportCity_Text_1DF1D3, MSGBOX_DEFAULT + msgbox SlateportCity_Text_KeepEyeOnTrainersBeSeeingYou, MSGBOX_DEFAULT closemessage - applymovement 35, SlateportCity_Movement_1DCDB4 + applymovement 35, SlateportCity_Movement_ScottExit waitmovement 0 removeobject 35 setobjectxyperm 35, 10, 12 @@ -89,13 +89,13 @@ SlateportCity_EventScript_1DCD1C:: @ 81DCD1C releaseall end -SlateportCity_Movement_1DCDA8: @ 81DCDA8 +SlateportCity_Movement_PlayerFaceScott: @ 81DCDA8 delay_16 delay_8 walk_in_place_fastest_left step_end -SlateportCity_Movement_1DCDAC: @ 81DCDAC +SlateportCity_Movement_ScottApproachPlayer: @ 81DCDAC walk_right walk_right walk_right @@ -105,7 +105,7 @@ SlateportCity_Movement_1DCDAC: @ 81DCDAC walk_right step_end -SlateportCity_Movement_1DCDB4: @ 81DCDB4 +SlateportCity_Movement_ScottExit: @ 81DCDB4 walk_left walk_left walk_left @@ -116,17 +116,17 @@ SlateportCity_Movement_1DCDB4: @ 81DCDB4 walk_left step_end -SlateportCity_EventScript_1DCDBD:: @ 81DCDBD +SlateportCity_EventScript_EnergyGuru:: @ 81DCDBD lock faceplayer - message SlateportCity_Text_1DD64A + message SlateportCity_Text_EnergyGuruSellWhatYouNeed waitmessage - pokemart SlateportCity_Pokemart_1DCDD4 + pokemart SlateportCity_Pokemart_EnergyGuru msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end -SlateportCity_Pokemart_1DCDD4: @ 81DCDD4 +SlateportCity_Pokemart_EnergyGuru: @ 81DCDD4 .2byte ITEM_PROTEIN .2byte ITEM_IRON .2byte ITEM_CARBOS @@ -137,304 +137,305 @@ SlateportCity_Pokemart_1DCDD4: @ 81DCDD4 release end -SlateportCity_EventScript_1DCDE4:: @ 81DCDE4 +SlateportCity_EventScript_EffortRibbonWoman:: @ 81DCDE4 lock faceplayer bufferleadmonspeciesname 0 - msgbox SlateportCity_Text_1DD68A, MSGBOX_DEFAULT + msgbox SlateportCity_Text_OhYourPokemon, MSGBOX_DEFAULT specialvar VAR_RESULT, LeadMonHasEffortRibbon - compare VAR_RESULT, 1 - call_if_eq SlateportCity_EventScript_1DCE38 + compare VAR_RESULT, TRUE + call_if_eq SlateportCity_EventScript_MonHasEffortRibbon specialvar VAR_RESULT, Special_AreLeadMonEVsMaxedOut - compare VAR_RESULT, 0 - call_if_eq SlateportCity_EventScript_1DCE2E - msgbox SlateportCity_Text_1DD697, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + call_if_eq SlateportCity_EventScript_MonEVsNotMaxed + msgbox SlateportCity_Text_PleaseGiveItThisEffortRibbon, MSGBOX_DEFAULT playfanfare MUS_FANFA4 - message SlateportCity_Text_1DD6E3 + message SlateportCity_Text_ReceivedEffortRibbon waitfanfare - msgbox SlateportCity_Text_1DD702, MSGBOX_DEFAULT + msgbox SlateportCity_Text_PutEffortRibbonOnMon, MSGBOX_DEFAULT special GiveLeadMonEffortRibbon release end -SlateportCity_EventScript_1DCE2E:: @ 81DCE2E - msgbox SlateportCity_Text_1DD722, MSGBOX_DEFAULT +SlateportCity_EventScript_MonEVsNotMaxed:: @ 81DCE2E + msgbox SlateportCity_Text_GoForItLittleHarder, MSGBOX_DEFAULT release end -SlateportCity_EventScript_1DCE38:: @ 81DCE38 - msgbox SlateportCity_Text_1DD77B, MSGBOX_DEFAULT +SlateportCity_EventScript_MonHasEffortRibbon:: @ 81DCE38 + msgbox SlateportCity_Text_EffortRibbonLooksGoodOnIt, MSGBOX_DEFAULT release end -SlateportCity_EventScript_1DCE42:: @ 81DCE42 +SlateportCity_EventScript_Cook:: @ 81DCE42 lock faceplayer compare VAR_SLATEPORT_CITY_STATE, 1 - call_if_eq SlateportCity_EventScript_1DCE59 - msgbox SlateportCity_Text_1DD81A, MSGBOX_DEFAULT + call_if_eq SlateportCity_EventScript_CookSternInterview + msgbox SlateportCity_Text_SeaweedFullOfLife, MSGBOX_DEFAULT release end -SlateportCity_EventScript_1DCE59:: @ 81DCE59 - msgbox SlateportCity_Text_1DE3E2, MSGBOX_DEFAULT +SlateportCity_EventScript_CookSternInterview:: @ 81DCE59 + msgbox SlateportCity_Text_CaptainComeBackWithBigFish, MSGBOX_DEFAULT release end -SlateportCity_EventScript_1DCE63:: @ 81DCE63 +SlateportCity_EventScript_OldWoman:: @ 81DCE63 lock faceplayer compare VAR_SLATEPORT_CITY_STATE, 1 - call_if_eq SlateportCity_EventScript_1DCE7A - msgbox SlateportCity_Text_1DD8A6, MSGBOX_DEFAULT + call_if_eq SlateportCity_EventScript_OldWomanSternInterview + msgbox SlateportCity_Text_HowTownIsBornAndGrows, MSGBOX_DEFAULT release end -SlateportCity_EventScript_1DCE7A:: @ 81DCE7A - msgbox SlateportCity_Text_1DE28E, MSGBOX_DEFAULT +SlateportCity_EventScript_OldWomanSternInterview:: @ 81DCE7A + msgbox SlateportCity_Text_CaptSternBeingInterviewed, MSGBOX_DEFAULT release end -SlateportCity_EventScript_1DCE84:: @ 81DCE84 +SlateportCity_EventScript_Girl:: @ 81DCE84 lock faceplayer compare VAR_SLATEPORT_CITY_STATE, 1 - call_if_eq SlateportCity_EventScript_1DCEA4 - goto_if_set FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_1DCEAE - msgbox SlateportCity_Text_1DD93D, MSGBOX_DEFAULT + call_if_eq SlateportCity_EventScript_GirlSternInterview + goto_if_set FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_GirlSecretBase + msgbox SlateportCity_Text_SlateportWonderfulPlace, MSGBOX_DEFAULT release end -SlateportCity_EventScript_1DCEA4:: @ 81DCEA4 - msgbox SlateportCity_Text_1DE30C, MSGBOX_DEFAULT +SlateportCity_EventScript_GirlSternInterview:: @ 81DCEA4 + msgbox SlateportCity_Text_InterviewerSoCool, MSGBOX_DEFAULT release end -SlateportCity_EventScript_1DCEAE:: @ 81DCEAE - msgbox SlateportCity_Text_1DD999, MSGBOX_DEFAULT +SlateportCity_EventScript_GirlSecretBase:: @ 81DCEAE + msgbox SlateportCity_Text_BuyBricksSoDecorWontGetDirty, MSGBOX_DEFAULT release end -SlateportCity_EventScript_1DCEB8:: @ 81DCEB8 +SlateportCity_EventScript_RichBoy:: @ 81DCEB8 lock faceplayer compare VAR_SLATEPORT_CITY_STATE, 1 - call_if_eq SlateportCity_EventScript_1DCECF - msgbox SlateportCity_Text_1DDA34, MSGBOX_DEFAULT + call_if_eq SlateportCity_EventScript_RichBoySternInterview + msgbox SlateportCity_Text_GoingToCompeteInBattleTent, MSGBOX_DEFAULT release end -SlateportCity_EventScript_1DCECF:: @ 81DCECF - msgbox SlateportCity_Text_1DE376, MSGBOX_DEFAULT +SlateportCity_EventScript_RichBoySternInterview:: @ 81DCECF + msgbox SlateportCity_Text_SternSaysDiscoveredSomething, MSGBOX_DEFAULT release end -SlateportCity_EventScript_1DCED9:: @ 81DCED9 +SlateportCity_EventScript_FatMan:: @ 81DCED9 compare VAR_SLATEPORT_CITY_STATE, 1 - goto_if_eq SlateportCity_EventScript_1DCEED - msgbox SlateportCity_Text_1DDA9A, MSGBOX_NPC + goto_if_eq SlateportCity_EventScript_FatManSternInterview + msgbox SlateportCity_Text_BushedHikingFromMauville, MSGBOX_NPC end -SlateportCity_EventScript_1DCEED:: @ 81DCEED - msgbox SlateportCity_Text_1DE43D, MSGBOX_SIGN +SlateportCity_EventScript_FatManSternInterview:: @ 81DCEED + msgbox SlateportCity_Text_AmIOnTV, MSGBOX_SIGN end -SlateportCity_EventScript_1DCEF6:: @ 81DCEF6 +SlateportCity_EventScript_Man1:: @ 81DCEF6 lock faceplayer compare VAR_SLATEPORT_CITY_STATE, 1 - call_if_eq SlateportCity_EventScript_1DCF0D - msgbox SlateportCity_Text_1DDB21, MSGBOX_DEFAULT + call_if_eq SlateportCity_EventScript_Man1SternInterview + msgbox SlateportCity_Text_EveryoneCallsHimCaptStern, MSGBOX_DEFAULT release end -SlateportCity_EventScript_1DCF0D:: @ 81DCF0D - msgbox SlateportCity_Text_1DE460, MSGBOX_DEFAULT +SlateportCity_EventScript_Man1SternInterview:: @ 81DCF0D + msgbox SlateportCity_Text_CaptainsACelebrity, MSGBOX_DEFAULT release end -SlateportCity_EventScript_1DCF17:: @ 81DCF17 +SlateportCity_EventScript_Woman1:: @ 81DCF17 lock faceplayer - goto_if_set FLAG_DOCK_REJECTED_DEVON_GOODS, SlateportCity_EventScript_1DCF2C - msgbox SlateportCity_Text_1DDBAC, MSGBOX_DEFAULT + goto_if_set FLAG_DOCK_REJECTED_DEVON_GOODS, SlateportCity_EventScript_Woman1AquaGone + msgbox SlateportCity_Text_WhatsLongLineOverThere, MSGBOX_DEFAULT release end -SlateportCity_EventScript_1DCF2C:: @ 81DCF2C - msgbox SlateportCity_Text_1DDBD5, MSGBOX_DEFAULT +SlateportCity_EventScript_Woman1AquaGone:: @ 81DCF2C + msgbox SlateportCity_Text_VisitedMuseumOften, MSGBOX_DEFAULT release end -SlateportCity_EventScript_1DCF36:: @ 81DCF36 - msgbox SlateportCity_Text_1DE8BC, MSGBOX_SIGN +SlateportCity_EventScript_BattleTentSign:: @ 81DCF36 + msgbox SlateportCity_Text_BattleTentSign, MSGBOX_SIGN end -SlateportCity_EventScript_1DCF3F:: @ 81DCF3F +SlateportCity_EventScript_SternsShipyardSign:: @ 81DCF3F lockall - goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_EventScript_1DCF66 - goto_if_set FLAG_BADGE07_GET, SlateportCity_EventScript_1DCF5C - msgbox SlateportCity_Text_1DE8F8, MSGBOX_DEFAULT + goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_EventScript_SternsShipyardFerryComplete + goto_if_set FLAG_BADGE07_GET, SlateportCity_EventScript_SternsShipyardNearsCompletion + msgbox SlateportCity_Text_SternsShipyardWantedSign, MSGBOX_DEFAULT releaseall end -SlateportCity_EventScript_1DCF5C:: @ 81DCF5C - msgbox SlateportCity_Text_1DE940, MSGBOX_DEFAULT +SlateportCity_EventScript_SternsShipyardNearsCompletion:: @ 81DCF5C + msgbox SlateportCity_Text_SternsShipyardNearsCompletion, MSGBOX_DEFAULT releaseall end -SlateportCity_EventScript_1DCF66:: @ 81DCF66 - msgbox SlateportCity_Text_1DE9AA, MSGBOX_DEFAULT +SlateportCity_EventScript_SternsShipyardFerryComplete:: @ 81DCF66 + msgbox SlateportCity_Text_SternsShipyardFerryComplete, MSGBOX_DEFAULT releaseall end -SlateportCity_EventScript_1DCF70:: @ 81DCF70 - msgbox SlateportCity_Text_1DEA0B, MSGBOX_SIGN +SlateportCity_EventScript_PokemonFanClubSign:: @ 81DCF70 + msgbox SlateportCity_Text_PokemonFanClubSign, MSGBOX_SIGN end -SlateportCity_EventScript_1DCF79:: @ 81DCF79 - msgbox SlateportCity_Text_1DEA3B, MSGBOX_SIGN +SlateportCity_EventScript_OceanicMuseumSign:: @ 81DCF79 + msgbox SlateportCity_Text_OceanicMuseumSign, MSGBOX_SIGN end -SlateportCity_EventScript_1DCF82:: @ 81DCF82 - msgbox SlateportCity_Text_1DEA6F, MSGBOX_SIGN +SlateportCity_EventScript_CitySign:: @ 81DCF82 + msgbox SlateportCity_Text_CitySign, MSGBOX_SIGN end -SlateportCity_EventScript_1DCF8B:: @ 81DCF8B - msgbox SlateportCity_Text_1DEAAF, MSGBOX_SIGN +SlateportCity_EventScript_MarketSign:: @ 81DCF8B + msgbox SlateportCity_Text_MarketSign, MSGBOX_SIGN end -SlateportCity_EventScript_1DCF94:: @ 81DCF94 +SlateportCity_EventScript_HarborSign:: @ 81DCF94 lockall - goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_EventScript_1DCFA8 - msgbox SlateportCity_Text_1DEAE3, MSGBOX_DEFAULT + goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_EventScript_HarborSignFerryComplete + msgbox SlateportCity_Text_HarborFerryUnderConstruction, MSGBOX_DEFAULT releaseall end -SlateportCity_EventScript_1DCFA8:: @ 81DCFA8 - msgbox SlateportCity_Text_1DEB5A, MSGBOX_DEFAULT +SlateportCity_EventScript_HarborSignFerryComplete:: @ 81DCFA8 + msgbox SlateportCity_Text_HarborSign, MSGBOX_DEFAULT releaseall end -SlateportCity_EventScript_1DCFB2:: @ 81DCFB2 - msgbox SlateportCity_Text_1DEBA0, MSGBOX_SIGN +SlateportCity_EventScript_NameRatersHouseSign:: @ 81DCFB2 + msgbox SlateportCity_Text_NameRatersHouseSign, MSGBOX_SIGN end -SlateportCity_EventScript_1DCFBB:: @ 81DCFBB +SlateportCity_EventScript_Maniac:: @ 81DCFBB lock faceplayer compare VAR_SLATEPORT_CITY_STATE, 1 - call_if_eq SlateportCity_EventScript_1DCFD2 - msgbox SlateportCity_Text_1DE10E, MSGBOX_DEFAULT + call_if_eq SlateportCity_EventScript_ManiacSternInterview + msgbox SlateportCity_Text_GetNameRaterToHelpYou, MSGBOX_DEFAULT release end -SlateportCity_EventScript_1DCFD2:: @ 81DCFD2 - msgbox SlateportCity_Text_1DE10E, MSGBOX_DEFAULT +@ Unclear if the text here was meant to be different, but its not +SlateportCity_EventScript_ManiacSternInterview:: @ 81DCFD2 + msgbox SlateportCity_Text_GetNameRaterToHelpYou, MSGBOX_DEFAULT release end -SlateportCity_EventScript_1DCFDC:: @ 81DCFDC - msgbox SlateportCity_Text_1DE16C, MSGBOX_NPC +SlateportCity_EventScript_Woman2:: @ 81DCFDC + msgbox SlateportCity_Text_CantChangeTradeMonName, MSGBOX_NPC end -SlateportCity_EventScript_1DCFE5:: @ 81DCFE5 - msgbox SlateportCity_Text_1DDFF7, MSGBOX_NPC +SlateportCity_EventScript_Sailor1:: @ 81DCFE5 + msgbox SlateportCity_Text_SeaIsSoWet, MSGBOX_NPC end -SlateportCity_EventScript_1DCFEE:: @ 81DCFEE - msgbox SlateportCity_Text_1DE04B, MSGBOX_NPC +SlateportCity_EventScript_Sailor2:: @ 81DCFEE + msgbox SlateportCity_Text_SinkOldBoats, MSGBOX_NPC end -SlateportCity_EventScript_1DCFF7:: @ 81DCFF7 - msgbox SlateportCity_Text_1DE0D2, MSGBOX_NPC +SlateportCity_EventScript_PokefanF:: @ 81DCFF7 + msgbox SlateportCity_Text_BuyTooMuch, MSGBOX_NPC end -SlateportCity_EventScript_1DD000:: @ 81DD000 - msgbox SlateportCity_Text_1DE1EC, MSGBOX_NPC +SlateportCity_EventScript_Man2:: @ 81DD000 + msgbox SlateportCity_Text_BattleTentBuiltRecently, MSGBOX_NPC end -SlateportCity_EventScript_1DD009:: @ 81DD009 +SlateportCity_EventScript_AquaGrunt1:: @ 81DD009 lock faceplayer - msgbox SlateportCity_Text_1DDC4F, MSGBOX_DEFAULT + msgbox SlateportCity_Text_QuitPushing, MSGBOX_DEFAULT closemessage applymovement 5, Common_Movement_FaceOriginalDirection waitmovement 0 release end -SlateportCity_EventScript_1DD020:: @ 81DD020 +SlateportCity_EventScript_AquaGrunt2:: @ 81DD020 lock faceplayer - msgbox SlateportCity_Text_1DDC8A, MSGBOX_DEFAULT + msgbox SlateportCity_Text_AquaHasPolicy, MSGBOX_DEFAULT closemessage applymovement 18, Common_Movement_FaceOriginalDirection waitmovement 0 release end -SlateportCity_EventScript_1DD037:: @ 81DD037 +SlateportCity_EventScript_AquaGrunt3:: @ 81DD037 lock faceplayer - msgbox SlateportCity_Text_1DDCD5, MSGBOX_DEFAULT + msgbox SlateportCity_Text_BossIsBrilliant, MSGBOX_DEFAULT closemessage applymovement 19, Common_Movement_FaceOriginalDirection waitmovement 0 release end -SlateportCity_EventScript_1DD04E:: @ 81DD04E +SlateportCity_EventScript_AquaGrunt4:: @ 81DD04E lock faceplayer - msgbox SlateportCity_Text_1DDD18, MSGBOX_DEFAULT + msgbox SlateportCity_Text_WhatsNewSchemeIWonder, MSGBOX_DEFAULT closemessage applymovement 26, Common_Movement_FaceOriginalDirection waitmovement 0 release end -SlateportCity_EventScript_1DD065:: @ 81DD065 +SlateportCity_EventScript_AquaGrunt5:: @ 81DD065 lock faceplayer - msgbox SlateportCity_Text_1DDD7D, MSGBOX_DEFAULT + msgbox SlateportCity_Text_ShouldTakeItAll, MSGBOX_DEFAULT closemessage applymovement 27, Common_Movement_FaceOriginalDirection waitmovement 0 release end -SlateportCity_EventScript_1DD07C:: @ 81DD07C +SlateportCity_EventScript_AquaGrunt6:: @ 81DD07C lock faceplayer - msgbox SlateportCity_Text_1DDDC0, MSGBOX_DEFAULT + msgbox SlateportCity_Text_DontButtIn, MSGBOX_DEFAULT closemessage applymovement 28, Common_Movement_FaceOriginalDirection waitmovement 0 release end -SlateportCity_EventScript_1DD093:: @ 81DD093 +SlateportCity_EventScript_AquaGrunt7:: @ 81DD093 lock faceplayer - msgbox SlateportCity_Text_1DDDDF, MSGBOX_DEFAULT + msgbox SlateportCity_Text_RemindsMeOfLongLineForGames, MSGBOX_DEFAULT closemessage applymovement 29, Common_Movement_FaceOriginalDirection waitmovement 0 release end -SlateportCity_EventScript_1DD0AA:: @ 81DD0AA +SlateportCity_EventScript_AquaGrunt8:: @ 81DD0AA lock faceplayer - msgbox SlateportCity_Text_1DDE2F, MSGBOX_DEFAULT + msgbox SlateportCity_Text_WhyAreWeLiningUp, MSGBOX_DEFAULT closemessage applymovement 30, Common_Movement_FaceOriginalDirection waitmovement 0 release end -SlateportCity_EventScript_1DD0C1:: @ 81DD0C1 +SlateportCity_EventScript_AquaGrunt9:: @ 81DD0C1 lock faceplayer playse SE_PIN @@ -442,51 +443,51 @@ SlateportCity_EventScript_1DD0C1:: @ 81DD0C1 waitmovement 0 applymovement 31, Common_Movement_Delay48 waitmovement 0 - msgbox SlateportCity_Text_1DDE6E, MSGBOX_DEFAULT + msgbox SlateportCity_Text_WhatDoYouWant, MSGBOX_DEFAULT closemessage applymovement 31, Common_Movement_FaceOriginalDirection waitmovement 0 - applymovement 31, SlateportCity_Movement_1DD147 + applymovement 31, SlateportCity_Movement_DelayAquaGrunt waitmovement 0 applymovement 31, Common_Movement_FacePlayer waitmovement 0 - msgbox SlateportCity_Text_1DDE86, MSGBOX_DEFAULT + msgbox SlateportCity_Text_IllReadSignForYou, MSGBOX_DEFAULT closemessage applymovement 31, Common_Movement_FaceOriginalDirection waitmovement 0 - applymovement 31, SlateportCity_Movement_1DD147 + applymovement 31, SlateportCity_Movement_DelayAquaGrunt waitmovement 0 - msgbox SlateportCity_Text_1DDEB8, MSGBOX_DEFAULT + msgbox SlateportCity_Text_SaysSomethingLikeSeaIsEndless, MSGBOX_DEFAULT closemessage applymovement 31, Common_Movement_FacePlayer waitmovement 0 - applymovement 31, SlateportCity_Movement_1DD147 + applymovement 31, SlateportCity_Movement_DelayAquaGrunt waitmovement 0 applymovement 31, Common_Movement_FaceOriginalDirection waitmovement 0 release end -SlateportCity_Movement_1DD147: @ 81DD147 +SlateportCity_Movement_DelayAquaGrunt: @ 81DD147 delay_16 delay_16 step_end -SlateportCity_EventScript_1DD14A:: @ 81DD14A - msgbox SlateportCity_Text_1DDF32, MSGBOX_SIGN +SlateportCity_EventScript_AquaGrunt10:: @ 81DD14A + msgbox SlateportCity_Text_ShouldveBroughtMyGameBoy, MSGBOX_SIGN end -SlateportCity_EventScript_1DD153:: @ 81DD153 +SlateportCity_EventScript_AquaGrunt11:: @ 81DD153 lock faceplayer - msgbox SlateportCity_Text_1DDF8D, MSGBOX_DEFAULT + msgbox SlateportCity_Text_HotSpringsAfterOperation, MSGBOX_DEFAULT closemessage applymovement 33, Common_Movement_FaceOriginalDirection waitmovement 0 release end -SlateportCity_EventScript_1DD16A:: @ 81DD16A +SlateportCity_EventScript_DollClerk:: @ 81DD16A lock faceplayer message gText_HowMayIServeYou @@ -505,23 +506,23 @@ SlateportCity_PokemartDecor_Dolls: @ 81DD184 release end -SlateportCity_EventScript_1DD18E:: @ 81DD18E +SlateportCity_EventScript_ComeBackWithSecretPower:: @ 81DD18E msgbox gText_ComeBackWithSecretPower, MSGBOX_DEFAULT release end -SlateportCity_EventScript_1DD198:: @ 81DD198 +SlateportCity_EventScript_DecorClerk:: @ 81DD198 lock faceplayer - goto_if_unset FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_1DD18E + goto_if_unset FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_ComeBackWithSecretPower message gText_HowMayIServeYou waitmessage - pokemartdecoration SlateportCity_PokemartDecor_1DD1B8 + pokemartdecoration SlateportCity_PokemartDecor msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end -SlateportCity_PokemartDecor_1DD1B8: @ 81DD1B8 +SlateportCity_PokemartDecor: @ 81DD1B8 .2byte DECOR_RED_BRICK .2byte DECOR_BLUE_BRICK .2byte DECOR_YELLOW_BRICK @@ -540,28 +541,29 @@ SlateportCity_PokemartDecor_1DD1B8: @ 81DD1B8 release end -SlateportCity_EventScript_1DD1D8:: @ 81DD1D8 +SlateportCity_EventScript_PowerTMClerk:: @ 81DD1D8 lock faceplayer message gText_HowMayIServeYou waitmessage - pokemart SlateportCity_Pokemart_1DD1F0 + pokemart SlateportCity_Pokemart_PowerTMs msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -SlateportCity_Pokemart_1DD1F0: @ 81DD1F0 - .2byte ITEM_TM10 - .2byte ITEM_TM43 +SlateportCity_Pokemart_PowerTMs: @ 81DD1F0 + .2byte ITEM_TM10 @ Hidden Power + .2byte ITEM_TM43 @ Secret Power .2byte ITEM_NONE release end -SlateportCity_EventScript_1DD1F8:: @ 81DD1F8 +@ Scene with Capt Sterns interview and Team Aqua announcing plans to steal Submarine +SlateportCity_EventScript_CaptStern:: @ 81DD1F8 lockall - msgbox SlateportCity_Text_1DE502, MSGBOX_DEFAULT - msgbox SlateportCity_Text_1DE54A, MSGBOX_DEFAULT + msgbox SlateportCity_Text_SternMoveAheadWithExploration, MSGBOX_DEFAULT + msgbox SlateportCity_Text_GabbyWonderfulThanksForInterview, MSGBOX_DEFAULT closemessage applymovement 10, Common_Movement_WalkInPlaceFastestRight waitmovement 0 @@ -569,28 +571,28 @@ SlateportCity_EventScript_1DD1F8:: @ 81DD1F8 applymovement 9, Common_Movement_WalkInPlaceFastestDown waitmovement 0 delay 25 - applymovement 11, SlateportCity_Movement_1DD33C - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_1DD34A - applymovement 10, SlateportCity_Movement_1DD319 - applymovement 9, SlateportCity_Movement_1DD326 + applymovement 11, SlateportCity_Movement_SternWatchGabbyAndTyExit + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_PlayerFaceStern + applymovement 10, SlateportCity_Movement_GabbyExit + applymovement 9, SlateportCity_Movement_TyExit waitmovement 0 removeobject 10 removeobject 9 - msgbox SlateportCity_Text_1DE5F7, MSGBOX_DEFAULT + msgbox SlateportCity_Text_SternWhewFirstInterview, MSGBOX_DEFAULT applymovement 11, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - msgbox SlateportCity_Text_1DE64F, MSGBOX_DEFAULT + msgbox SlateportCity_Text_OhPlayerWeMadeDiscovery, MSGBOX_DEFAULT playbgm MUS_AQA_0, 0 - msgbox SlateportCity_Text_1DE724, MSGBOX_DEFAULT + msgbox SlateportCity_Text_AquaWillAssumeControlOfSubmarine, MSGBOX_DEFAULT applymovement 6, Common_Movement_WalkInPlaceFastestLeft applymovement 1, Common_Movement_WalkInPlaceFastestLeft - applymovement 7, SlateportCity_Movement_1DD309 + applymovement 7, SlateportCity_Movement_OldWomanConcern applymovement 3, Common_Movement_QuestionMark - applymovement 2, SlateportCity_Movement_1DD311 + applymovement 2, SlateportCity_Movement_ManConcern waitmovement 0 applymovement 11, Common_Movement_WalkInPlaceFastestDown waitmovement 0 - msgbox SlateportCity_Text_1DE7F7, MSGBOX_DEFAULT + msgbox SlateportCity_Text_SternWhatWasAllThat, MSGBOX_DEFAULT playse SE_PIN applymovement 11, Common_Movement_ExclamationMark waitmovement 0 @@ -598,11 +600,11 @@ SlateportCity_EventScript_1DD1F8:: @ 81DD1F8 waitmovement 0 applymovement 11, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - msgbox SlateportCity_Text_1DE860, MSGBOX_DEFAULT - msgbox SlateportCity_Text_1DE8A0, MSGBOX_DEFAULT + msgbox SlateportCity_Text_FromHarborTryingToTakeSub, MSGBOX_DEFAULT + msgbox SlateportCity_Text_PleaseComeWithMe, MSGBOX_DEFAULT closemessage - applymovement 11, SlateportCity_Movement_1DD337 - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_1DD344 + applymovement 11, SlateportCity_Movement_SternEnterHarbor + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_PlayerEnterHarbor waitmovement 0 removeobject 11 clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_CAPTAIN_STERN @@ -615,7 +617,7 @@ SlateportCity_EventScript_1DD1F8:: @ 81DD1F8 releaseall end -SlateportCity_Movement_1DD309: @ 81DD309 +SlateportCity_Movement_OldWomanConcern: @ 81DD309 delay_16 delay_16 emote_question_mark @@ -625,7 +627,7 @@ SlateportCity_Movement_1DD309: @ 81DD309 walk_in_place_fastest_left step_end -SlateportCity_Movement_1DD311: @ 81DD311 +SlateportCity_Movement_ManConcern: @ 81DD311 emote_question_mark walk_in_place_fastest_up delay_16 @@ -635,7 +637,7 @@ SlateportCity_Movement_1DD311: @ 81DD311 walk_in_place_fastest_left step_end -SlateportCity_Movement_1DD319: @ 81DD319 +SlateportCity_Movement_GabbyExit: @ 81DD319 delay_16 walk_left walk_left @@ -650,7 +652,7 @@ SlateportCity_Movement_1DD319: @ 81DD319 walk_left step_end -SlateportCity_Movement_1DD326: @ 81DD326 +SlateportCity_Movement_TyExit: @ 81DD326 walk_down walk_left walk_left @@ -666,19 +668,20 @@ SlateportCity_Movement_1DD326: @ 81DD326 walk_left step_end +@ Unused SlateportCity_Movement_1DD334: @ 81DD334 walk_down walk_in_place_fastest_up step_end -SlateportCity_Movement_1DD337: @ 81DD337 +SlateportCity_Movement_SternEnterHarbor: @ 81DD337 walk_right walk_up walk_up set_invisible step_end -SlateportCity_Movement_1DD33C: @ 81DD33C +SlateportCity_Movement_SternWatchGabbyAndTyExit: @ 81DD33C delay_16 delay_16 delay_16 @@ -688,7 +691,7 @@ SlateportCity_Movement_1DD33C: @ 81DD33C walk_left step_end -SlateportCity_Movement_1DD344: @ 81DD344 +SlateportCity_Movement_PlayerEnterHarbor: @ 81DD344 walk_in_place_fastest_right delay_16 delay_16 @@ -696,7 +699,7 @@ SlateportCity_Movement_1DD344: @ 81DD344 walk_up step_end -SlateportCity_Movement_1DD34A: @ 81DD34A +SlateportCity_Movement_PlayerFaceStern: @ 81DD34A delay_16 delay_16 delay_16 @@ -707,198 +710,198 @@ SlateportCity_Movement_1DD34A: @ 81DD34A walk_in_place_fastest_down step_end -SlateportCity_EventScript_1DD353:: @ 81DD353 - msgbox SlateportCity_Text_1DE491, MSGBOX_SIGN +SlateportCity_EventScript_Ty:: @ 81DD353 + msgbox SlateportCity_Text_BigSmileForCamera, MSGBOX_SIGN end -SlateportCity_EventScript_1DD35C:: @ 81DD35C - msgbox SlateportCity_Text_1DE4C4, MSGBOX_SIGN +SlateportCity_EventScript_Gabby:: @ 81DD35C + msgbox SlateportCity_Text_MostInvaluableExperience, MSGBOX_SIGN end -SlateportCity_EventScript_1DD365:: @ 81DD365 - msgbox SlateportCity_Text_1DD7AD, MSGBOX_NPC +SlateportCity_EventScript_Man3:: @ 81DD365 + msgbox SlateportCity_Text_WonderIfLighthouseStartlesPokemon, MSGBOX_NPC end -SlateportCity_EventScript_1DD36E:: @ 81DD36E +SlateportCity_EventScript_BerryPowderClerk:: @ 81DD36E lock faceplayer - goto_if_set FLAG_RECEIVED_POWDER_JAR, SlateportCity_EventScript_1DD39A - msgbox SlateportCity_Text_1DEBCE, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_POWDER_JAR, SlateportCity_EventScript_ReceivedPowderJar + msgbox SlateportCity_Text_ExplainBerries, MSGBOX_DEFAULT giveitem_std ITEM_POWDER_JAR setflag FLAG_RECEIVED_POWDER_JAR - msgbox SlateportCity_Text_1DED27, MSGBOX_DEFAULT + msgbox SlateportCity_Text_ExplainBerryPowder, MSGBOX_DEFAULT release end -SlateportCity_EventScript_1DD39A:: @ 81DD39A +SlateportCity_EventScript_ReceivedPowderJar:: @ 81DD39A setvar VAR_0x8004, 1 specialvar VAR_RESULT, HasEnoughBerryPowder - compare VAR_RESULT, 0 - goto_if_eq SlateportCity_EventScript_1DD3C0 - msgbox SlateportCity_Text_1DEE40, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + goto_if_eq SlateportCity_EventScript_ExplainBerryPowder + msgbox SlateportCity_Text_BroughtMeSomeBerryPowder, MSGBOX_DEFAULT special DisplayBerryPowderVendorMenu - goto SlateportCity_EventScript_1DD3CA + goto SlateportCity_EventScript_ChooseBerryPowderItem end -SlateportCity_EventScript_1DD3C0:: @ 81DD3C0 - msgbox SlateportCity_Text_1DED27, MSGBOX_DEFAULT +SlateportCity_EventScript_ExplainBerryPowder:: @ 81DD3C0 + msgbox SlateportCity_Text_ExplainBerryPowder, MSGBOX_DEFAULT release end -SlateportCity_EventScript_1DD3CA:: @ 81DD3CA - message SlateportCity_Text_1DEE67 +SlateportCity_EventScript_ChooseBerryPowderItem:: @ 81DD3CA + message SlateportCity_Text_ExchangeWhatWithIt waitmessage setvar VAR_0x8004, SCROLL_MULTI_BERRY_POWDER_VENDOR special ShowScrollableMultichoice waitstate switch VAR_RESULT - case 0, SlateportCity_EventScript_1DD46E - case 1, SlateportCity_EventScript_1DD482 - case 2, SlateportCity_EventScript_1DD496 - case 3, SlateportCity_EventScript_1DD4AA - case 4, SlateportCity_EventScript_1DD4BE - case 5, SlateportCity_EventScript_1DD4D2 - case 6, SlateportCity_EventScript_1DD4E6 - case 7, SlateportCity_EventScript_1DD4FA - case 8, SlateportCity_EventScript_1DD50E - case 9, SlateportCity_EventScript_1DD522 - case 10, SlateportCity_EventScript_1DD536 - case 11, SlateportCity_EventScript_1DD54A - case MULTI_B_PRESSED, SlateportCity_EventScript_1DD54A + case 0, SlateportCity_EventScript_EnergyPowder + case 1, SlateportCity_EventScript_EnergyRoot + case 2, SlateportCity_EventScript_HealPowder + case 3, SlateportCity_EventScript_RevivalHerb + case 4, SlateportCity_EventScript_Protein + case 5, SlateportCity_EventScript_Iron + case 6, SlateportCity_EventScript_Carbos + case 7, SlateportCity_EventScript_Calcium + case 8, SlateportCity_EventScript_Zinc + case 9, SlateportCity_EventScript_HPUp + case 10, SlateportCity_EventScript_PPUp + case 11, SlateportCity_EventScript_CancelPowderItemSelect + case MULTI_B_PRESSED, SlateportCity_EventScript_CancelPowderItemSelect end -SlateportCity_EventScript_1DD46E:: @ 81DD46E +SlateportCity_EventScript_EnergyPowder:: @ 81DD46E bufferitemname 0, ITEM_ENERGY_POWDER setvar VAR_0x8008, ITEM_ENERGY_POWDER setvar VAR_0x8009, 50 - goto SlateportCity_EventScript_1DD557 + goto SlateportCity_EventScript_TryBuyBerryPowderItem end -SlateportCity_EventScript_1DD482:: @ 81DD482 +SlateportCity_EventScript_EnergyRoot:: @ 81DD482 bufferitemname 0, ITEM_ENERGY_ROOT setvar VAR_0x8008, ITEM_ENERGY_ROOT setvar VAR_0x8009, 80 - goto SlateportCity_EventScript_1DD557 + goto SlateportCity_EventScript_TryBuyBerryPowderItem end -SlateportCity_EventScript_1DD496:: @ 81DD496 +SlateportCity_EventScript_HealPowder:: @ 81DD496 bufferitemname 0, ITEM_HEAL_POWDER setvar VAR_0x8008, ITEM_HEAL_POWDER setvar VAR_0x8009, 50 - goto SlateportCity_EventScript_1DD557 + goto SlateportCity_EventScript_TryBuyBerryPowderItem end -SlateportCity_EventScript_1DD4AA:: @ 81DD4AA +SlateportCity_EventScript_RevivalHerb:: @ 81DD4AA bufferitemname 0, ITEM_REVIVAL_HERB setvar VAR_0x8008, ITEM_REVIVAL_HERB setvar VAR_0x8009, 300 - goto SlateportCity_EventScript_1DD557 + goto SlateportCity_EventScript_TryBuyBerryPowderItem end -SlateportCity_EventScript_1DD4BE:: @ 81DD4BE +SlateportCity_EventScript_Protein:: @ 81DD4BE bufferitemname 0, ITEM_PROTEIN setvar VAR_0x8008, ITEM_PROTEIN setvar VAR_0x8009, 1000 - goto SlateportCity_EventScript_1DD557 + goto SlateportCity_EventScript_TryBuyBerryPowderItem end -SlateportCity_EventScript_1DD4D2:: @ 81DD4D2 +SlateportCity_EventScript_Iron:: @ 81DD4D2 bufferitemname 0, ITEM_IRON setvar VAR_0x8008, ITEM_IRON setvar VAR_0x8009, 1000 - goto SlateportCity_EventScript_1DD557 + goto SlateportCity_EventScript_TryBuyBerryPowderItem end -SlateportCity_EventScript_1DD4E6:: @ 81DD4E6 +SlateportCity_EventScript_Carbos:: @ 81DD4E6 bufferitemname 0, ITEM_CARBOS setvar VAR_0x8008, ITEM_CARBOS setvar VAR_0x8009, 1000 - goto SlateportCity_EventScript_1DD557 + goto SlateportCity_EventScript_TryBuyBerryPowderItem end -SlateportCity_EventScript_1DD4FA:: @ 81DD4FA +SlateportCity_EventScript_Calcium:: @ 81DD4FA bufferitemname 0, ITEM_CALCIUM setvar VAR_0x8008, ITEM_CALCIUM setvar VAR_0x8009, 1000 - goto SlateportCity_EventScript_1DD557 + goto SlateportCity_EventScript_TryBuyBerryPowderItem end -SlateportCity_EventScript_1DD50E:: @ 81DD50E +SlateportCity_EventScript_Zinc:: @ 81DD50E bufferitemname 0, ITEM_ZINC setvar VAR_0x8008, ITEM_ZINC setvar VAR_0x8009, 1000 - goto SlateportCity_EventScript_1DD557 + goto SlateportCity_EventScript_TryBuyBerryPowderItem end -SlateportCity_EventScript_1DD522:: @ 81DD522 +SlateportCity_EventScript_HPUp:: @ 81DD522 bufferitemname 0, ITEM_HP_UP setvar VAR_0x8008, ITEM_HP_UP setvar VAR_0x8009, 1000 - goto SlateportCity_EventScript_1DD557 + goto SlateportCity_EventScript_TryBuyBerryPowderItem end -SlateportCity_EventScript_1DD536:: @ 81DD536 +SlateportCity_EventScript_PPUp:: @ 81DD536 bufferitemname 0, ITEM_PP_UP setvar VAR_0x8008, ITEM_PP_UP setvar VAR_0x8009, 3000 - goto SlateportCity_EventScript_1DD557 + goto SlateportCity_EventScript_TryBuyBerryPowderItem end -SlateportCity_EventScript_1DD54A:: @ 81DD54A - msgbox SlateportCity_Text_1DEFBC, MSGBOX_DEFAULT +SlateportCity_EventScript_CancelPowderItemSelect:: @ 81DD54A + msgbox SlateportCity_Text_ComeBackToTradeBerryPowder, MSGBOX_DEFAULT special RemoveBerryPowderVendorMenu release end -SlateportCity_EventScript_1DD557:: @ 81DD557 - msgbox SlateportCity_Text_1DEE90, MSGBOX_YESNO +SlateportCity_EventScript_TryBuyBerryPowderItem:: @ 81DD557 + msgbox SlateportCity_Text_ExchangeBerryPowderForItem, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq SlateportCity_EventScript_1DD3CA + goto_if_eq SlateportCity_EventScript_ChooseBerryPowderItem copyvar VAR_0x8004, VAR_0x8009 specialvar VAR_RESULT, HasEnoughBerryPowder - compare VAR_RESULT, 0 - goto_if_eq SlateportCity_EventScript_1DD5CE + compare VAR_RESULT, FALSE + goto_if_eq SlateportCity_EventScript_NotEnoughBerryPowder giveitem_std VAR_0x8008 - compare VAR_RESULT, 0 - goto_if_eq SlateportCity_EventScript_1DD5C1 + compare VAR_RESULT, FALSE + goto_if_eq SlateportCity_EventScript_NoRoomForBerryPowderItem copyvar VAR_0x8004, VAR_0x8009 special TakeBerryPowder special PrintPlayerBerryPowderAmount - msgbox SlateportCity_Text_1DEEF7, MSGBOX_YESNO + msgbox SlateportCity_Text_FineBerryPowderTradeSomethingElse, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq SlateportCity_EventScript_1DD3CA - msgbox SlateportCity_Text_1DEF79, MSGBOX_DEFAULT + goto_if_eq SlateportCity_EventScript_ChooseBerryPowderItem + msgbox SlateportCity_Text_WhenYouGetMoreBringItToMe, MSGBOX_DEFAULT special RemoveBerryPowderVendorMenu release end -SlateportCity_EventScript_1DD5C1:: @ 81DD5C1 +SlateportCity_EventScript_NoRoomForBerryPowderItem:: @ 81DD5C1 msgbox gText_TheBagIsFull, MSGBOX_DEFAULT special RemoveBerryPowderVendorMenu release end -SlateportCity_EventScript_1DD5CE:: @ 81DD5CE - msgbox SlateportCity_Text_1DEEC9, MSGBOX_DEFAULT - goto SlateportCity_EventScript_1DD3CA +SlateportCity_EventScript_NotEnoughBerryPowder:: @ 81DD5CE + msgbox SlateportCity_Text_DontHaveEnoughBerryPowder, MSGBOX_DEFAULT + goto SlateportCity_EventScript_ChooseBerryPowderItem end -SlateportCity_EventScript_1DD5DC:: @ 81DD5DC +SlateportCity_EventScript_ScottBattleTentScene:: @ 81DD5DC lockall applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 opendoor 10, 12 waitdooranim addobject 35 - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_1DD630 - applymovement 35, SlateportCity_Movement_1DD637 + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_PushPlayerDown + applymovement 35, SlateportCity_Movement_ScottExitBattleTent waitmovement 0 closedoor 10, 12 waitdooranim - msgbox SlateportCity_Text_1DF28C, MSGBOX_DEFAULT + msgbox SlateportCity_Text_TakingBattleTentChallenge, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_1DD634 - applymovement 35, SlateportCity_Movement_1DD63A + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_PlayerWatchScottExit + applymovement 35, SlateportCity_Movement_ScottExitAfterBattleTent waitmovement 0 removeobject 35 addvar VAR_SCOTT_STATE, 1 @@ -906,23 +909,23 @@ SlateportCity_EventScript_1DD5DC:: @ 81DD5DC releaseall end -SlateportCity_Movement_1DD630: @ 81DD630 +SlateportCity_Movement_PushPlayerDown: @ 81DD630 lock_facing_direction walk_down unlock_facing_direction step_end -SlateportCity_Movement_1DD634: @ 81DD634 +SlateportCity_Movement_PlayerWatchScottExit: @ 81DD634 delay_16 walk_in_place_fastest_right step_end -SlateportCity_Movement_1DD637: @ 81DD637 +SlateportCity_Movement_ScottExitBattleTent: @ 81DD637 delay_8 walk_down step_end -SlateportCity_Movement_1DD63A: @ 81DD63A +SlateportCity_Movement_ScottExitAfterBattleTent: @ 81DD63A walk_right walk_right walk_right @@ -933,193 +936,193 @@ SlateportCity_Movement_1DD63A: @ 81DD63A walk_right step_end -SlateportCity_EventScript_1DD643:: @ 81DD643 +SlateportCity_EventScript_BerryCrushRankingsSign:: @ 81DD643 lockall - special sub_80224D0 + special ShowBerryCrushRankings waitstate releaseall end -SlateportCity_Text_1DD64A: @ 81DD64A +SlateportCity_Text_EnergyGuruSellWhatYouNeed: @ 81DD64A .string "I'm the ENERGY GURU! I'll go for it and\n" .string "sell you what you need!$" -SlateportCity_Text_1DD68A: @ 81DD68A +SlateportCity_Text_OhYourPokemon: @ 81DD68A .string "Oh?\n" .string "Your {STR_VAR_1}…$" -SlateportCity_Text_1DD697: @ 81DD697 +SlateportCity_Text_PleaseGiveItThisEffortRibbon: @ 81DD697 .string "Went for it stupendously!\p" .string "As its reward, please give it this\n" .string "EFFORT RIBBON.$" -SlateportCity_Text_1DD6E3: @ 81DD6E3 +SlateportCity_Text_ReceivedEffortRibbon: @ 81DD6E3 .string "{PLAYER} received the EFFORT RIBBON.$" -SlateportCity_Text_1DD702: @ 81DD702 +SlateportCity_Text_PutEffortRibbonOnMon: @ 81DD702 .string "{PLAYER} put the EFFORT RIBBON\n" .string "on {STR_VAR_1}.$" -SlateportCity_Text_1DD722: @ 81DD722 +SlateportCity_Text_GoForItLittleHarder: @ 81DD722 .string "You have to go for it a little harder.\p" .string "If you do, I'll give your POKéMON\n" .string "something nice.$" -SlateportCity_Text_1DD77B: @ 81DD77B +SlateportCity_Text_EffortRibbonLooksGoodOnIt: @ 81DD77B .string "Oh! Your {STR_VAR_1}, that EFFORT\n" .string "RIBBON looks good on it!$" -SlateportCity_Text_1DD7AD: @ 81DD7AD +SlateportCity_Text_WonderIfLighthouseStartlesPokemon: @ 81DD7AD .string "The light of the lighthouse reaches\n" .string "dozens of miles away.\p" .string "I wonder if it doesn't startle POKéMON\n" .string "in the sea.$" -SlateportCity_Text_1DD81A: @ 81DD81A +SlateportCity_Text_SeaweedFullOfLife: @ 81DD81A .string "Ooh, look at this!\p" .string "The seaweed you can get around these\n" .string "parts is fresh and full of life.\p" .string "Why, it looks like it can even rear up\n" .string "and attack!$" -SlateportCity_Text_1DD8A6: @ 81DD8A6 +SlateportCity_Text_HowTownIsBornAndGrows: @ 81DD8A6 .string "Where the water is clean, the fruits\n" .string "of bountiful harvest gather.\p" .string "And where people gather, a market\n" .string "soon starts.\p" .string "That is how a town is born and grows.$" -SlateportCity_Text_1DD93D: @ 81DD93D +SlateportCity_Text_SlateportWonderfulPlace: @ 81DD93D .string "Shopping where you can breathe the\n" .string "scent of the ocean…\p" .string "SLATEPORT is such a wonderful place!$" -SlateportCity_Text_1DD999: @ 81DD999 +SlateportCity_Text_BuyBricksSoDecorWontGetDirty: @ 81DD999 .string "If you put DOLLS or CUSHIONS on\n" .string "the floor, they'll get dirty.\p" .string "I'm going to buy some BRICKS so my\n" .string "DOLLS and CUSHIONS won't get dirty\l" .string "when I leave them out.$" -SlateportCity_Text_1DDA34: @ 81DDA34 +SlateportCity_Text_GoingToCompeteInBattleTent: @ 81DDA34 .string "Wroooar! I'm going to compete in\n" .string "the BATTLE TENT, too!\p" .string "But before that, I need to catch\n" .string "some POKéMON!$" -SlateportCity_Text_1DDA9A: @ 81DDA9A +SlateportCity_Text_BushedHikingFromMauville: @ 81DDA9A .string "Whew… I'm just bushed…\p" .string "I hiked over from MAUVILLE CITY.\n" .string "But, boy, this city's huge.\p" .string "If I'd known this, I would've ridden\n" .string "my BIKE here.$" -SlateportCity_Text_1DDB21: @ 81DDB21 +SlateportCity_Text_EveryoneCallsHimCaptStern: @ 81DDB21 .string "STERN, the fellow who built the\n" .string "MUSEUM, also happens to be the leader\l" .string "of an undersea exploration team.\p" .string "So, everyone calls him CAPT. STERN.$" -SlateportCity_Text_1DDBAC: @ 81DDBAC +SlateportCity_Text_WhatsLongLineOverThere: @ 81DDBAC .string "What is that over there?\n" .string "That long line…$" -SlateportCity_Text_1DDBD5: @ 81DDBD5 +SlateportCity_Text_VisitedMuseumOften: @ 81DDBD5 .string "When I was a child, I visited\n" .string "the MUSEUM often.\p" .string "I used to dream about the mysteries of\n" .string "the sea after seeing the exhibits.$" -SlateportCity_Text_1DDC4F: @ 81DDC4F +SlateportCity_Text_QuitPushing: @ 81DDC4F .string "Hey, there! Quit pushing!\n" .string "This is the line, can't you see?$" -SlateportCity_Text_1DDC8A: @ 81DDC8A +SlateportCity_Text_AquaHasPolicy: @ 81DDC8A .string "TEAM AQUA has a policy of\n" .string "assembling and dispersing at\l" .string "the operation site.$" -SlateportCity_Text_1DDCD5: @ 81DDCD5 +SlateportCity_Text_BossIsBrilliant: @ 81DDCD5 .string "Our BOSS is brilliant.\p" .string "What would he want to do with\n" .string "a MUSEUM now?$" -SlateportCity_Text_1DDD18: @ 81DDD18 +SlateportCity_Text_WhatsNewSchemeIWonder: @ 81DDD18 .string "What's the new scheme, I wonder?\p" .string "Our BOSS is scary when he's mad, so\n" .string "I'd better not screw things up…$" -SlateportCity_Text_1DDD7D: @ 81DDD7D +SlateportCity_Text_ShouldTakeItAll: @ 81DDD7D .string "If there's something we need in\n" .string "the MUSEUM, we should take it all!$" -SlateportCity_Text_1DDDC0: @ 81DDDC0 +SlateportCity_Text_DontButtIn: @ 81DDDC0 .string "Hey, you there!\n" .string "Don't butt in!$" -SlateportCity_Text_1DDDDF: @ 81DDDDF +SlateportCity_Text_RemindsMeOfLongLineForGames: @ 81DDDDF .string "A long line, huh?\p" .string "It reminds me of the times I lined up to\n" .string "buy smash-hit games…$" -SlateportCity_Text_1DDE2F: @ 81DDE2F +SlateportCity_Text_WhyAreWeLiningUp: @ 81DDE2F .string "Why are we even lining up and paying?\n" .string "We should just march in!$" -SlateportCity_Text_1DDE6E: @ 81DDE6E +SlateportCity_Text_WhatDoYouWant: @ 81DDE6E .string "What?\n" .string "What do you want?$" -SlateportCity_Text_1DDE86: @ 81DDE86 +SlateportCity_Text_IllReadSignForYou: @ 81DDE86 .string "You want to read this sign?\n" .string "I'll read it for you!$" -SlateportCity_Text_1DDEB8: @ 81DDEB8 +SlateportCity_Text_SaysSomethingLikeSeaIsEndless: @ 81DDEB8 .string "Let's see…\p" .string "Um… I think it says something like\n" .string "“the life in the sea is endless.”\p" .string "Yup, I'm pretty sure that's what\n" .string "it says.$" -SlateportCity_Text_1DDF32: @ 81DDF32 +SlateportCity_Text_ShouldveBroughtMyGameBoy: @ 81DDF32 .string "Grumble…\p" .string "I should've brought my Game Boy\n" .string "Advance so I wouldn't get bored in line…\p" .string "Grumble…$" -SlateportCity_Text_1DDF8D: @ 81DDF8D +SlateportCity_Text_HotSpringsAfterOperation: @ 81DDF8D .string "When this operation's over, I'll take\n" .string "you to a hot spring spa!\p" .string "That's what our leader said.\n" .string "I can't wait!$" -SlateportCity_Text_1DDFF7: @ 81DDFF7 +SlateportCity_Text_SeaIsSoWet: @ 81DDFF7 .string "The sea is just so vast…\p" .string "Could the sea have been made by\n" .string "the tears shed by POKéMON?$" -SlateportCity_Text_1DE04B: @ 81DE04B +SlateportCity_Text_SinkOldBoats: @ 81DE04B .string "Do you know what they do with old\n" .string "ships that become too creaky to sail?\p" .string "They sink them in the sea so they\n" .string "become habitats for POKéMON.$" -SlateportCity_Text_1DE0D2: @ 81DE0D2 +SlateportCity_Text_BuyTooMuch: @ 81DE0D2 .string "Whenever I visit here, I get carried\n" .string "away and buy too much.$" -SlateportCity_Text_1DE10E: @ 81DE10E +SlateportCity_Text_GetNameRaterToHelpYou: @ 81DE10E .string "If you want to change your POKéMON's\n" .string "nickname, you'll have to get the NAME\l" .string "RATER to help you.$" -SlateportCity_Text_1DE16C: @ 81DE16C +SlateportCity_Text_CantChangeTradeMonName: @ 81DE16C .string "Any POKéMON you get in a trade,\n" .string "you can't change its nickname.\p" .string "The original TRAINER's love for that\n" .string "POKéMON is in the nickname.$" -SlateportCity_Text_1DE1EC: @ 81DE1EC +SlateportCity_Text_BattleTentBuiltRecently: @ 81DE1EC .string "Recently, a BATTLE TENT was built\n" .string "in SLATEPORT.\p" .string "GYMS are fun, but the BATTLE TENT's\n" @@ -1127,62 +1130,62 @@ SlateportCity_Text_1DE1EC: @ 81DE1EC .string "You should go find tough POKéMON\n" .string "for the BATTLE TENT!$" -SlateportCity_Text_1DE28E: @ 81DE28E +SlateportCity_Text_CaptSternBeingInterviewed: @ 81DE28E .string "I was hoping that it was a famous star\n" .string "so I could get an autograph.\p" .string "But who's that being interviewed?\n" .string "Isn't that CAPT. STERN?$" -SlateportCity_Text_1DE30C: @ 81DE30C +SlateportCity_Text_InterviewerSoCool: @ 81DE30C .string "That lady interviewer is so cool\n" .string "and pretty.\p" .string "When I grow up, I'm going to be\n" .string "an international journalist!$" -SlateportCity_Text_1DE376: @ 81DE376 +SlateportCity_Text_SternSaysDiscoveredSomething: @ 81DE376 .string "CAPT. STERN says they discovered\n" .string "something at the bottom of the sea.\p" .string "I wonder what it is?\n" .string "What could it be?$" -SlateportCity_Text_1DE3E2: @ 81DE3E2 +SlateportCity_Text_CaptainComeBackWithBigFish: @ 81DE3E2 .string "What's going on here?\p" .string "Did the good CAPTAIN come back with\n" .string "a big fish from the ocean floor?$" -SlateportCity_Text_1DE43D: @ 81DE43D +SlateportCity_Text_AmIOnTV: @ 81DE43D .string "Hey! Are you watching?\n" .string "Am I on TV?$" -SlateportCity_Text_1DE460: @ 81DE460 +SlateportCity_Text_CaptainsACelebrity: @ 81DE460 .string "A TV interview! Here!\n" .string "The CAPTAIN's a celebrity!$" -SlateportCity_Text_1DE491: @ 81DE491 +SlateportCity_Text_BigSmileForCamera: @ 81DE491 .string "TY: Okay, CAPT. STERN, a big smile\n" .string "for the camera!$" -SlateportCity_Text_1DE4C4: @ 81DE4C4 +SlateportCity_Text_MostInvaluableExperience: @ 81DE4C4 .string "GABBY: I see, I see. You've had a most\n" .string "invaluable experience…$" -SlateportCity_Text_1DE502: @ 81DE502 +SlateportCity_Text_SternMoveAheadWithExploration: @ 81DE502 .string "CAPT. STERN: Yes, indeed. We intend to\n" .string "move ahead with our exploration.$" -SlateportCity_Text_1DE54A: @ 81DE54A +SlateportCity_Text_GabbyWonderfulThanksForInterview: @ 81DE54A .string "GABBY: That's wonderful, CAPT. STERN!\n" .string "Thank you for taking the time from\l" .string "your busy schedule to talk to us.\p" .string "We hope we can interview you again\n" .string "with news of more discoveries!$" -SlateportCity_Text_1DE5F7: @ 81DE5F7 +SlateportCity_Text_SternWhewFirstInterview: @ 81DE5F7 .string "CAPT. STERN: Whew…\p" .string "That was my first time to be filmed for\n" .string "TV. That was nerve-wracking.$" -SlateportCity_Text_1DE64F: @ 81DE64F +SlateportCity_Text_OhPlayerWeMadeDiscovery: @ 81DE64F .string "Oh! {PLAYER}{KUN}!\n" .string "You're looking great!\p" .string "We made a huge discovery on our last\n" @@ -1192,7 +1195,7 @@ SlateportCity_Text_1DE64F: @ 81DE64F .string "We think it's the habitat of a POKéMON\n" .string "that's said to have been long extinct.$" -SlateportCity_Text_1DE724: @ 81DE724 +SlateportCity_Text_AquaWillAssumeControlOfSubmarine: @ 81DE724 .string "Fufufu…\n" .string "CAPT. STERN, I presume.\p" .string "We of TEAM AQUA will assume\n" @@ -1203,77 +1206,77 @@ SlateportCity_Text_1DE724: @ 81DE724 .string "Just watch and learn what TEAM\l" .string "AQUA has planned!$" -SlateportCity_Text_1DE7F7: @ 81DE7F7 +SlateportCity_Text_SternWhatWasAllThat: @ 81DE7F7 .string "CAPT. STERN: What was that all about?\p" .string "It sounded like someone using\n" .string "a megaphone…\p" .string "Where did it come from?$" -SlateportCity_Text_1DE860: @ 81DE860 +SlateportCity_Text_FromHarborTryingToTakeSub: @ 81DE860 .string "It's from the HARBOR!\p" .string "The submarine!\n" .string "They're trying to take it!$" -SlateportCity_Text_1DE8A0: @ 81DE8A0 +SlateportCity_Text_PleaseComeWithMe: @ 81DE8A0 .string "{PLAYER}{KUN}!\n" .string "Please, come with me!$" -SlateportCity_Text_1DE8BC: @ 81DE8BC +SlateportCity_Text_BattleTentSign: @ 81DE8BC .string "BATTLE TENT SLATEPORT SITE\n" .string "“Find it! The ultimate POKéMON!”$" -SlateportCity_Text_1DE8F8: @ 81DE8F8 +SlateportCity_Text_SternsShipyardWantedSign: @ 81DE8F8 .string "STERN'S SHIPYARD\p" .string "“Wanted: A sailor capable of sailing\n" .string "in all currents.”$" -SlateportCity_Text_1DE940: @ 81DE940 +SlateportCity_Text_SternsShipyardNearsCompletion: @ 81DE940 .string "STERN'S SHIPYARD\p" .string "“The ferry S.S. TIDAL nears\n" .string "completion for serving the ports of\l" .string "SLATEPORT and LILYCOVE.”$" -SlateportCity_Text_1DE9AA: @ 81DE9AA +SlateportCity_Text_SternsShipyardFerryComplete: @ 81DE9AA .string "STERN'S SHIPYARD\p" .string "“Boarding of the SLATEPORT-LILYCOVE\n" .string "ferry S.S. TIDAL is handled at the\l" .string "HARBOR.”$" -SlateportCity_Text_1DEA0B: @ 81DEA0B +SlateportCity_Text_PokemonFanClubSign: @ 81DEA0B .string "POKéMON FAN CLUB\n" .string "“Calling all fans of POKéMON!”$" -SlateportCity_Text_1DEA3B: @ 81DEA3B +SlateportCity_Text_OceanicMuseumSign: @ 81DEA3B .string "“The endless sea sustains\n" .string "all life.”\p" .string "OCEANIC MUSEUM$" -SlateportCity_Text_1DEA6F: @ 81DEA6F +SlateportCity_Text_CitySign: @ 81DEA6F .string "SLATEPORT CITY\p" .string "“The port where people and POKéMON\n" .string "cross paths.”$" -SlateportCity_Text_1DEAAF: @ 81DEAAF +SlateportCity_Text_MarketSign: @ 81DEAAF .string "SLATEPORT MARKET\n" .string "“Unique items found nowhere else!”$" -SlateportCity_Text_1DEAE3: @ 81DEAE3 +SlateportCity_Text_HarborFerryUnderConstruction: @ 81DEAE3 .string "SLATEPORT HARBOR\p" .string "“The ferry S.S. TIDAL is under\n" .string "construction in the SHIPYARD.\p" .string "“Service is scheduled to begin\n" .string "shortly.”$" -SlateportCity_Text_1DEB5A: @ 81DEB5A +SlateportCity_Text_HarborSign: @ 81DEB5A .string "SLATEPORT HARBOR\p" .string "“Enjoy a delightful cruise on\n" .string "the ferry S.S. TIDAL.”$" -SlateportCity_Text_1DEBA0: @ 81DEBA0 +SlateportCity_Text_NameRatersHouseSign: @ 81DEBA0 .string "NAME RATER'S HOUSE\n" .string "“POKéMON nicknames rated.”$" -SlateportCity_Text_1DEBCE: @ 81DEBCE +SlateportCity_Text_ExplainBerries: @ 81DEBCE .string "If a wild POKéMON gets hurt, it heals\n" .string "itself by chewing on BERRIES.\p" .string "Did you know that?\p" @@ -1288,7 +1291,7 @@ SlateportCity_Text_1DEBCE: @ 81DEBCE .string "I've got something good for someone\n" .string "like you.$" -SlateportCity_Text_1DED27: @ 81DED27 +SlateportCity_Text_ExplainBerryPowder: @ 81DED27 .string "I recently had machines installed at\n" .string "POKéMON CENTERS for crushing BERRIES.\p" .string "The BERRY CRUSH machines are at\n" @@ -1299,39 +1302,39 @@ SlateportCity_Text_1DED27: @ 81DED27 .string "I can make you all sorts of medicine\n" .string "if you bring me lots of BERRY POWDER.$" -SlateportCity_Text_1DEE40: @ 81DEE40 +SlateportCity_Text_BroughtMeSomeBerryPowder: @ 81DEE40 .string "Have you brought me some\n" .string "BERRY POWDER?$" -SlateportCity_Text_1DEE67: @ 81DEE67 +SlateportCity_Text_ExchangeWhatWithIt: @ 81DEE67 .string "What would you like to exchange\n" .string "it with?$" -SlateportCity_Text_1DEE90: @ 81DEE90 +SlateportCity_Text_ExchangeBerryPowderForItem: @ 81DEE90 .string "Okay, you want to exchange your\n" .string "BERRY POWDER for one {STR_VAR_1}?$" -SlateportCity_Text_1DEEC9: @ 81DEEC9 +SlateportCity_Text_DontHaveEnoughBerryPowder: @ 81DEEC9 .string "Oh, dear. You don't have enough\n" .string "BERRY POWDER.$" -SlateportCity_Text_1DEEF7: @ 81DEEF7 +SlateportCity_Text_FineBerryPowderTradeSomethingElse: @ 81DEEF7 .string "This is fine BERRY POWDER.\n" .string "It will make excellent medicine.\p" .string "Would you like to trade more of your\n" .string "BERRY POWDER for something else?$" -SlateportCity_Text_1DEF79: @ 81DEF79 +SlateportCity_Text_WhenYouGetMoreBringItToMe: @ 81DEF79 .string "Okay! When you get some more\n" .string "BERRY POWDER, bring it to me, please!$" -SlateportCity_Text_1DEFBC: @ 81DEFBC +SlateportCity_Text_ComeBackToTradeBerryPowder: @ 81DEFBC .string "Come back if you'd like to trade your\n" .string "BERRY POWDER for some medicine.\p" .string "I'm always running a bazaar here.\p" .string "Did you know?$" -SlateportCity_Text_1DF032: @ 81DF032 +SlateportCity_Text_YouDroveTeamAquaAway: @ 81DF032 .string "SCOTT: Huh?\n" .string "I'm sure I met you somewhere before.\p" .string "Have I introduced myself to you?\n" @@ -1340,22 +1343,22 @@ SlateportCity_Text_1DF032: @ 81DF032 .string "here like they were stung.\p" .string "Let me guess--you drove them away?$" -SlateportCity_Text_1DF0FE: @ 81DF0FE +SlateportCity_Text_MaybeThisTrainer: @ 81DF0FE .string "SCOTT: Hmm…\n" .string "Maybe, just maybe, this TRAINER…$" -SlateportCity_Text_1DF12B: @ 81DF12B +SlateportCity_Text_LetsRegisterEachOther: @ 81DF12B .string "SCOTT: All right! I think you're going\n" .string "to become a good friend.\p" .string "So, let's register each other in our\n" .string "POKéNAVS.\p" .string "… … … … … …$" -SlateportCity_Text_1DF1A6: @ 81DF1A6 +SlateportCity_Text_RegisteredScott: @ 81DF1A6 .string "Registered this SCOTT person\n" .string "in the POKéNAV.$" -SlateportCity_Text_1DF1D3: @ 81DF1D3 +SlateportCity_Text_KeepEyeOnTrainersBeSeeingYou: @ 81DF1D3 .string "SCOTT: What I'd like to do is tag along\n" .string "with you, but I do want to keep an eye\l" .string "on the talents of other people, too.\p" @@ -1363,7 +1366,7 @@ SlateportCity_Text_1DF1D3: @ 81DF1D3 .string "a bit more.\p" .string "Be seeing you, {PLAYER}{KUN}!$" -SlateportCity_Text_1DF28C: @ 81DF28C +SlateportCity_Text_TakingBattleTentChallenge: @ 81DF28C .string "SCOTT: Oh, hey!\n" .string "If it isn't {PLAYER}{KUN}!\p" .string "{PLAYER}{KUN}, let me guess--you're going\n" diff --git a/data/maps/SlateportCity_Harbor/map.json b/data/maps/SlateportCity_Harbor/map.json index c61c5a5e6..c9aaf1d7a 100644 --- a/data/maps/SlateportCity_Harbor/map.json +++ b/data/maps/SlateportCity_Harbor/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_Harbor_EventScript_20CAF1", + "script": "SlateportCity_Harbor_EventScript_FerryAttendant", "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_Harbor_EventScript_20CC52", + "script": "SlateportCity_Harbor_EventScript_Sailor", "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_Harbor_EventScript_20CC99", + "script": "SlateportCity_Harbor_EventScript_FatMan", "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_Harbor_EventScript_20CCA2", + "script": "SlateportCity_Harbor_EventScript_CaptStern", "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_CAPTAIN_STERN" }, { @@ -157,7 +157,7 @@ "elevation": 3, "var": "VAR_SLATEPORT_HARBOR_STATE", "var_value": "1", - "script": "SlateportCity_Harbor_EventScript_20C9BB" + "script": "SlateportCity_Harbor_EventScript_AquaEscapeTrigger0" }, { "type": "trigger", @@ -166,7 +166,7 @@ "elevation": 3, "var": "VAR_SLATEPORT_HARBOR_STATE", "var_value": "1", - "script": "SlateportCity_Harbor_EventScript_20C9C7" + "script": "SlateportCity_Harbor_EventScript_AquaEscapeTrigger1" }, { "type": "trigger", @@ -175,7 +175,7 @@ "elevation": 3, "var": "VAR_SLATEPORT_HARBOR_STATE", "var_value": "1", - "script": "SlateportCity_Harbor_EventScript_20C9D3" + "script": "SlateportCity_Harbor_EventScript_AquaEscapeTrigger2" }, { "type": "trigger", @@ -184,7 +184,7 @@ "elevation": 3, "var": "VAR_SLATEPORT_HARBOR_STATE", "var_value": "1", - "script": "SlateportCity_Harbor_EventScript_20C9DF" + "script": "SlateportCity_Harbor_EventScript_AquaEscapeTrigger3" } ], "bg_events": [] diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc index 83f4b8011..bf30da747 100644 --- a/data/maps/SlateportCity_Harbor/scripts.inc +++ b/data/maps/SlateportCity_Harbor/scripts.inc @@ -6,58 +6,58 @@ SlateportCity_Harbor_OnTransition: @ 820C983 setescapewarp MAP_SLATEPORT_CITY, 255, 28, 13 setvar VAR_TEMP_1, 0 compare VAR_SLATEPORT_HARBOR_STATE, 1 - call_if_eq SlateportCity_Harbor_EventScript_20C9A9 - call_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_20C9A5 + call_if_eq SlateportCity_Harbor_EventScript_ReadyAquaEscapeScene + call_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_ShowSSTidal end -SlateportCity_Harbor_EventScript_20C9A5:: @ 820C9A5 +SlateportCity_Harbor_EventScript_ShowSSTidal:: @ 820C9A5 clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL return -SlateportCity_Harbor_EventScript_20C9A9:: @ 820C9A9 +SlateportCity_Harbor_EventScript_ReadyAquaEscapeScene:: @ 820C9A9 savebgm MUS_AQA_0 setobjectxyperm 4, 12, 13 setobjectmovementtype 4, MOVEMENT_TYPE_FACE_LEFT setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS return -SlateportCity_Harbor_EventScript_20C9BB:: @ 820C9BB +SlateportCity_Harbor_EventScript_AquaEscapeTrigger0:: @ 820C9BB lockall setvar VAR_0x8008, 0 - goto SlateportCity_Harbor_EventScript_20C9F5 + goto SlateportCity_Harbor_EventScript_AquaEscapeScene end -SlateportCity_Harbor_EventScript_20C9C7:: @ 820C9C7 +SlateportCity_Harbor_EventScript_AquaEscapeTrigger1:: @ 820C9C7 lockall setvar VAR_0x8008, 1 - goto SlateportCity_Harbor_EventScript_20C9F5 + goto SlateportCity_Harbor_EventScript_AquaEscapeScene end -SlateportCity_Harbor_EventScript_20C9D3:: @ 820C9D3 +SlateportCity_Harbor_EventScript_AquaEscapeTrigger2:: @ 820C9D3 lockall setvar VAR_0x8008, 2 - goto SlateportCity_Harbor_EventScript_20C9F5 + goto SlateportCity_Harbor_EventScript_AquaEscapeScene end -SlateportCity_Harbor_EventScript_20C9DF:: @ 820C9DF +SlateportCity_Harbor_EventScript_AquaEscapeTrigger3:: @ 820C9DF lockall setvar VAR_0x8008, 3 - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_20CAEF + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_PlayerWalkUp waitmovement 0 - goto SlateportCity_Harbor_EventScript_20C9F5 + goto SlateportCity_Harbor_EventScript_AquaEscapeScene end -SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5 +SlateportCity_Harbor_EventScript_AquaEscapeScene:: @ 820C9F5 applymovement 7, Common_Movement_WalkInPlaceFastestDown waitmovement 0 applymovement 6, Common_Movement_WalkInPlaceFastestDown applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - msgbox SlateportCity_Harbor_Text_20D291, MSGBOX_DEFAULT + msgbox SlateportCity_Harbor_Text_ArchieYouAgainHideoutInLilycove, MSGBOX_DEFAULT closemessage - applymovement 6, SlateportCity_Harbor_Movement_20CAC8 - applymovement 7, SlateportCity_Harbor_Movement_20CAC8 - applymovement 8, SlateportCity_Harbor_Movement_20CAD2 + applymovement 6, SlateportCity_Harbor_Movement_AquaBoardSub + applymovement 7, SlateportCity_Harbor_Movement_AquaBoardSub + applymovement 8, SlateportCity_Harbor_Movement_SubmarineExit waitmovement 0 removeobject 6 removeobject 7 @@ -66,14 +66,14 @@ SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5 setflag FLAG_MET_TEAM_AQUA_HARBOR setflag FLAG_HIDE_LILCOVE_MOTEL_SCOTT compare VAR_0x8008, 0 - call_if_eq SlateportCity_Harbor_EventScript_20CA89 + call_if_eq SlateportCity_Harbor_EventScript_SternApproachPlayer0 compare VAR_0x8008, 1 - call_if_eq SlateportCity_Harbor_EventScript_20CA9E + call_if_eq SlateportCity_Harbor_EventScript_SternApproachPlayer1 compare VAR_0x8008, 2 - call_if_eq SlateportCity_Harbor_EventScript_20CAB3 + call_if_eq SlateportCity_Harbor_EventScript_SternApproachPlayer compare VAR_0x8008, 3 - call_if_eq SlateportCity_Harbor_EventScript_20CAB3 - msgbox SlateportCity_Harbor_Text_20D35A, MSGBOX_DEFAULT + call_if_eq SlateportCity_Harbor_EventScript_SternApproachPlayer + msgbox SlateportCity_Harbor_Text_CaptSternWhyStealMySubmarine, MSGBOX_DEFAULT closemessage setflag FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_1_BLOCKING_ENTRANCE setflag FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_2_BLOCKING_ENTRANCE @@ -82,42 +82,43 @@ SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5 releaseall end -SlateportCity_Harbor_EventScript_20CA89:: @ 820CA89 - applymovement 4, SlateportCity_Harbor_Movement_20CAE0 +SlateportCity_Harbor_EventScript_SternApproachPlayer0:: @ 820CA89 + applymovement 4, SlateportCity_Harbor_Movement_SternApproachPlayer0 waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return -SlateportCity_Harbor_EventScript_20CA9E:: @ 820CA9E - applymovement 4, SlateportCity_Harbor_Movement_20CAE6 +SlateportCity_Harbor_EventScript_SternApproachPlayer1:: @ 820CA9E + applymovement 4, SlateportCity_Harbor_Movement_SternApproachPlayer1 waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return -SlateportCity_Harbor_EventScript_20CAB3:: @ 820CAB3 - applymovement 4, SlateportCity_Harbor_Movement_20CAEB +SlateportCity_Harbor_EventScript_SternApproachPlayer:: @ 820CAB3 + applymovement 4, SlateportCity_Harbor_Movement_SternApproachPlayer waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return -SlateportCity_Harbor_Movement_20CAC8: @ 820CAC8 +SlateportCity_Harbor_Movement_AquaBoardSub: @ 820CAC8 delay_16 delay_16 jump_up set_invisible step_end -SlateportCity_Harbor_Movement_20CACD: @ 820CACD +@ Unused, Archie instead shares above identical movement script with Grunt +SlateportCity_Harbor_Movement_ArchieBoardSub: @ 820CACD delay_16 delay_16 jump_up set_invisible step_end -SlateportCity_Harbor_Movement_20CAD2: @ 820CAD2 +SlateportCity_Harbor_Movement_SubmarineExit: @ 820CAD2 delay_16 delay_16 delay_16 @@ -133,7 +134,7 @@ SlateportCity_Harbor_Movement_20CAD2: @ 820CAD2 walk_fast_right step_end -SlateportCity_Harbor_Movement_20CAE0: @ 820CAE0 +SlateportCity_Harbor_Movement_SternApproachPlayer0: @ 820CAE0 walk_left walk_left walk_left @@ -141,305 +142,305 @@ SlateportCity_Harbor_Movement_20CAE0: @ 820CAE0 walk_up step_end -SlateportCity_Harbor_Movement_20CAE6: @ 820CAE6 +SlateportCity_Harbor_Movement_SternApproachPlayer1: @ 820CAE6 walk_left walk_left walk_up walk_left step_end -SlateportCity_Harbor_Movement_20CAEB: @ 820CAEB +SlateportCity_Harbor_Movement_SternApproachPlayer: @ 820CAEB walk_left walk_left walk_left step_end -SlateportCity_Harbor_Movement_20CAEF: @ 820CAEF +SlateportCity_Harbor_Movement_PlayerWalkUp: @ 820CAEF walk_up step_end -SlateportCity_Harbor_EventScript_20CAF1:: @ 820CAF1 +SlateportCity_Harbor_EventScript_FerryAttendant:: @ 820CAF1 lock faceplayer - goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_20CB06 - msgbox SlateportCity_Harbor_Text_20CE20, MSGBOX_DEFAULT + goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_AskForTicket + msgbox SlateportCity_Harbor_Text_FerryServiceUnavailable, MSGBOX_DEFAULT release end -SlateportCity_Harbor_EventScript_20CB06:: @ 820CB06 - msgbox SlateportCity_Harbor_Text_20CE87, MSGBOX_DEFAULT - message SlateportCity_Harbor_Text_20CF1C +SlateportCity_Harbor_EventScript_AskForTicket:: @ 820CB06 + msgbox SlateportCity_Harbor_Text_MayISeeYourTicket, MSGBOX_DEFAULT + message SlateportCity_Harbor_Text_FlashedTicketWhereTo waitmessage - goto SlateportCity_Harbor_EventScript_20CB1A + goto SlateportCity_Harbor_EventScript_ChooseDestination end -SlateportCity_Harbor_EventScript_20CB1A:: @ 820CB1A - goto_if_set FLAG_MET_SCOTT_ON_SS_TIDAL, SlateportCity_Harbor_EventScript_20CB50 +SlateportCity_Harbor_EventScript_ChooseDestination:: @ 820CB1A + goto_if_set FLAG_MET_SCOTT_ON_SS_TIDAL, SlateportCity_Harbor_EventScript_ChooseDestinationWithBattleFrontier multichoicedefault 18, 8, MULTI_SSTIDAL_SLATEPORT_NO_BF, 2, 0 switch VAR_RESULT - case 0, SlateportCity_Harbor_EventScript_20CB92 - case 1, SlateportCity_Harbor_EventScript_20CC2D - case MULTI_B_PRESSED, SlateportCity_Harbor_EventScript_20CC2D + case 0, SlateportCity_Harbor_EventScript_Lilycove + case 1, SlateportCity_Harbor_EventScript_CancelDestinationSelect + case MULTI_B_PRESSED, SlateportCity_Harbor_EventScript_CancelDestinationSelect end -SlateportCity_Harbor_EventScript_20CB50:: @ 820CB50 +SlateportCity_Harbor_EventScript_ChooseDestinationWithBattleFrontier:: @ 820CB50 multichoicedefault 17, 6, MULTI_SSTIDAL_SLATEPORT_WITH_BF, 2, 0 switch VAR_RESULT - case 0, SlateportCity_Harbor_EventScript_20CB92 - case 1, SlateportCity_Harbor_EventScript_20CBBA - case 2, SlateportCity_Harbor_EventScript_20CC2D - case MULTI_B_PRESSED, SlateportCity_Harbor_EventScript_20CC2D + case 0, SlateportCity_Harbor_EventScript_Lilycove + case 1, SlateportCity_Harbor_EventScript_BattleFrontier + case 2, SlateportCity_Harbor_EventScript_CancelDestinationSelect + case MULTI_B_PRESSED, SlateportCity_Harbor_EventScript_CancelDestinationSelect end -SlateportCity_Harbor_EventScript_20CB88:: @ 820CB88 - msgbox SlateportCity_Harbor_Text_20CEC1, MSGBOX_DEFAULT +@ Unused. Should be impossible for player to reach Ferry without having received SS Tidal ticket +SlateportCity_Harbor_EventScript_NoTicket:: @ 820CB88 + msgbox SlateportCity_Harbor_Text_YouMustHaveTicket, MSGBOX_DEFAULT release end -SlateportCity_Harbor_EventScript_20CB92:: @ 820CB92 - msgbox SlateportCity_Harbor_Text_20CF93, MSGBOX_YESNO +SlateportCity_Harbor_EventScript_Lilycove:: @ 820CB92 + msgbox SlateportCity_Harbor_Text_LilycoveItIs, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq SlateportCity_Harbor_EventScript_20CBDD + goto_if_eq SlateportCity_Harbor_EventScript_ChooseNewDestination setvar VAR_PORTHOLE_STATE, 1 - call SlateportCity_Harbor_EventScript_20CBE9 + call SlateportCity_Harbor_EventScript_BoardFerry warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10 waitstate release end -SlateportCity_Harbor_EventScript_20CBBA:: @ 820CBBA - msgbox SlateportCity_Harbor_Text_20CFAE, MSGBOX_YESNO +SlateportCity_Harbor_EventScript_BattleFrontier:: @ 820CBBA + msgbox SlateportCity_Harbor_Text_BattleFrontierItIs, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq SlateportCity_Harbor_EventScript_20CBDD - call SlateportCity_Harbor_EventScript_20CBE9 + goto_if_eq SlateportCity_Harbor_EventScript_ChooseNewDestination + call SlateportCity_Harbor_EventScript_BoardFerry warp MAP_BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67 waitstate release end -SlateportCity_Harbor_EventScript_20CBDD:: @ 820CBDD - message SlateportCity_Harbor_Text_20CFFA +SlateportCity_Harbor_EventScript_ChooseNewDestination:: @ 820CBDD + message SlateportCity_Harbor_Text_WhereWouldYouLikeToGo waitmessage - goto SlateportCity_Harbor_EventScript_20CB1A + goto SlateportCity_Harbor_EventScript_ChooseDestination end -SlateportCity_Harbor_EventScript_20CBE9:: @ 820CBE9 - msgbox SlateportCity_Harbor_Text_20CFCB, MSGBOX_DEFAULT +SlateportCity_Harbor_EventScript_BoardFerry:: @ 820CBE9 + msgbox SlateportCity_Harbor_Text_PleaseBoardFerry, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestUp waitmovement 0 delay 30 hideobjectat VAR_LAST_TALKED, MAP_SLATEPORT_CITY_HARBOR compare VAR_FACING, DIR_NORTH - call_if_eq SlateportCity_Harbor_EventScript_20CC42 + call_if_eq SlateportCity_Harbor_EventScript_BoardFerryNorth compare VAR_FACING, DIR_EAST - call_if_eq SlateportCity_Harbor_EventScript_20CC37 + call_if_eq SlateportCity_Harbor_EventScript_BoardFerryEast delay 30 hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY setvar VAR_0x8004, 5 call Common_EventScript_FerryDepart return -SlateportCity_Harbor_EventScript_20CC2D:: @ 820CC2D - msgbox SlateportCity_Harbor_Text_20CF71, MSGBOX_DEFAULT +SlateportCity_Harbor_EventScript_CancelDestinationSelect:: @ 820CC2D + msgbox SlateportCity_Harbor_Text_SailAnotherTime, MSGBOX_DEFAULT release end -SlateportCity_Harbor_EventScript_20CC37:: @ 820CC37 - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_20CC4D +SlateportCity_Harbor_EventScript_BoardFerryEast:: @ 820CC37 + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_BoardFerryEast waitmovement 0 return -SlateportCity_Harbor_EventScript_20CC42:: @ 820CC42 - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_20CC50 +SlateportCity_Harbor_EventScript_BoardFerryNorth:: @ 820CC42 + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_BoardFerryNorth waitmovement 0 return -SlateportCity_Harbor_Movement_20CC4D: @ 820CC4D +SlateportCity_Harbor_Movement_BoardFerryEast: @ 820CC4D walk_right walk_in_place_fastest_up step_end -SlateportCity_Harbor_Movement_20CC50: @ 820CC50 +SlateportCity_Harbor_Movement_BoardFerryNorth: @ 820CC50 walk_up step_end -SlateportCity_Harbor_EventScript_20CC52:: @ 820CC52 +SlateportCity_Harbor_EventScript_Sailor:: @ 820CC52 lock faceplayer - goto_if_unset FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_20CC89 + goto_if_unset FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_SailorNoAbnormalWeather setvar VAR_0x8004, 0 - call_if_set FLAG_DEFEATED_KYOGRE, SlateportCity_Harbor_EventScript_20CC93 - call_if_set FLAG_DEFEATED_GROUDON, SlateportCity_Harbor_EventScript_20CC93 - compare VAR_0x8004, 2 - goto_if_eq SlateportCity_Harbor_EventScript_20CC89 - msgbox SlateportCity_Harbor_Text_20D08E, MSGBOX_DEFAULT + call_if_set FLAG_DEFEATED_KYOGRE, SlateportCity_Harbor_EventScript_CountDefeatedLegendary + call_if_set FLAG_DEFEATED_GROUDON, SlateportCity_Harbor_EventScript_CountDefeatedLegendary + compare VAR_0x8004, 2 @ Defeated both + goto_if_eq SlateportCity_Harbor_EventScript_SailorNoAbnormalWeather + msgbox SlateportCity_Harbor_Text_AbnormalWeather, MSGBOX_DEFAULT release end -SlateportCity_Harbor_EventScript_20CC89:: @ 820CC89 - msgbox SlateportCity_Harbor_Text_20D01C, MSGBOX_DEFAULT +SlateportCity_Harbor_EventScript_SailorNoAbnormalWeather:: @ 820CC89 + msgbox SlateportCity_Harbor_Text_LoveToGoDeepUnderwaterSomeday, MSGBOX_DEFAULT release end -SlateportCity_Harbor_EventScript_20CC93:: @ 820CC93 +SlateportCity_Harbor_EventScript_CountDefeatedLegendary:: @ 820CC93 addvar VAR_0x8004, 1 return -SlateportCity_Harbor_EventScript_20CC99:: @ 820CC99 - msgbox SlateportCity_Harbor_Text_20D194, MSGBOX_NPC +SlateportCity_Harbor_EventScript_FatMan:: @ 820CC99 + msgbox SlateportCity_Harbor_Text_SubTooSmallForMe, MSGBOX_NPC end -SlateportCity_Harbor_EventScript_20CCA2:: @ 820CCA2 +SlateportCity_Harbor_EventScript_CaptStern:: @ 820CCA2 lock faceplayer - goto_if_set FLAG_BADGE07_GET, SlateportCity_Harbor_EventScript_20CD00 - goto_if_set FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE, SlateportCity_Harbor_EventScript_20CCF6 - goto_if_set FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, SlateportCity_Harbor_EventScript_20CCE9 + goto_if_set FLAG_BADGE07_GET, SlateportCity_Harbor_EventScript_CaptSternFerryOrScannerComment + goto_if_set FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE, SlateportCity_Harbor_EventScript_NeedDive + goto_if_set FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, SlateportCity_Harbor_EventScript_TeamAquaLeftNeedDive compare VAR_SLATEPORT_HARBOR_STATE, 2 - goto_if_eq SlateportCity_Harbor_EventScript_20CCDF - msgbox SlateportCity_Harbor_Text_20D232, MSGBOX_DEFAULT + goto_if_eq SlateportCity_Harbor_EventScript_WhyStealSubmarine + msgbox SlateportCity_Harbor_Text_SameThugsTriedToRobAtMuseum, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end -SlateportCity_Harbor_EventScript_20CCDF:: @ 820CCDF - msgbox SlateportCity_Harbor_Text_20D35A, MSGBOX_DEFAULT +SlateportCity_Harbor_EventScript_WhyStealSubmarine:: @ 820CCDF + msgbox SlateportCity_Harbor_Text_CaptSternWhyStealMySubmarine, MSGBOX_DEFAULT release end -SlateportCity_Harbor_EventScript_20CCE9:: @ 820CCE9 +SlateportCity_Harbor_EventScript_TeamAquaLeftNeedDive:: @ 820CCE9 setflag FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE - msgbox SlateportCity_Harbor_Text_20D42B, MSGBOX_DEFAULT + msgbox SlateportCity_Harbor_Text_TeamAquaLeftNeedDive, MSGBOX_DEFAULT release end -SlateportCity_Harbor_EventScript_20CCF6:: @ 820CCF6 - msgbox SlateportCity_Harbor_Text_20D58A, MSGBOX_DEFAULT +SlateportCity_Harbor_EventScript_NeedDive:: @ 820CCF6 + msgbox SlateportCity_Harbor_Text_NeedDiveToCatchSub, MSGBOX_DEFAULT release end -SlateportCity_Harbor_EventScript_20CD00:: @ 820CD00 +SlateportCity_Harbor_EventScript_CaptSternFerryOrScannerComment:: @ 820CD00 compare VAR_TEMP_1, 1 - goto_if_eq SlateportCity_Harbor_EventScript_20CE11 + goto_if_eq SlateportCity_Harbor_EventScript_TradedScanner checkitem ITEM_SCANNER, 1 - compare VAR_RESULT, 1 - goto_if_eq SlateportCity_Harbor_EventScript_20CD38 - goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_20CD2E - msgbox SlateportCity_Harbor_Text_20D65C, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq SlateportCity_Harbor_EventScript_AskToTradeScanner + goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_FerryFinished + msgbox SlateportCity_Harbor_Text_WontBeLongBeforeWeFinishFerry, MSGBOX_DEFAULT release end -SlateportCity_Harbor_EventScript_20CD2E:: @ 820CD2E - msgbox SlateportCity_Harbor_Text_20D6CB, MSGBOX_DEFAULT +SlateportCity_Harbor_EventScript_FerryFinished:: @ 820CD2E + msgbox SlateportCity_Harbor_Text_FinishedMakingFerry, MSGBOX_DEFAULT release end -SlateportCity_Harbor_EventScript_20CD38:: @ 820CD38 - message SlateportCity_Harbor_Text_20D76C +SlateportCity_Harbor_EventScript_AskToTradeScanner:: @ 820CD38 + message SlateportCity_Harbor_Text_WouldYouTradeScanner waitmessage - goto SlateportCity_Harbor_EventScript_20CD44 + goto SlateportCity_Harbor_EventScript_ChooseScannerTrade end -SlateportCity_Harbor_EventScript_20CD44:: @ 820CD44 +SlateportCity_Harbor_EventScript_ChooseScannerTrade:: @ 820CD44 multichoice 0, 0, MULTI_STERN_DEEPSEA, 0 switch VAR_RESULT - case 0, SlateportCity_Harbor_EventScript_20CD7B - case 1, SlateportCity_Harbor_EventScript_20CDBB - case 2, SlateportCity_Harbor_EventScript_20CDFB - case MULTI_B_PRESSED, SlateportCity_Harbor_EventScript_20CDFB + case 0, SlateportCity_Harbor_EventScript_DeepSeaTooth + case 1, SlateportCity_Harbor_EventScript_DeepSeaScale + case 2, SlateportCity_Harbor_EventScript_DeclineTrade + case MULTI_B_PRESSED, SlateportCity_Harbor_EventScript_DeclineTrade end -SlateportCity_Harbor_EventScript_20CD7B:: @ 820CD7B - msgbox SlateportCity_Harbor_Text_20D8BC, MSGBOX_YESNO +SlateportCity_Harbor_EventScript_DeepSeaTooth:: @ 820CD7B + msgbox SlateportCity_Harbor_Text_TradeForDeepSeaTooth, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq SlateportCity_Harbor_EventScript_20CE05 + goto_if_eq SlateportCity_Harbor_EventScript_ChooseDifferentTrade giveitem_std ITEM_DEEP_SEA_TOOTH - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull takeitem ITEM_SCANNER, 1 - msgbox SlateportCity_Harbor_Text_20D94A, MSGBOX_DEFAULT + msgbox SlateportCity_Harbor_Text_HandedScannerToStern, MSGBOX_DEFAULT setflag FLAG_EXCHANGED_SCANNER - goto SlateportCity_Harbor_EventScript_20CE11 + goto SlateportCity_Harbor_EventScript_TradedScanner end -SlateportCity_Harbor_EventScript_20CDBB:: @ 820CDBB - msgbox SlateportCity_Harbor_Text_20D8F1, MSGBOX_YESNO +SlateportCity_Harbor_EventScript_DeepSeaScale:: @ 820CDBB + msgbox SlateportCity_Harbor_Text_TradeForDeepSeaScale, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq SlateportCity_Harbor_EventScript_20CE05 + goto_if_eq SlateportCity_Harbor_EventScript_ChooseDifferentTrade giveitem_std ITEM_DEEP_SEA_SCALE - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull takeitem ITEM_SCANNER, 1 - msgbox SlateportCity_Harbor_Text_20D94A, MSGBOX_DEFAULT + msgbox SlateportCity_Harbor_Text_HandedScannerToStern, MSGBOX_DEFAULT setflag FLAG_EXCHANGED_SCANNER - goto SlateportCity_Harbor_EventScript_20CE11 + goto SlateportCity_Harbor_EventScript_TradedScanner end -SlateportCity_Harbor_EventScript_20CDFB:: @ 820CDFB - msgbox SlateportCity_Harbor_Text_20D841, MSGBOX_DEFAULT +SlateportCity_Harbor_EventScript_DeclineTrade:: @ 820CDFB + msgbox SlateportCity_Harbor_Text_IfYouWantToTradeLetMeKnow, MSGBOX_DEFAULT release end -SlateportCity_Harbor_EventScript_20CE05:: @ 820CE05 - message SlateportCity_Harbor_Text_20D926 +SlateportCity_Harbor_EventScript_ChooseDifferentTrade:: @ 820CE05 + message SlateportCity_Harbor_Text_WhichOneDoYouWant waitmessage - goto SlateportCity_Harbor_EventScript_20CD44 + goto SlateportCity_Harbor_EventScript_ChooseScannerTrade end -SlateportCity_Harbor_EventScript_20CE11:: @ 820CE11 +SlateportCity_Harbor_EventScript_TradedScanner:: @ 820CE11 setvar VAR_TEMP_1, 1 - msgbox SlateportCity_Harbor_Text_20D970, MSGBOX_DEFAULT + msgbox SlateportCity_Harbor_Text_ThisWillHelpResearch, MSGBOX_DEFAULT release end -SlateportCity_Harbor_Text_20CE20: @ 820CE20 +SlateportCity_Harbor_Text_FerryServiceUnavailable: @ 820CE20 .string "I beg your pardon?\n" .string "You're looking for a ship?\p" .string "I'm sorry, the ferry service isn't\n" .string "available at present…$" -SlateportCity_Harbor_Text_20CE87: @ 820CE87 +SlateportCity_Harbor_Text_MayISeeYourTicket: @ 820CE87 .string "Hello, are you here for the ferry?\n" .string "May I see your TICKET?$" - -SlateportCity_Harbor_Text_20CEC1: @ 820CEC1 +SlateportCity_Harbor_Text_YouMustHaveTicket: @ 820CEC1 .string "{PLAYER} doesn't have the TICKET…\p" .string "I'm terribly sorry.\p" .string "You must have a TICKET to board\n" .string "the ferry.$" -SlateportCity_Harbor_Text_20CF1C: @ 820CF1C +SlateportCity_Harbor_Text_FlashedTicketWhereTo: @ 820CF1C .string "{PLAYER} flashed the TICKET.\p" .string "Perfect! That's all you need!\p" .string "And where would you like to go?$" -SlateportCity_Harbor_Text_20CF71: @ 820CF71 +SlateportCity_Harbor_Text_SailAnotherTime: @ 820CF71 .string "Please sail with us another time!$" -SlateportCity_Harbor_Text_20CF93: @ 820CF93 +SlateportCity_Harbor_Text_LilycoveItIs: @ 820CF93 .string "LILYCOVE CITY it is, then!$" -SlateportCity_Harbor_Text_20CFAE: @ 820CFAE +SlateportCity_Harbor_Text_BattleFrontierItIs: @ 820CFAE .string "BATTLE FRONTIER it is, then!$" -SlateportCity_Harbor_Text_20CFCB: @ 820CFCB +SlateportCity_Harbor_Text_PleaseBoardFerry: @ 820CFCB .string "Please board the ferry and wait for\n" .string "departure.$" -SlateportCity_Harbor_Text_20CFFA: @ 820CFFA +SlateportCity_Harbor_Text_WhereWouldYouLikeToGo: @ 820CFFA .string "Then, where would you like to go?$" -SlateportCity_Harbor_Text_20D01C: @ 820D01C +SlateportCity_Harbor_Text_LoveToGoDeepUnderwaterSomeday: @ 820D01C .string "A journey to the bottom of the sea…\n" .string "I wonder what it'd be like?\p" .string "I'd love to go deep underwater like\n" .string "that someday.$" -SlateportCity_Harbor_Text_20D08E: @ 820D08E +SlateportCity_Harbor_Text_AbnormalWeather: @ 820D08E .string "For a ship to sail safely, we need to\n" .string "know about the weather!\p" .string "Speaking of weather, I heard something\n" @@ -449,19 +450,19 @@ SlateportCity_Harbor_Text_20D08E: @ 820D08E .string "You should visit the WEATHER INSTITUTE\n" .string "and ask around!$" -SlateportCity_Harbor_Text_20D194: @ 820D194 +SlateportCity_Harbor_Text_SubTooSmallForMe: @ 820D194 .string "I wanted to go with CAPT. STERN on\n" .string "the ocean floor exploration.\p" .string "But the sub's too small for me.\p" .string "If I squeezed in, there wouldn't be\n" .string "any room for the CAPTAIN…$" -SlateportCity_Harbor_Text_20D232: @ 820D232 +SlateportCity_Harbor_Text_SameThugsTriedToRobAtMuseum: @ 820D232 .string "CAPT. STERN: Those thugs…\p" .string "They're the same lot who tried to rob\n" .string "the DEVON GOODS at the MUSEUM.$" -SlateportCity_Harbor_Text_20D291: @ 820D291 +SlateportCity_Harbor_Text_ArchieYouAgainHideoutInLilycove: @ 820D291 .string "ARCHIE: Oh?\n" .string "Not you again…\p" .string "You are tenacious to track us here,\n" @@ -472,7 +473,7 @@ SlateportCity_Harbor_Text_20D291: @ 820D291 .string "HIDEOUT in LILYCOVE CITY?\p" .string "Fwahahahaha…$" -SlateportCity_Harbor_Text_20D35A: @ 820D35A +SlateportCity_Harbor_Text_CaptSternWhyStealMySubmarine: @ 820D35A .string "CAPT. STERN: Why…\p" .string "Why would TEAM AQUA steal my\n" .string "SUBMARINE EXPLORER 1?\p" @@ -481,7 +482,7 @@ SlateportCity_Harbor_Text_20D35A: @ 820D35A .string "But even if I were to chase them,\n" .string "I don't stand a chance against them…$" -SlateportCity_Harbor_Text_20D42B: @ 820D42B +SlateportCity_Harbor_Text_TeamAquaLeftNeedDive: @ 820D42B .string "CAPT. STERN: Oh, {PLAYER}{KUN}…\p" .string "Okay… So TEAM AQUA left before you\n" .string "could stop them…\p" @@ -496,7 +497,7 @@ SlateportCity_Harbor_Text_20D42B: @ 820D42B .string "A lot of divers live out there, so\n" .string "someone might teach you…$" -SlateportCity_Harbor_Text_20D58A: @ 820D58A +SlateportCity_Harbor_Text_NeedDiveToCatchSub: @ 820D58A .string "CAPT. STERN: Trying to catch a\n" .string "submarine… It's impossible.\p" .string "You would need a POKéMON that knows\n" @@ -506,13 +507,13 @@ SlateportCity_Harbor_Text_20D58A: @ 820D58A .string "A lot of divers live out there, so\n" .string "someone might teach you…$" -SlateportCity_Harbor_Text_20D65C: @ 820D65C +SlateportCity_Harbor_Text_WontBeLongBeforeWeFinishFerry: @ 820D65C .string "CAPT. STERN: Oh, yes.\n" .string "MR. BRINEY came to our SHIPYARD.\p" .string "It won't be long now before we finish\n" .string "making the ferry!$" -SlateportCity_Harbor_Text_20D6CB: @ 820D6CB +SlateportCity_Harbor_Text_FinishedMakingFerry: @ 820D6CB .string "CAPT. STERN: {PLAYER}{KUN}!\p" .string "We finally finished making the ferry\n" .string "S.S. TIDAL!\p" @@ -520,7 +521,7 @@ SlateportCity_Harbor_Text_20D6CB: @ 820D6CB .string "your friend MR. BRINEY.\p" .string "Please go for a short cruise on it!$" -SlateportCity_Harbor_Text_20D76C: @ 820D76C +SlateportCity_Harbor_Text_WouldYouTradeScanner: @ 820D76C .string "CAPT. STERN: Oh?\n" .string "{PLAYER}{KUN}, that item you have…\p" .string "That's a SCANNER! That would sure\n" @@ -530,27 +531,27 @@ SlateportCity_Harbor_Text_20D76C: @ 820D76C .string "Like, say, a DEEPSEATOOTH or\n" .string "a DEEPSEASCALE that I have?$" -SlateportCity_Harbor_Text_20D841: @ 820D841 +SlateportCity_Harbor_Text_IfYouWantToTradeLetMeKnow: @ 820D841 .string "CAPT. STERN: Are you certain?\n" .string "It's useless to you, {PLAYER}{KUN}…\p" .string "Well, okay, then. If you want to trade\n" .string "your SCANNER, let me know.$" -SlateportCity_Harbor_Text_20D8BC: @ 820D8BC +SlateportCity_Harbor_Text_TradeForDeepSeaTooth: @ 820D8BC .string "CAPT. STERN: So you'll trade it for\n" .string "my DEEPSEATOOTH?$" -SlateportCity_Harbor_Text_20D8F1: @ 820D8F1 +SlateportCity_Harbor_Text_TradeForDeepSeaScale: @ 820D8F1 .string "CAPT. STERN: So you'll trade it for\n" .string "my DEEPSEASCALE?$" -SlateportCity_Harbor_Text_20D926: @ 820D926 +SlateportCity_Harbor_Text_WhichOneDoYouWant: @ 820D926 .string "CAPT. STERN: Which one do you want?$" -SlateportCity_Harbor_Text_20D94A: @ 820D94A +SlateportCity_Harbor_Text_HandedScannerToStern: @ 820D94A .string "{PLAYER} handed the SCANNER to\n" .string "CAPT. STERN.$" -SlateportCity_Harbor_Text_20D970: @ 820D970 +SlateportCity_Harbor_Text_ThisWillHelpResearch: @ 820D970 .string "CAPT. STERN: Thanks, {PLAYER}{KUN}!\n" .string "This will help our research a lot!$" diff --git a/data/maps/SlateportCity_House2/map.json b/data/maps/SlateportCity_House/map.json similarity index 87% rename from data/maps/SlateportCity_House2/map.json rename to data/maps/SlateportCity_House/map.json index a6a686cf7..9052e19b1 100644 --- a/data/maps/SlateportCity_House2/map.json +++ b/data/maps/SlateportCity_House/map.json @@ -1,6 +1,6 @@ { - "id": "MAP_SLATEPORT_CITY_HOUSE2", - "name": "SlateportCity_House2", + "id": "MAP_SLATEPORT_CITY_HOUSE", + "name": "SlateportCity_House", "layout": "LAYOUT_HOUSE2", "music": "MUS_FINECITY", "region_map_section": "MAPSEC_SLATEPORT_CITY", @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_House2_EventScript_20D9AF", + "script": "SlateportCity_House_EventScript_PokefanM", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_House2_EventScript_20D9B8", + "script": "SlateportCity_House_EventScript_Girl", "flag": "0" } ], diff --git a/data/maps/SlateportCity_House/scripts.inc b/data/maps/SlateportCity_House/scripts.inc new file mode 100644 index 000000000..13b0caf91 --- /dev/null +++ b/data/maps/SlateportCity_House/scripts.inc @@ -0,0 +1,23 @@ +SlateportCity_House_MapScripts:: @ 820D9AE + .byte 0 + +SlateportCity_House_EventScript_PokefanM:: @ 820D9AF + msgbox SlateportCity_House_Text_NatureToDoWithStatGains, MSGBOX_NPC + end + +SlateportCity_House_EventScript_Girl:: @ 820D9B8 + msgbox SlateportCity_House_Text_MustBeGoingToBattleTent, MSGBOX_NPC + end + +SlateportCity_House_Text_NatureToDoWithStatGains: @ 820D9C1 + .string "My POKéMON has a HASTY nature.\p" + .string "It has higher SPEED compared to\n" + .string "my other POKéMON.\p" + .string "Maybe their nature has something to\n" + .string "do with the stat gains of POKéMON.$" + +SlateportCity_House_Text_MustBeGoingToBattleTent: @ 820DA59 + .string "You're a TRAINER, aren't you?\p" + .string "Since you came to SLATEPORT CITY,\n" + .string "you must be going to the BATTLE TENT.$" + diff --git a/data/maps/SlateportCity_House1/scripts.inc b/data/maps/SlateportCity_House1/scripts.inc deleted file mode 100644 index 3e80144c6..000000000 --- a/data/maps/SlateportCity_House1/scripts.inc +++ /dev/null @@ -1,121 +0,0 @@ -SlateportCity_House1_MapScripts:: @ 8209AA4 - .byte 0 - -SlateportCity_House1_EventScript_209AA5:: @ 8209AA5 - lock - faceplayer - msgbox SlateportCity_House1_Text_209B8E, MSGBOX_YESNO - compare VAR_RESULT, YES - goto_if_eq SlateportCity_House1_EventScript_209AC6 - compare VAR_RESULT, NO - goto_if_eq SlateportCity_House1_EventScript_209AE9 - end - -SlateportCity_House1_EventScript_209AC6:: @ 8209AC6 - msgbox SlateportCity_House1_Text_209BFF, MSGBOX_DEFAULT - special ChoosePartyMon - waitstate - compare VAR_0x8004, 255 - goto_if_ne SlateportCity_House1_EventScript_209AF3 - compare VAR_0x8004, 255 - goto_if_eq SlateportCity_House1_EventScript_209AE9 - end - -SlateportCity_House1_EventScript_209AE9:: @ 8209AE9 - msgbox SlateportCity_House1_Text_209D42, MSGBOX_DEFAULT - release - end - -SlateportCity_House1_EventScript_209AF3:: @ 8209AF3 - specialvar VAR_RESULT, ScriptGetPartyMonSpecies - compare VAR_RESULT, SPECIES_EGG - goto_if_eq SlateportCity_House1_EventScript_209B46 - special TV_CopyNicknameToStringVar1AndEnsureTerminated - special TV_CheckMonOTIDEqualsPlayerID - compare VAR_RESULT, 1 - goto_if_eq SlateportCity_House1_EventScript_209B50 - specialvar VAR_RESULT, MonOTNameMatchesPlayer - special TV_CopyNicknameToStringVar1AndEnsureTerminated - compare VAR_RESULT, 1 - goto_if_eq SlateportCity_House1_EventScript_209B50 - msgbox SlateportCity_House1_Text_209C2B, MSGBOX_YESNO - compare VAR_RESULT, YES - goto_if_eq SlateportCity_House1_EventScript_209B5A - compare VAR_RESULT, NO - goto_if_eq SlateportCity_House1_EventScript_209AE9 - end - -SlateportCity_House1_EventScript_209B46:: @ 8209B46 - msgbox SlateportCity_House1_Text_209E74, MSGBOX_DEFAULT - release - end - -SlateportCity_House1_EventScript_209B50:: @ 8209B50 - msgbox SlateportCity_House1_Text_209DF0, MSGBOX_DEFAULT - release - end - -SlateportCity_House1_EventScript_209B5A:: @ 8209B5A - msgbox SlateportCity_House1_Text_209CA4, MSGBOX_DEFAULT - call Common_EventScript_NameReceivedPartyMon - specialvar VAR_RESULT, TV_PutNameRaterShowOnTheAirIfNicknameChanged - special TV_CopyNicknameToStringVar1AndEnsureTerminated - compare VAR_RESULT, 1 - goto_if_eq SlateportCity_House1_EventScript_209B84 - msgbox SlateportCity_House1_Text_209D5E, MSGBOX_DEFAULT - release - end - -SlateportCity_House1_EventScript_209B84:: @ 8209B84 - msgbox SlateportCity_House1_Text_209CD4, MSGBOX_DEFAULT - release - end - -SlateportCity_House1_Text_209B8E: @ 8209B8E - .string "Hi, hi! I'm the NAME RATER!\n" - .string "I'm the fortune-teller of names!\p" - .string "I shall be pleased to rate your\n" - .string "POKéMON's nickname.$" - -SlateportCity_House1_Text_209BFF: @ 8209BFF - .string "Which POKéMON's nickname should\n" - .string "I critique?$" - -SlateportCity_House1_Text_209C2B: @ 8209C2B - .string "Hmmm… {STR_VAR_1}, is it? That is\n" - .string "quite a fine name you bestowed.\p" - .string "But! What say you, if I were to\n" - .string "suggest a slightly better name?$" - -SlateportCity_House1_Text_209CA4: @ 8209CA4 - .string "Ah, good. Then, what shall the new\n" - .string "nickname be?$" - -SlateportCity_House1_Text_209CD4: @ 8209CD4 - .string "Done! From now on, this POKéMON\n" - .string "shall be known as {STR_VAR_1}!\p" - .string "It is a better name than before!\n" - .string "How fortunate for you!$" - -SlateportCity_House1_Text_209D42: @ 8209D42 - .string "I see.\n" - .string "Do come visit again.$" - -SlateportCity_House1_Text_209D5E: @ 8209D5E - .string "Done! From now on, this POKéMON\n" - .string "shall be known as {STR_VAR_1}!\p" - .string "It looks no different from before,\n" - .string "and yet, this is vastly superior!\p" - .string "How fortunate for you!$" - -SlateportCity_House1_Text_209DF0: @ 8209DF0 - .string "Hmmm… {STR_VAR_1} it is!\p" - .string "This is a magnificent nickname!\n" - .string "It is impeccably beyond reproach!\p" - .string "You'll do well to cherish your\n" - .string "{STR_VAR_1} now and beyond.$" - -SlateportCity_House1_Text_209E74: @ 8209E74 - .string "Now, now.\n" - .string "That is merely an EGG!$" - diff --git a/data/maps/SlateportCity_House2/scripts.inc b/data/maps/SlateportCity_House2/scripts.inc deleted file mode 100644 index 1661d8fc5..000000000 --- a/data/maps/SlateportCity_House2/scripts.inc +++ /dev/null @@ -1,23 +0,0 @@ -SlateportCity_House2_MapScripts:: @ 820D9AE - .byte 0 - -SlateportCity_House2_EventScript_20D9AF:: @ 820D9AF - msgbox SlateportCity_House2_Text_20D9C1, MSGBOX_NPC - end - -SlateportCity_House2_EventScript_20D9B8:: @ 820D9B8 - msgbox SlateportCity_House2_Text_20DA59, MSGBOX_NPC - end - -SlateportCity_House2_Text_20D9C1: @ 820D9C1 - .string "My POKéMON has a HASTY nature.\p" - .string "It has higher SPEED compared to\n" - .string "my other POKéMON.\p" - .string "Maybe their nature has something to\n" - .string "do with the stat gains of POKéMON.$" - -SlateportCity_House2_Text_20DA59: @ 820DA59 - .string "You're a TRAINER, aren't you?\p" - .string "Since you came to SLATEPORT CITY,\n" - .string "you must be going to the BATTLE TENT.$" - diff --git a/data/maps/SlateportCity_House1/map.json b/data/maps/SlateportCity_NameRatersHouse/map.json similarity index 86% rename from data/maps/SlateportCity_House1/map.json rename to data/maps/SlateportCity_NameRatersHouse/map.json index 47943e517..1e464b9fd 100644 --- a/data/maps/SlateportCity_House1/map.json +++ b/data/maps/SlateportCity_NameRatersHouse/map.json @@ -1,6 +1,6 @@ { - "id": "MAP_SLATEPORT_CITY_HOUSE1", - "name": "SlateportCity_House1", + "id": "MAP_SLATEPORT_CITY_NAME_RATERS_HOUSE", + "name": "SlateportCity_NameRatersHouse", "layout": "LAYOUT_HOUSE_WITH_BED", "music": "MUS_FINECITY", "region_map_section": "MAPSEC_SLATEPORT_CITY", @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_House1_EventScript_209AA5", + "script": "SlateportCity_NameRatersHouse_EventScript_NameRater", "flag": "0" } ], diff --git a/data/maps/SlateportCity_NameRatersHouse/scripts.inc b/data/maps/SlateportCity_NameRatersHouse/scripts.inc new file mode 100644 index 000000000..92c6b7a02 --- /dev/null +++ b/data/maps/SlateportCity_NameRatersHouse/scripts.inc @@ -0,0 +1,121 @@ +SlateportCity_NameRatersHouse_MapScripts:: @ 8209AA4 + .byte 0 + +SlateportCity_NameRatersHouse_EventScript_NameRater:: @ 8209AA5 + lock + faceplayer + msgbox SlateportCity_NameRatersHouse_Text_PleasedToRateMonNickname, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq SlateportCity_NameRatersHouse_EventScript_ChooseMonToRate + compare VAR_RESULT, NO + goto_if_eq SlateportCity_NameRatersHouse_EventScript_DeclineNameRate + end + +SlateportCity_NameRatersHouse_EventScript_ChooseMonToRate:: @ 8209AC6 + msgbox SlateportCity_NameRatersHouse_Text_CritiqueWhichMonNickname, MSGBOX_DEFAULT + special ChoosePartyMon + waitstate + compare VAR_0x8004, 255 + goto_if_ne SlateportCity_NameRatersHouse_EventScript_RateMonNickname + compare VAR_0x8004, 255 + goto_if_eq SlateportCity_NameRatersHouse_EventScript_DeclineNameRate + end + +SlateportCity_NameRatersHouse_EventScript_DeclineNameRate:: @ 8209AE9 + msgbox SlateportCity_NameRatersHouse_Text_DoVisitAgain, MSGBOX_DEFAULT + release + end + +SlateportCity_NameRatersHouse_EventScript_RateMonNickname:: @ 8209AF3 + specialvar VAR_RESULT, ScriptGetPartyMonSpecies + compare VAR_RESULT, SPECIES_EGG + goto_if_eq SlateportCity_NameRatersHouse_EventScript_CantRateEgg + special BufferMonNickname + special IsMonOTIDNotPlayers + compare VAR_RESULT, TRUE + goto_if_eq SlateportCity_NameRatersHouse_EventScript_PlayerNotMonsOT + specialvar VAR_RESULT, MonOTNameNotPlayer + special BufferMonNickname + compare VAR_RESULT, TRUE + goto_if_eq SlateportCity_NameRatersHouse_EventScript_PlayerNotMonsOT + msgbox SlateportCity_NameRatersHouse_Text_FineNameSuggestBetterOne, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq SlateportCity_NameRatersHouse_EventScript_ChangeNickname + compare VAR_RESULT, NO + goto_if_eq SlateportCity_NameRatersHouse_EventScript_DeclineNameRate + end + +SlateportCity_NameRatersHouse_EventScript_CantRateEgg:: @ 8209B46 + msgbox SlateportCity_NameRatersHouse_Text_ThatIsMerelyAnEgg, MSGBOX_DEFAULT + release + end + +SlateportCity_NameRatersHouse_EventScript_PlayerNotMonsOT:: @ 8209B50 + msgbox SlateportCity_NameRatersHouse_Text_MagnificentName, MSGBOX_DEFAULT + release + end + +SlateportCity_NameRatersHouse_EventScript_ChangeNickname:: @ 8209B5A + msgbox SlateportCity_NameRatersHouse_Text_WhatShallNewNameBe, MSGBOX_DEFAULT + call Common_EventScript_NameReceivedPartyMon + specialvar VAR_RESULT, TryPutNameRaterShowOnTheAir + special BufferMonNickname + compare VAR_RESULT, TRUE + goto_if_eq SlateportCity_NameRatersHouse_EventScript_NewNameDifferent + msgbox SlateportCity_NameRatersHouse_Text_NameNoDifferentYetSuperior, MSGBOX_DEFAULT + release + end + +SlateportCity_NameRatersHouse_EventScript_NewNameDifferent:: @ 8209B84 + msgbox SlateportCity_NameRatersHouse_Text_MonShallBeKnownAsName, MSGBOX_DEFAULT + release + end + +SlateportCity_NameRatersHouse_Text_PleasedToRateMonNickname: @ 8209B8E + .string "Hi, hi! I'm the NAME RATER!\n" + .string "I'm the fortune-teller of names!\p" + .string "I shall be pleased to rate your\n" + .string "POKéMON's nickname.$" + +SlateportCity_NameRatersHouse_Text_CritiqueWhichMonNickname: @ 8209BFF + .string "Which POKéMON's nickname should\n" + .string "I critique?$" + +SlateportCity_NameRatersHouse_Text_FineNameSuggestBetterOne: @ 8209C2B + .string "Hmmm… {STR_VAR_1}, is it? That is\n" + .string "quite a fine name you bestowed.\p" + .string "But! What say you, if I were to\n" + .string "suggest a slightly better name?$" + +SlateportCity_NameRatersHouse_Text_WhatShallNewNameBe: @ 8209CA4 + .string "Ah, good. Then, what shall the new\n" + .string "nickname be?$" + +SlateportCity_NameRatersHouse_Text_MonShallBeKnownAsName: @ 8209CD4 + .string "Done! From now on, this POKéMON\n" + .string "shall be known as {STR_VAR_1}!\p" + .string "It is a better name than before!\n" + .string "How fortunate for you!$" + +SlateportCity_NameRatersHouse_Text_DoVisitAgain: @ 8209D42 + .string "I see.\n" + .string "Do come visit again.$" + +SlateportCity_NameRatersHouse_Text_NameNoDifferentYetSuperior: @ 8209D5E + .string "Done! From now on, this POKéMON\n" + .string "shall be known as {STR_VAR_1}!\p" + .string "It looks no different from before,\n" + .string "and yet, this is vastly superior!\p" + .string "How fortunate for you!$" + +SlateportCity_NameRatersHouse_Text_MagnificentName: @ 8209DF0 + .string "Hmmm… {STR_VAR_1} it is!\p" + .string "This is a magnificent nickname!\n" + .string "It is impeccably beyond reproach!\p" + .string "You'll do well to cherish your\n" + .string "{STR_VAR_1} now and beyond.$" + +SlateportCity_NameRatersHouse_Text_ThatIsMerelyAnEgg: @ 8209E74 + .string "Now, now.\n" + .string "That is merely an EGG!$" + diff --git a/data/maps/SlateportCity_PokemonFanClub/map.json b/data/maps/SlateportCity_PokemonFanClub/map.json index faf7e7db2..5e0e0616c 100644 --- a/data/maps/SlateportCity_PokemonFanClub/map.json +++ b/data/maps/SlateportCity_PokemonFanClub/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_PokemonFanClub_EventScript_20A1E8", + "script": "SlateportCity_PokemonFanClub_EventScript_Man", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_PokemonFanClub_EventScript_20A1F1", + "script": "SlateportCity_PokemonFanClub_EventScript_Twin", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_PokemonFanClub_EventScript_28C943", + "script": "SlateportCity_PokemonFanClub_EventScript_Reporter", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_PokemonFanClub_EventScript_20A17E", + "script": "SlateportCity_PokemonFanClub_EventScript_SootheBellWoman", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_PokemonFanClub_EventScript_209E96", + "script": "SlateportCity_PokemonFanClub_EventScript_Chairman", "flag": "0" }, { @@ -89,7 +89,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_PokemonFanClub_EventScript_20A20D", + "script": "SlateportCity_PokemonFanClub_EventScript_Zigzagoon", "flag": "0" }, { @@ -102,7 +102,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_PokemonFanClub_EventScript_20A1FA", + "script": "SlateportCity_PokemonFanClub_EventScript_Skitty", "flag": "0" }, { @@ -115,7 +115,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_PokemonFanClub_EventScript_20A220", + "script": "SlateportCity_PokemonFanClub_EventScript_Azumarill", "flag": "0" }, { diff --git a/data/maps/SlateportCity_PokemonFanClub/scripts.inc b/data/maps/SlateportCity_PokemonFanClub/scripts.inc index 866bf2963..eff7edfa7 100644 --- a/data/maps/SlateportCity_PokemonFanClub/scripts.inc +++ b/data/maps/SlateportCity_PokemonFanClub/scripts.inc @@ -1,272 +1,272 @@ SlateportCity_PokemonFanClub_MapScripts:: @ 8209E95 .byte 0 -SlateportCity_PokemonFanClub_EventScript_209E96:: @ 8209E96 +SlateportCity_PokemonFanClub_EventScript_Chairman:: @ 8209E96 lock faceplayer - goto_if_unset FLAG_ENTERED_LINK_CONTEST, SlateportCity_PokemonFanClub_EventScript_20A152 - call_if_unset FLAG_MET_SLATEPORT_FANCLUB_CHAIRMAN, SlateportCity_PokemonFanClub_EventScript_20A172 + goto_if_unset FLAG_ENTERED_LINK_CONTEST, SlateportCity_PokemonFanClub_EventScript_ChairmanNotEnteredContest + call_if_unset FLAG_MET_SLATEPORT_FANCLUB_CHAIRMAN, SlateportCity_PokemonFanClub_EventScript_MeetChairman switch VAR_SLATEPORT_FAN_CLUB_STATE - case 0, SlateportCity_PokemonFanClub_EventScript_209ED2 - case 1, SlateportCity_PokemonFanClub_EventScript_209EE5 - case 2, SlateportCity_PokemonFanClub_EventScript_209F3B + case 0, SlateportCity_PokemonFanClub_EventScript_ChairmanFirstAssessment + case 1, SlateportCity_PokemonFanClub_EventScript_ChairmanTryAssessPokemon + case 2, SlateportCity_PokemonFanClub_EventScript_NoMoreScarves release end -SlateportCity_PokemonFanClub_EventScript_209ED2:: @ 8209ED2 +SlateportCity_PokemonFanClub_EventScript_ChairmanFirstAssessment:: @ 8209ED2 setvar VAR_SLATEPORT_FAN_CLUB_STATE, 1 - msgbox SlateportCity_PokemonFanClub_Text_20A445, MSGBOX_DEFAULT - goto SlateportCity_PokemonFanClub_EventScript_209F45 + msgbox SlateportCity_PokemonFanClub_Text_AllowMeToExamineYourPokemon, MSGBOX_DEFAULT + goto SlateportCity_PokemonFanClub_EventScript_ChairmanAssessLeadMon end -SlateportCity_PokemonFanClub_EventScript_209EE5:: @ 8209EE5 +SlateportCity_PokemonFanClub_EventScript_ChairmanTryAssessPokemon:: @ 8209EE5 setvar VAR_TEMP_2, 0 - call_if_set FLAG_RECEIVED_YELLOW_SCARF, SlateportCity_PokemonFanClub_EventScript_209FD0 - call_if_set FLAG_RECEIVED_GREEN_SCARF, SlateportCity_PokemonFanClub_EventScript_209FD0 - call_if_set FLAG_RECEIVED_PINK_SCARF, SlateportCity_PokemonFanClub_EventScript_209FD0 - call_if_set FLAG_RECEIVED_BLUE_SCARF, SlateportCity_PokemonFanClub_EventScript_209FD0 - call_if_set FLAG_RECEIVED_RED_SCARF, SlateportCity_PokemonFanClub_EventScript_209FD0 - compare VAR_TEMP_2, 5 - call_if_eq SlateportCity_PokemonFanClub_EventScript_209FCA + call_if_set FLAG_RECEIVED_YELLOW_SCARF, SlateportCity_PokemonFanClub_EventScript_CountReceivedScarf + call_if_set FLAG_RECEIVED_GREEN_SCARF, SlateportCity_PokemonFanClub_EventScript_CountReceivedScarf + call_if_set FLAG_RECEIVED_PINK_SCARF, SlateportCity_PokemonFanClub_EventScript_CountReceivedScarf + call_if_set FLAG_RECEIVED_BLUE_SCARF, SlateportCity_PokemonFanClub_EventScript_CountReceivedScarf + call_if_set FLAG_RECEIVED_RED_SCARF, SlateportCity_PokemonFanClub_EventScript_CountReceivedScarf + compare VAR_TEMP_2, CONTEST_CATEGORIES_COUNT + call_if_eq SlateportCity_PokemonFanClub_EventScript_ReceivedAllScarves compare VAR_SLATEPORT_FAN_CLUB_STATE, 2 - goto_if_eq SlateportCity_PokemonFanClub_EventScript_209F3B - msgbox SlateportCity_PokemonFanClub_Text_20A62A, MSGBOX_DEFAULT - goto SlateportCity_PokemonFanClub_EventScript_209F45 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_NoMoreScarves + msgbox SlateportCity_PokemonFanClub_Text_HowIsYourPokemonGrowing, MSGBOX_DEFAULT + goto SlateportCity_PokemonFanClub_EventScript_ChairmanAssessLeadMon end -SlateportCity_PokemonFanClub_EventScript_209F3B:: @ 8209F3B - msgbox SlateportCity_PokemonFanClub_Text_20A9E1, MSGBOX_DEFAULT +SlateportCity_PokemonFanClub_EventScript_NoMoreScarves:: @ 8209F3B + msgbox SlateportCity_PokemonFanClub_Text_NothingElseToGiveYou, MSGBOX_DEFAULT release end -SlateportCity_PokemonFanClub_EventScript_209F45:: @ 8209F45 - msgbox SlateportCity_PokemonFanClub_Text_20A65F, MSGBOX_DEFAULT +SlateportCity_PokemonFanClub_EventScript_ChairmanAssessLeadMon:: @ 8209F45 + msgbox SlateportCity_PokemonFanClub_Text_HmHmISee, MSGBOX_DEFAULT setvar VAR_TEMP_1, 0 - call_if_unset FLAG_RECEIVED_YELLOW_SCARF, SlateportCity_PokemonFanClub_EventScript_20A13B - call_if_unset FLAG_RECEIVED_GREEN_SCARF, SlateportCity_PokemonFanClub_EventScript_20A124 - call_if_unset FLAG_RECEIVED_PINK_SCARF, SlateportCity_PokemonFanClub_EventScript_20A10D - call_if_unset FLAG_RECEIVED_BLUE_SCARF, SlateportCity_PokemonFanClub_EventScript_20A0F6 - call_if_unset FLAG_RECEIVED_RED_SCARF, SlateportCity_PokemonFanClub_EventScript_20A0DF + call_if_unset FLAG_RECEIVED_YELLOW_SCARF, SlateportCity_PokemonFanClub_EventScript_CheckMonTough + call_if_unset FLAG_RECEIVED_GREEN_SCARF, SlateportCity_PokemonFanClub_EventScript_CheckMonSmart + call_if_unset FLAG_RECEIVED_PINK_SCARF, SlateportCity_PokemonFanClub_EventScript_CheckMonCute + call_if_unset FLAG_RECEIVED_BLUE_SCARF, SlateportCity_PokemonFanClub_EventScript_CheckMonBeauty + call_if_unset FLAG_RECEIVED_RED_SCARF, SlateportCity_PokemonFanClub_EventScript_CheckMonCool bufferleadmonspeciesname 0 switch VAR_TEMP_1 - case 0, SlateportCity_PokemonFanClub_EventScript_209FD6 - case 1, SlateportCity_PokemonFanClub_EventScript_209FE0 - case 2, SlateportCity_PokemonFanClub_EventScript_20A011 - case 3, SlateportCity_PokemonFanClub_EventScript_20A042 - case 4, SlateportCity_PokemonFanClub_EventScript_20A073 - case 5, SlateportCity_PokemonFanClub_EventScript_20A0A4 + case 0, SlateportCity_PokemonFanClub_EventScript_NoHighConditions + case 1, SlateportCity_PokemonFanClub_EventScript_GiveRedScarf + case 2, SlateportCity_PokemonFanClub_EventScript_GiveBlueScarf + case 3, SlateportCity_PokemonFanClub_EventScript_GivePinkScarf + case 4, SlateportCity_PokemonFanClub_EventScript_GiveGreenScarf + case 5, SlateportCity_PokemonFanClub_EventScript_GiveYellowScarf release end -SlateportCity_PokemonFanClub_EventScript_209FCA:: @ 8209FCA +SlateportCity_PokemonFanClub_EventScript_ReceivedAllScarves:: @ 8209FCA setvar VAR_SLATEPORT_FAN_CLUB_STATE, 2 return -SlateportCity_PokemonFanClub_EventScript_209FD0:: @ 8209FD0 +SlateportCity_PokemonFanClub_EventScript_CountReceivedScarf:: @ 8209FD0 addvar VAR_TEMP_2, 1 return -SlateportCity_PokemonFanClub_EventScript_209FD6:: @ 8209FD6 - msgbox SlateportCity_PokemonFanClub_Text_20A66E, MSGBOX_DEFAULT +SlateportCity_PokemonFanClub_EventScript_NoHighConditions:: @ 8209FD6 + msgbox SlateportCity_PokemonFanClub_Text_GiveMonMorePokeblocks, MSGBOX_DEFAULT release end -SlateportCity_PokemonFanClub_EventScript_209FE0:: @ 8209FE0 +SlateportCity_PokemonFanClub_EventScript_GiveRedScarf:: @ 8209FE0 checkitemspace ITEM_RED_SCARF, 1 - compare VAR_RESULT, 0 - goto_if_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 - msgbox SlateportCity_PokemonFanClub_Text_20A795, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + goto_if_eq SlateportCity_PokemonFanClub_EventScript_NoRoomForScarf + msgbox SlateportCity_PokemonFanClub_Text_MonMostImpressiveGiveItThis, MSGBOX_DEFAULT setflag FLAG_RECEIVED_RED_SCARF giveitem_std ITEM_RED_SCARF - msgbox SlateportCity_PokemonFanClub_Text_20A827, MSGBOX_DEFAULT + msgbox SlateportCity_PokemonFanClub_Text_ExplainRedScarf, MSGBOX_DEFAULT release end -SlateportCity_PokemonFanClub_EventScript_20A011:: @ 820A011 +SlateportCity_PokemonFanClub_EventScript_GiveBlueScarf:: @ 820A011 checkitemspace ITEM_BLUE_SCARF, 1 - compare VAR_RESULT, 0 - goto_if_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 - msgbox SlateportCity_PokemonFanClub_Text_20A795, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + goto_if_eq SlateportCity_PokemonFanClub_EventScript_NoRoomForScarf + msgbox SlateportCity_PokemonFanClub_Text_MonMostImpressiveGiveItThis, MSGBOX_DEFAULT setflag FLAG_RECEIVED_BLUE_SCARF giveitem_std ITEM_BLUE_SCARF - msgbox SlateportCity_PokemonFanClub_Text_20A880, MSGBOX_DEFAULT + msgbox SlateportCity_PokemonFanClub_Text_ExplainBlueScarf, MSGBOX_DEFAULT release end -SlateportCity_PokemonFanClub_EventScript_20A042:: @ 820A042 +SlateportCity_PokemonFanClub_EventScript_GivePinkScarf:: @ 820A042 checkitemspace ITEM_PINK_SCARF, 1 - compare VAR_RESULT, 0 - goto_if_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 - msgbox SlateportCity_PokemonFanClub_Text_20A795, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + goto_if_eq SlateportCity_PokemonFanClub_EventScript_NoRoomForScarf + msgbox SlateportCity_PokemonFanClub_Text_MonMostImpressiveGiveItThis, MSGBOX_DEFAULT setflag FLAG_RECEIVED_PINK_SCARF giveitem_std ITEM_PINK_SCARF - msgbox SlateportCity_PokemonFanClub_Text_20A8D7, MSGBOX_DEFAULT + msgbox SlateportCity_PokemonFanClub_Text_ExplainPinkScarf, MSGBOX_DEFAULT release end -SlateportCity_PokemonFanClub_EventScript_20A073:: @ 820A073 +SlateportCity_PokemonFanClub_EventScript_GiveGreenScarf:: @ 820A073 checkitemspace ITEM_GREEN_SCARF, 1 - compare VAR_RESULT, 0 - goto_if_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 - msgbox SlateportCity_PokemonFanClub_Text_20A795, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + goto_if_eq SlateportCity_PokemonFanClub_EventScript_NoRoomForScarf + msgbox SlateportCity_PokemonFanClub_Text_MonMostImpressiveGiveItThis, MSGBOX_DEFAULT setflag FLAG_RECEIVED_GREEN_SCARF giveitem_std ITEM_GREEN_SCARF - msgbox SlateportCity_PokemonFanClub_Text_20A933, MSGBOX_DEFAULT + msgbox SlateportCity_PokemonFanClub_Text_ExplainGreenScarf, MSGBOX_DEFAULT release end -SlateportCity_PokemonFanClub_EventScript_20A0A4:: @ 820A0A4 +SlateportCity_PokemonFanClub_EventScript_GiveYellowScarf:: @ 820A0A4 checkitemspace ITEM_YELLOW_SCARF, 1 - compare VAR_RESULT, 0 - goto_if_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 - msgbox SlateportCity_PokemonFanClub_Text_20A795, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + goto_if_eq SlateportCity_PokemonFanClub_EventScript_NoRoomForScarf + msgbox SlateportCity_PokemonFanClub_Text_MonMostImpressiveGiveItThis, MSGBOX_DEFAULT setflag FLAG_RECEIVED_YELLOW_SCARF giveitem_std ITEM_YELLOW_SCARF - msgbox SlateportCity_PokemonFanClub_Text_20A984, MSGBOX_DEFAULT + msgbox SlateportCity_PokemonFanClub_Text_ExplainYellowScarf, MSGBOX_DEFAULT release end -SlateportCity_PokemonFanClub_EventScript_20A0D5:: @ 820A0D5 - msgbox SlateportCity_PokemonFanClub_Text_20A719, MSGBOX_DEFAULT +SlateportCity_PokemonFanClub_EventScript_NoRoomForScarf:: @ 820A0D5 + msgbox SlateportCity_PokemonFanClub_Text_NoSpaceForReward, MSGBOX_DEFAULT release end -SlateportCity_PokemonFanClub_EventScript_20A0DF:: @ 820A0DF +SlateportCity_PokemonFanClub_EventScript_CheckMonCool:: @ 820A0DF specialvar VAR_RESULT, CheckLeadMonCool - compare VAR_RESULT, 1 - call_if_eq SlateportCity_PokemonFanClub_EventScript_20A0F0 + compare VAR_RESULT, TRUE + call_if_eq SlateportCity_PokemonFanClub_EventScript_SetMonCool return -SlateportCity_PokemonFanClub_EventScript_20A0F0:: @ 820A0F0 +SlateportCity_PokemonFanClub_EventScript_SetMonCool:: @ 820A0F0 setvar VAR_TEMP_1, 1 return -SlateportCity_PokemonFanClub_EventScript_20A0F6:: @ 820A0F6 +SlateportCity_PokemonFanClub_EventScript_CheckMonBeauty:: @ 820A0F6 specialvar VAR_RESULT, CheckLeadMonBeauty - compare VAR_RESULT, 1 - call_if_eq SlateportCity_PokemonFanClub_EventScript_20A107 + compare VAR_RESULT, TRUE + call_if_eq SlateportCity_PokemonFanClub_EventScript_SetMonBeauty return -SlateportCity_PokemonFanClub_EventScript_20A107:: @ 820A107 +SlateportCity_PokemonFanClub_EventScript_SetMonBeauty:: @ 820A107 setvar VAR_TEMP_1, 2 return -SlateportCity_PokemonFanClub_EventScript_20A10D:: @ 820A10D +SlateportCity_PokemonFanClub_EventScript_CheckMonCute:: @ 820A10D specialvar VAR_RESULT, CheckLeadMonCute - compare VAR_RESULT, 1 - call_if_eq SlateportCity_PokemonFanClub_EventScript_20A11E + compare VAR_RESULT, TRUE + call_if_eq SlateportCity_PokemonFanClub_EventScript_SetMonCute return -SlateportCity_PokemonFanClub_EventScript_20A11E:: @ 820A11E +SlateportCity_PokemonFanClub_EventScript_SetMonCute:: @ 820A11E setvar VAR_TEMP_1, 3 return -SlateportCity_PokemonFanClub_EventScript_20A124:: @ 820A124 +SlateportCity_PokemonFanClub_EventScript_CheckMonSmart:: @ 820A124 specialvar VAR_RESULT, CheckLeadMonSmart - compare VAR_RESULT, 1 - call_if_eq SlateportCity_PokemonFanClub_EventScript_20A135 + compare VAR_RESULT, TRUE + call_if_eq SlateportCity_PokemonFanClub_EventScript_SetMonSmart return -SlateportCity_PokemonFanClub_EventScript_20A135:: @ 820A135 +SlateportCity_PokemonFanClub_EventScript_SetMonSmart:: @ 820A135 setvar VAR_TEMP_1, 4 return -SlateportCity_PokemonFanClub_EventScript_20A13B:: @ 820A13B +SlateportCity_PokemonFanClub_EventScript_CheckMonTough:: @ 820A13B specialvar VAR_RESULT, CheckLeadMonTough - compare VAR_RESULT, 1 - call_if_eq SlateportCity_PokemonFanClub_EventScript_20A14C + compare VAR_RESULT, TRUE + call_if_eq SlateportCity_PokemonFanClub_EventScript_SetMonTough return -SlateportCity_PokemonFanClub_EventScript_20A14C:: @ 820A14C +SlateportCity_PokemonFanClub_EventScript_SetMonTough:: @ 820A14C setvar VAR_TEMP_1, 5 return -SlateportCity_PokemonFanClub_EventScript_20A152:: @ 820A152 - goto_if_set FLAG_MET_SLATEPORT_FANCLUB_CHAIRMAN, SlateportCity_PokemonFanClub_EventScript_20A168 - msgbox SlateportCity_PokemonFanClub_Text_20A233, MSGBOX_DEFAULT +SlateportCity_PokemonFanClub_EventScript_ChairmanNotEnteredContest:: @ 820A152 + goto_if_set FLAG_MET_SLATEPORT_FANCLUB_CHAIRMAN, SlateportCity_PokemonFanClub_EventScript_ChairmanEnterContest + msgbox SlateportCity_PokemonFanClub_Text_MeetChairman, MSGBOX_DEFAULT setflag FLAG_MET_SLATEPORT_FANCLUB_CHAIRMAN release end -SlateportCity_PokemonFanClub_EventScript_20A168:: @ 820A168 - msgbox SlateportCity_PokemonFanClub_Text_20A3EE, MSGBOX_DEFAULT +SlateportCity_PokemonFanClub_EventScript_ChairmanEnterContest:: @ 820A168 + msgbox SlateportCity_PokemonFanClub_Text_LikeToSeeEnteredContestPokemon, MSGBOX_DEFAULT release end -SlateportCity_PokemonFanClub_EventScript_20A172:: @ 820A172 - msgbox SlateportCity_PokemonFanClub_Text_20A233, MSGBOX_DEFAULT +SlateportCity_PokemonFanClub_EventScript_MeetChairman:: @ 820A172 + msgbox SlateportCity_PokemonFanClub_Text_MeetChairman, MSGBOX_DEFAULT setflag FLAG_MET_SLATEPORT_FANCLUB_CHAIRMAN return -SlateportCity_PokemonFanClub_EventScript_20A17E:: @ 820A17E +SlateportCity_PokemonFanClub_EventScript_SootheBellWoman:: @ 820A17E lock faceplayer - goto_if_set FLAG_RECEIVED_SOOTHE_BELL, SlateportCity_PokemonFanClub_EventScript_20A1DE - msgbox SlateportCity_PokemonFanClub_Text_20AA77, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_SOOTHE_BELL, SlateportCity_PokemonFanClub_EventScript_ReceivedSootheBell + msgbox SlateportCity_PokemonFanClub_Text_ShowMePokemonThatLoveYou, MSGBOX_DEFAULT specialvar VAR_RESULT, GetLeadMonFriendshipScore compare VAR_RESULT, 4 - goto_if_ge SlateportCity_PokemonFanClub_EventScript_20A1A3 + goto_if_ge SlateportCity_PokemonFanClub_EventScript_GiveSootheBell release end -SlateportCity_PokemonFanClub_EventScript_20A1A3:: @ 820A1A3 +SlateportCity_PokemonFanClub_EventScript_GiveSootheBell:: @ 820A1A3 playse SE_PIN applymovement VAR_LAST_TALKED, Common_Movement_ExclamationMark waitmovement 0 applymovement VAR_LAST_TALKED, Common_Movement_Delay48 waitmovement 0 - msgbox SlateportCity_PokemonFanClub_Text_20AB63, MSGBOX_DEFAULT + msgbox SlateportCity_PokemonFanClub_Text_PokemonAdoresYou, MSGBOX_DEFAULT giveitem_std ITEM_SOOTHE_BELL - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_SOOTHE_BELL release end -SlateportCity_PokemonFanClub_EventScript_20A1DE:: @ 820A1DE - msgbox SlateportCity_PokemonFanClub_Text_20ABC4, MSGBOX_DEFAULT +SlateportCity_PokemonFanClub_EventScript_ReceivedSootheBell:: @ 820A1DE + msgbox SlateportCity_PokemonFanClub_Text_TreatPokemonWithLove, MSGBOX_DEFAULT release end -SlateportCity_PokemonFanClub_EventScript_20A1E8:: @ 820A1E8 - msgbox SlateportCity_PokemonFanClub_Text_20AC47, MSGBOX_NPC +SlateportCity_PokemonFanClub_EventScript_Man:: @ 820A1E8 + msgbox SlateportCity_PokemonFanClub_Text_PokemonDontLikeFainting, MSGBOX_NPC end -SlateportCity_PokemonFanClub_EventScript_20A1F1:: @ 820A1F1 - msgbox SlateportCity_PokemonFanClub_Text_20ACF9, MSGBOX_NPC +SlateportCity_PokemonFanClub_EventScript_Twin:: @ 820A1F1 + msgbox SlateportCity_PokemonFanClub_Text_MonEnjoyedProtein, MSGBOX_NPC end -SlateportCity_PokemonFanClub_EventScript_20A1FA:: @ 820A1FA +SlateportCity_PokemonFanClub_EventScript_Skitty:: @ 820A1FA lock faceplayer waitse playmoncry SPECIES_SKITTY, 0 - msgbox SlateportCity_PokemonFanClub_Text_20AD5A, MSGBOX_DEFAULT + msgbox SlateportCity_PokemonFanClub_Text_Skitty, MSGBOX_DEFAULT waitmoncry release end -SlateportCity_PokemonFanClub_EventScript_20A20D:: @ 820A20D +SlateportCity_PokemonFanClub_EventScript_Zigzagoon:: @ 820A20D lock faceplayer waitse playmoncry SPECIES_ZIGZAGOON, 0 - msgbox SlateportCity_PokemonFanClub_Text_20AD6E, MSGBOX_DEFAULT + msgbox SlateportCity_PokemonFanClub_Text_Zigzagoon, MSGBOX_DEFAULT waitmoncry release end -SlateportCity_PokemonFanClub_EventScript_20A220:: @ 820A220 +SlateportCity_PokemonFanClub_EventScript_Azumarill:: @ 820A220 lock faceplayer waitse playmoncry SPECIES_AZUMARILL, 0 - msgbox SlateportCity_PokemonFanClub_Text_20AD80, MSGBOX_DEFAULT + msgbox SlateportCity_PokemonFanClub_Text_Azumarill, MSGBOX_DEFAULT waitmoncry release end -SlateportCity_PokemonFanClub_Text_20A233: @ 820A233 +SlateportCity_PokemonFanClub_Text_MeetChairman: @ 820A233 .string "Er-hem! I am the CHAIRMAN of the\n" .string "POKéMON FAN CLUB!\p" .string "Being the CHAIRMAN, I am naturally\n" @@ -283,12 +283,12 @@ SlateportCity_PokemonFanClub_Text_20A233: @ 820A233 .string "off our POKéMON, and have others\l" .string "show us theirs.$" -SlateportCity_PokemonFanClub_Text_20A3EE: @ 820A3EE +SlateportCity_PokemonFanClub_Text_LikeToSeeEnteredContestPokemon: @ 820A3EE .string "The POKéMON of a TRAINER who has\n" .string "entered a POKéMON CONTEST…\l" .string "That, I would like to see.$" -SlateportCity_PokemonFanClub_Text_20A445: @ 820A445 +SlateportCity_PokemonFanClub_Text_AllowMeToExamineYourPokemon: @ 820A445 .string "Er-hem! I see you've participated in\n" .string "a POKéMON CONTEST!\p" .string "Please! Allow me to examine how you\n" @@ -306,15 +306,15 @@ SlateportCity_PokemonFanClub_Text_20A445: @ 820A445 .string "Please! Allow me to examine how much\n" .string "your POKéMON has grown!$" -SlateportCity_PokemonFanClub_Text_20A62A: @ 820A62A +SlateportCity_PokemonFanClub_Text_HowIsYourPokemonGrowing: @ 820A62A .string "How is your POKéMON growing?\n" .string "Allow me to examine it.$" -SlateportCity_PokemonFanClub_Text_20A65F: @ 820A65F +SlateportCity_PokemonFanClub_Text_HmHmISee: @ 820A65F .string "Hm, hm…\n" .string "I see…$" -SlateportCity_PokemonFanClub_Text_20A66E: @ 820A66E +SlateportCity_PokemonFanClub_Text_GiveMonMorePokeblocks: @ 820A66E .string "Hmmm… It's not bad, but it's not\n" .string "good, either…\p" .string "You, the TRAINER, must put more\n" @@ -322,53 +322,53 @@ SlateportCity_PokemonFanClub_Text_20A66E: @ 820A66E .string "For instance, may I suggest that\n" .string "you give it more {POKEBLOCK}S?$" -SlateportCity_PokemonFanClub_Text_20A719: @ 820A719 +SlateportCity_PokemonFanClub_Text_NoSpaceForReward: @ 820A719 .string "Oh, my…\p" .string "Your POKéMON is growing quite well,\n" .string "so you deserve a reward.\p" .string "Unfortunately, you have no space for\n" .string "this in your BAG.$" -SlateportCity_PokemonFanClub_Text_20A795: @ 820A795 +SlateportCity_PokemonFanClub_Text_MonMostImpressiveGiveItThis: @ 820A795 .string "Your {STR_VAR_1}, it is growing in\n" .string "a most impressive manner!\l" .string "It is one fine specimen!\p" .string "But! If you were to give it this,\n" .string "it would grow even better! Indeed!$" -SlateportCity_PokemonFanClub_Text_20A827: @ 820A827 +SlateportCity_PokemonFanClub_Text_ExplainRedScarf: @ 820A827 .string "Let a POKéMON hold that RED SCARF.\p" .string "Everyone will recognize the coolness\n" .string "of that POKéMON!$" -SlateportCity_PokemonFanClub_Text_20A880: @ 820A880 +SlateportCity_PokemonFanClub_Text_ExplainBlueScarf: @ 820A880 .string "Let a POKéMON hold that BLUE SCARF.\p" .string "Its beauty will be accentuated much\n" .string "more than now!$" -SlateportCity_PokemonFanClub_Text_20A8D7: @ 820A8D7 +SlateportCity_PokemonFanClub_Text_ExplainPinkScarf: @ 820A8D7 .string "Let a POKéMON hold that PINK SCARF.\p" .string "It will draw out the cuteness of\n" .string "the POKéMON some more!$" -SlateportCity_PokemonFanClub_Text_20A933: @ 820A933 +SlateportCity_PokemonFanClub_Text_ExplainGreenScarf: @ 820A933 .string "Let a POKéMON hold that GREEN SCARF.\p" .string "That will enhance the\n" .string "smartness of POKéMON!$" -SlateportCity_PokemonFanClub_Text_20A984: @ 820A984 +SlateportCity_PokemonFanClub_Text_ExplainYellowScarf: @ 820A984 .string "Let a POKéMON hold that YELLOW SCARF.\p" .string "It will bolster your POKéMON's\n" .string "toughness so much more!$" -SlateportCity_PokemonFanClub_Text_20A9E1: @ 820A9E1 +SlateportCity_PokemonFanClub_Text_NothingElseToGiveYou: @ 820A9E1 .string "I'm sorry, but I've nothing else to\n" .string "give you! None at all!\p" .string "After all, you're blessed with the gift\n" .string "of raising POKéMON without resorting\l" .string "to any items!$" -SlateportCity_PokemonFanClub_Text_20AA77: @ 820AA77 +SlateportCity_PokemonFanClub_Text_ShowMePokemonThatLoveYou: @ 820AA77 .string "I love seeing POKéMON that love\n" .string "their TRAINERS.\p" .string "POKéMON are very sensitive to\n" @@ -378,18 +378,18 @@ SlateportCity_PokemonFanClub_Text_20AA77: @ 820AA77 .string "When your POKéMON grow to love you,\n" .string "please come show me.$" -SlateportCity_PokemonFanClub_Text_20AB63: @ 820AB63 +SlateportCity_PokemonFanClub_Text_PokemonAdoresYou: @ 820AB63 .string "Your POKéMON really adores you.\p" .string "For you, a most compassionate\n" .string "TRAINER, a gift from the FAN CLUB!$" -SlateportCity_PokemonFanClub_Text_20ABC4: @ 820ABC4 +SlateportCity_PokemonFanClub_Text_TreatPokemonWithLove: @ 820ABC4 .string "POKéMON are very sensitive to\n" .string "the feelings of their TRAINERS.\p" .string "If you treat your POKéMON with love\n" .string "and care, they'll love you back.$" -SlateportCity_PokemonFanClub_Text_20AC47: @ 820AC47 +SlateportCity_PokemonFanClub_Text_PokemonDontLikeFainting: @ 820AC47 .string "If you keep letting a POKéMON faint\n" .string "in battle, it'll come to resent it.\p" .string "Soon, it will become less trusting\n" @@ -397,18 +397,18 @@ SlateportCity_PokemonFanClub_Text_20AC47: @ 820AC47 .string "In other words, it certainly won't\n" .string "like you very much.$" -SlateportCity_PokemonFanClub_Text_20ACF9: @ 820ACF9 +SlateportCity_PokemonFanClub_Text_MonEnjoyedProtein: @ 820ACF9 .string "Do POKéMON enjoy having items used\n" .string "on them?\p" .string "Mine acted really happy when I gave\n" .string "it some PROTEIN.$" -SlateportCity_PokemonFanClub_Text_20AD5A: @ 820AD5A +SlateportCity_PokemonFanClub_Text_Skitty: @ 820AD5A .string "SKITTY: Fffnyaaaah…$" -SlateportCity_PokemonFanClub_Text_20AD6E: @ 820AD6E +SlateportCity_PokemonFanClub_Text_Zigzagoon: @ 820AD6E .string "ZIGZAGOON: Kyuuu…$" -SlateportCity_PokemonFanClub_Text_20AD80: @ 820AD80 +SlateportCity_PokemonFanClub_Text_Azumarill: @ 820AD80 .string "AZUMARILL: Marimari?$" diff --git a/data/maps/SlateportCity_SternsShipyard_1F/map.json b/data/maps/SlateportCity_SternsShipyard_1F/map.json index 351431280..d5d8fce4e 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/map.json +++ b/data/maps/SlateportCity_SternsShipyard_1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_SternsShipyard_1F_EventScript_207F40", + "script": "SlateportCity_SternsShipyard_1F_EventScript_Dock", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_SternsShipyard_1F_EventScript_207FED", + "script": "SlateportCity_SternsShipyard_1F_EventScript_Scientist1", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_SternsShipyard_1F_EventScript_207FF6", + "script": "SlateportCity_SternsShipyard_1F_EventScript_Scientist2", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 2, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_SternsShipyard_1F_EventScript_207FFF", + "script": "SlateportCity_SternsShipyard_1F_EventScript_Briney", "flag": "FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY" } ], diff --git a/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc index 6c554387a..4939f5407 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc +++ b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc @@ -1,16 +1,16 @@ SlateportCity_SternsShipyard_1F_MapScripts:: @ 8207F3F .byte 0 -SlateportCity_SternsShipyard_1F_EventScript_207F40:: @ 8207F40 +SlateportCity_SternsShipyard_1F_EventScript_Dock:: @ 8207F40 lockall - goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_SternsShipyard_1F_EventScript_207F92 - goto_if_set FLAG_BADGE07_GET, SlateportCity_SternsShipyard_1F_EventScript_207FA6 - goto_if_set FLAG_DELIVERED_DEVON_GOODS, SlateportCity_SternsShipyard_1F_EventScript_207FD9 - goto_if_set FLAG_DOCK_REJECTED_DEVON_GOODS, SlateportCity_SternsShipyard_1F_EventScript_207FBA - msgbox SlateportCity_SternsShipyard_1F_Text_208008, MSGBOX_DEFAULT + goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_SternsShipyard_1F_EventScript_FerryReady + goto_if_set FLAG_BADGE07_GET, SlateportCity_SternsShipyard_1F_EventScript_BrineyJoined + goto_if_set FLAG_DELIVERED_DEVON_GOODS, SlateportCity_SternsShipyard_1F_EventScript_NeedVeteran + goto_if_set FLAG_DOCK_REJECTED_DEVON_GOODS, SlateportCity_SternsShipyard_1F_EventScript_GoFindStern + msgbox SlateportCity_SternsShipyard_1F_Text_CantMakeHeadsOrTails, MSGBOX_DEFAULT applymovement 1, Common_Movement_FacePlayer waitmovement 0 - msgbox SlateportCity_SternsShipyard_1F_Text_2080A5, MSGBOX_DEFAULT + msgbox SlateportCity_SternsShipyard_1F_Text_MeetDockDeliverToStern, MSGBOX_DEFAULT closemessage applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 @@ -19,50 +19,50 @@ SlateportCity_SternsShipyard_1F_EventScript_207F40:: @ 8207F40 releaseall end -SlateportCity_SternsShipyard_1F_EventScript_207F92:: @ 8207F92 +SlateportCity_SternsShipyard_1F_EventScript_FerryReady:: @ 8207F92 applymovement 1, Common_Movement_FacePlayer waitmovement 0 - msgbox SlateportCity_SternsShipyard_1F_Text_208323, MSGBOX_DEFAULT + msgbox SlateportCity_SternsShipyard_1F_Text_FerryIsReady, MSGBOX_DEFAULT releaseall end -SlateportCity_SternsShipyard_1F_EventScript_207FA6:: @ 8207FA6 +SlateportCity_SternsShipyard_1F_EventScript_BrineyJoined:: @ 8207FA6 applymovement 1, Common_Movement_FacePlayer waitmovement 0 - msgbox SlateportCity_SternsShipyard_1F_Text_2082A8, MSGBOX_DEFAULT + msgbox SlateportCity_SternsShipyard_1F_Text_BrineyJoinedUs, MSGBOX_DEFAULT releaseall end -SlateportCity_SternsShipyard_1F_EventScript_207FBA:: @ 8207FBA +SlateportCity_SternsShipyard_1F_EventScript_GoFindStern:: @ 8207FBA applymovement 1, Common_Movement_FacePlayer waitmovement 0 - msgbox SlateportCity_SternsShipyard_1F_Text_2081A5, MSGBOX_DEFAULT + msgbox SlateportCity_SternsShipyard_1F_Text_CouldYouFindStern, MSGBOX_DEFAULT closemessage applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end -SlateportCity_SternsShipyard_1F_EventScript_207FD9:: @ 8207FD9 +SlateportCity_SternsShipyard_1F_EventScript_NeedVeteran:: @ 8207FD9 applymovement 1, Common_Movement_FacePlayer waitmovement 0 - msgbox SlateportCity_SternsShipyard_1F_Text_208213, MSGBOX_DEFAULT + msgbox SlateportCity_SternsShipyard_1F_Text_CouldUseAdviceFromVeteran, MSGBOX_DEFAULT releaseall end -SlateportCity_SternsShipyard_1F_EventScript_207FED:: @ 8207FED - msgbox SlateportCity_SternsShipyard_1F_Text_208558, MSGBOX_NPC +SlateportCity_SternsShipyard_1F_EventScript_Scientist1:: @ 8207FED + msgbox SlateportCity_SternsShipyard_1F_Text_SeaIsLikeLivingThing, MSGBOX_NPC end -SlateportCity_SternsShipyard_1F_EventScript_207FF6:: @ 8207FF6 - msgbox SlateportCity_SternsShipyard_1F_Text_2085FF, MSGBOX_NPC +SlateportCity_SternsShipyard_1F_EventScript_Scientist2:: @ 8207FF6 + msgbox SlateportCity_SternsShipyard_1F_Text_GetSeasickEasily, MSGBOX_NPC end -SlateportCity_SternsShipyard_1F_EventScript_207FFF:: @ 8207FFF - msgbox SlateportCity_SternsShipyard_1F_Text_2083EE, MSGBOX_NPC +SlateportCity_SternsShipyard_1F_EventScript_Briney:: @ 8207FFF + msgbox SlateportCity_SternsShipyard_1F_Text_DecidedToHelpDock, MSGBOX_NPC end -SlateportCity_SternsShipyard_1F_Text_208008: @ 8208008 +SlateportCity_SternsShipyard_1F_Text_CantMakeHeadsOrTails: @ 8208008 .string "Umm… If this goes here, and that\n" .string "goes over there…\p" .string "Then where does this thing go?\n" @@ -70,7 +70,7 @@ SlateportCity_SternsShipyard_1F_Text_208008: @ 8208008 .string "Aaargh! I can't make heads or tails\n" .string "of this!$" -SlateportCity_SternsShipyard_1F_Text_2080A5: @ 82080A5 +SlateportCity_SternsShipyard_1F_Text_MeetDockDeliverToStern: @ 82080A5 .string "Hm?\n" .string "Hi, I'm DOCK.\p" .string "CAPT. STERN commissioned me to\n" @@ -84,26 +84,26 @@ SlateportCity_SternsShipyard_1F_Text_2080A5: @ 82080A5 .string "Could I get you to go find CAPT.\n" .string "STERN and deliver that to him?$" -SlateportCity_SternsShipyard_1F_Text_2081A5: @ 82081A5 +SlateportCity_SternsShipyard_1F_Text_CouldYouFindStern: @ 82081A5 .string "DOCK: Where could CAPT. STERN have\n" .string "gone off to?\p" .string "Could you go find CAPT. STERN and\n" .string "deliver that parcel to him?$" -SlateportCity_SternsShipyard_1F_Text_208213: @ 8208213 +SlateportCity_SternsShipyard_1F_Text_CouldUseAdviceFromVeteran: @ 8208213 .string "DOCK: Shipbuilding is an art.\p" .string "A lot of things can't be figured out\n" .string "just by calculating.\p" .string "I really could use advice from a veteran\n" .string "who knows the seas…$" -SlateportCity_SternsShipyard_1F_Text_2082A8: @ 82082A8 +SlateportCity_SternsShipyard_1F_Text_BrineyJoinedUs: @ 82082A8 .string "DOCK: Hi! MR. BRINEY's joined us to\n" .string "lend us his help.\p" .string "Thanks to the veteran sailor, the\n" .string "ferry is steadily coming together.$" -SlateportCity_SternsShipyard_1F_Text_208323: @ 8208323 +SlateportCity_SternsShipyard_1F_Text_FerryIsReady: @ 8208323 .string "DOCK: The ferry is finally ready!\p" .string "The new S.S. TIDAL is truly a marvel\n" .string "of technology!\p" @@ -112,7 +112,7 @@ SlateportCity_SternsShipyard_1F_Text_208323: @ 8208323 .string "You know, there's never an end to\n" .string "technology's march.$" -SlateportCity_SternsShipyard_1F_Text_2083EE: @ 82083EE +SlateportCity_SternsShipyard_1F_Text_DecidedToHelpDock: @ 82083EE .string "MR. BRINEY: Ah, {PLAYER}{KUN}!\n" .string "It's been too long!\p" .string "Aye, since I met you, this old sea dog's\n" @@ -127,7 +127,7 @@ SlateportCity_SternsShipyard_1F_Text_2083EE: @ 82083EE .string "my experience, I'm sure that we can\l" .string "build one great ship, aye!$" -SlateportCity_SternsShipyard_1F_Text_208558: @ 8208558 +SlateportCity_SternsShipyard_1F_Text_SeaIsLikeLivingThing: @ 8208558 .string "The seasons, the weather, where\n" .string "the moon sits in the sky…\p" .string "These and other conditions make\n" @@ -135,7 +135,7 @@ SlateportCity_SternsShipyard_1F_Text_208558: @ 8208558 .string "That's right!\n" .string "The sea is like a living thing!$" -SlateportCity_SternsShipyard_1F_Text_2085FF: @ 82085FF +SlateportCity_SternsShipyard_1F_Text_GetSeasickEasily: @ 82085FF .string "I get seasick real easily.\n" .string "So I get to help out here instead.$" diff --git a/data/maps/SlateportCity_SternsShipyard_2F/map.json b/data/maps/SlateportCity_SternsShipyard_2F/map.json index 2e57c63fd..78b39989f 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/map.json +++ b/data/maps/SlateportCity_SternsShipyard_2F/map.json @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_SternsShipyard_2F_EventScript_20863E", + "script": "SlateportCity_SternsShipyard_2F_EventScript_Scientist1", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_SternsShipyard_2F_EventScript_208647", + "script": "SlateportCity_SternsShipyard_2F_EventScript_Scientist2", "flag": "0" } ], diff --git a/data/maps/SlateportCity_SternsShipyard_2F/scripts.inc b/data/maps/SlateportCity_SternsShipyard_2F/scripts.inc index 6fa410dfe..fff96bc65 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/scripts.inc +++ b/data/maps/SlateportCity_SternsShipyard_2F/scripts.inc @@ -1,20 +1,20 @@ SlateportCity_SternsShipyard_2F_MapScripts:: @ 820863D .byte 0 -SlateportCity_SternsShipyard_2F_EventScript_20863E:: @ 820863E - msgbox SlateportCity_SternsShipyard_2F_Text_208650, MSGBOX_NPC +SlateportCity_SternsShipyard_2F_EventScript_Scientist1:: @ 820863E + msgbox SlateportCity_SternsShipyard_2F_Text_ShipDesignMoreLikeBuilding, MSGBOX_NPC end -SlateportCity_SternsShipyard_2F_EventScript_208647:: @ 8208647 - msgbox SlateportCity_SternsShipyard_2F_Text_2086BA, MSGBOX_NPC +SlateportCity_SternsShipyard_2F_EventScript_Scientist2:: @ 8208647 + msgbox SlateportCity_SternsShipyard_2F_Text_FloatsBecauseBuoyancy, MSGBOX_NPC end -SlateportCity_SternsShipyard_2F_Text_208650: @ 8208650 +SlateportCity_SternsShipyard_2F_Text_ShipDesignMoreLikeBuilding: @ 8208650 .string "Designing a large ship is more like\n" .string "making a big building than putting\l" .string "together a transportation vehicle.$" -SlateportCity_SternsShipyard_2F_Text_2086BA: @ 82086BA +SlateportCity_SternsShipyard_2F_Text_FloatsBecauseBuoyancy: @ 82086BA .string "Don't you think it's strange that\n" .string "a ship made of heavy iron floats?\p" .string "It floats because of a principle\n" diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json index 74746e0c4..190e41fc8 100644 --- a/data/maps/map_groups.json +++ b/data/maps/map_groups.json @@ -170,12 +170,12 @@ "SlateportCity_BattleTentLobby", "SlateportCity_BattleTentCorridor", "SlateportCity_BattleTentBattleRoom", - "SlateportCity_House1", + "SlateportCity_NameRatersHouse", "SlateportCity_PokemonFanClub", "SlateportCity_OceanicMuseum_1F", "SlateportCity_OceanicMuseum_2F", "SlateportCity_Harbor", - "SlateportCity_House2", + "SlateportCity_House", "SlateportCity_PokemonCenter_1F", "SlateportCity_PokemonCenter_2F", "SlateportCity_Mart" diff --git a/data/scripts/interview.inc b/data/scripts/interview.inc index 8b2b72f75..5036e8ec9 100644 --- a/data/scripts/interview.inc +++ b/data/scripts/interview.inc @@ -105,7 +105,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_28C939:: @ 828C939 release end -SlateportCity_PokemonFanClub_EventScript_28C943:: @ 828C943 +SlateportCity_PokemonFanClub_EventScript_Reporter:: @ 828C943 lock faceplayer specialvar VAR_RESULT, sub_80EF8F8 diff --git a/data/specials.inc b/data/specials.inc index 9954ba9dc..cfc50e49c 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -134,9 +134,9 @@ gSpecials:: @ 81DBA64 def_special CompareSeedotSize def_special GetLotadSizeRecordInfo def_special CompareLotadSize - def_special TV_PutNameRaterShowOnTheAirIfNicknameChanged - def_special TV_CopyNicknameToStringVar1AndEnsureTerminated - def_special TV_CheckMonOTIDEqualsPlayerID + def_special TryPutNameRaterShowOnTheAir + def_special BufferMonNickname + def_special IsMonOTIDNotPlayers def_special BufferTrendyPhraseString def_special TrendyPhraseIsOld def_special sub_811EF6C @@ -346,7 +346,7 @@ gSpecials:: @ 81DBA64 def_special SetPacifidlogTMReceivedDay def_special GetDaysUntilPacifidlogTMAvailable def_special HasAllHoennMons - def_special MonOTNameMatchesPlayer + def_special MonOTNameNotPlayer def_special BufferLottoTicketNumber def_special sub_81653CC def_special DoesPartyHaveEnigmaBerry @@ -519,7 +519,7 @@ gSpecials:: @ 81DBA64 def_special Script_DoRayquazaScene @ Listed twice def_special LoopWingFlapSE def_special sub_81D4BEC - def_special sub_80224D0 + def_special ShowBerryCrushRankings def_special TryBufferWaldaPhrase def_special DoWaldaNamingScreen def_special TryGetWallpaperWithWaldaPhrase diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h index 63717c92c..be8f2fec8 100755 --- a/include/constants/map_groups.h +++ b/include/constants/map_groups.h @@ -136,12 +136,12 @@ #define MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY (2 | (9 << 8)) #define MAP_SLATEPORT_CITY_BATTLE_TENT_CORRIDOR (3 | (9 << 8)) #define MAP_SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM (4 | (9 << 8)) -#define MAP_SLATEPORT_CITY_HOUSE1 (5 | (9 << 8)) +#define MAP_SLATEPORT_CITY_NAME_RATERS_HOUSE (5 | (9 << 8)) #define MAP_SLATEPORT_CITY_POKEMON_FAN_CLUB (6 | (9 << 8)) #define MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F (7 | (9 << 8)) #define MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F (8 | (9 << 8)) #define MAP_SLATEPORT_CITY_HARBOR (9 | (9 << 8)) -#define MAP_SLATEPORT_CITY_HOUSE2 (10 | (9 << 8)) +#define MAP_SLATEPORT_CITY_HOUSE (10 | (9 << 8)) #define MAP_SLATEPORT_CITY_POKEMON_CENTER_1F (11 | (9 << 8)) #define MAP_SLATEPORT_CITY_POKEMON_CENTER_2F (12 | (9 << 8)) #define MAP_SLATEPORT_CITY_MART (13 | (9 << 8)) diff --git a/src/field_specials.c b/src/field_specials.c index 94c187eaa..109d57fd1 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -1609,18 +1609,16 @@ u16 SetPacifidlogTMReceivedDay(void) return gLocalTime.days; } -bool8 MonOTNameMatchesPlayer(void) +bool8 MonOTNameNotPlayer(void) { if (GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_LANGUAGE) != GAME_LANGUAGE) - { - return TRUE; // huh? - } + return TRUE; GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_OT_NAME, gStringVar1); + if (!StringCompare(gSaveBlock2Ptr->playerName, gStringVar1)) - { return FALSE; - } + return TRUE; } diff --git a/src/tv.c b/src/tv.c index 4cb6df16f..cb44fdb62 100644 --- a/src/tv.c +++ b/src/tv.c @@ -3436,13 +3436,14 @@ bool8 TV_IsScriptShowKindAlreadyInQueue(void) return FALSE; } -bool8 TV_PutNameRaterShowOnTheAirIfNicknameChanged(void) +bool8 TryPutNameRaterShowOnTheAir(void) { GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_NICKNAME, gStringVar1); + + // Nickname wasnt changed if (!StringCompare(gStringVar3, gStringVar1)) - { return FALSE; - } + PutNameRaterShowOnTheAir(); return TRUE; } @@ -3478,22 +3479,18 @@ void ChangeBoxPokemonNickname_CB(void) CB2_ReturnToFieldContinueScriptPlayMapMusic(); } -void TV_CopyNicknameToStringVar1AndEnsureTerminated(void) +void BufferMonNickname(void) { GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_NICKNAME, gStringVar1); StringGetEnd10(gStringVar1); } -void TV_CheckMonOTIDEqualsPlayerID(void) +void IsMonOTIDNotPlayers(void) { if (GetPlayerIDAsU32() == GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_OT_ID, NULL)) - { gSpecialVar_Result = FALSE; - } else - { gSpecialVar_Result = TRUE; - } } u8 GetTVChannelByShowType(u8 kind) From a727c160129de978c4e6f421747353dea7530d5f Mon Sep 17 00:00:00 2001 From: Thomas Winwood Date: Sat, 9 Nov 2019 03:17:35 +0000 Subject: [PATCH 35/40] Use descriptive constant for ScriptGiveMon call --- src/battle_setup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/battle_setup.c b/src/battle_setup.c index a978cc24d..77d98def7 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -897,7 +897,7 @@ static void CB2_GiveStarter(void) *GetVarPointer(VAR_STARTER_MON) = gSpecialVar_Result; starterMon = GetStarterPokemon(gSpecialVar_Result); - ScriptGiveMon(starterMon, 5, 0, 0, 0, 0); + ScriptGiveMon(starterMon, 5, ITEM_NONE, 0, 0, 0); ResetTasks(); PlayBattleBGM(); SetMainCallback2(CB2_StartFirstBattle); From 870297206718a227e5af71a19280f67f66386e16 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 8 Nov 2019 03:37:46 -0500 Subject: [PATCH 36/40] Document Sky Pillar outside --- data/event_scripts.s | 2 +- data/maps/EverGrandeCity/scripts.inc | 2 +- data/maps/LilycoveCity/scripts.inc | 2 +- data/maps/MossdeepCity/scripts.inc | 2 +- data/maps/Route124/scripts.inc | 2 +- data/maps/Route125/scripts.inc | 2 +- data/maps/Route126/scripts.inc | 2 +- data/maps/Route127/scripts.inc | 2 +- data/maps/Route128/scripts.inc | 2 +- data/maps/Route129/scripts.inc | 2 +- data/maps/Route130/scripts.inc | 2 +- data/maps/Route131/scripts.inc | 2 +- data/maps/SkyPillar_Outside/map.json | 2 +- data/maps/SkyPillar_Outside/scripts.inc | 62 +++++++++---------- data/maps/SootopolisCity/scripts.inc | 2 +- data/maps/Underwater3/scripts.inc | 4 +- data/maps/Underwater5/scripts.inc | 4 +- data/maps/Underwater6/scripts.inc | 4 +- data/maps/Underwater7/scripts.inc | 4 +- data/maps/Underwater_Route134/scripts.inc | 4 +- .../Underwater_SootopolisCity/scripts.inc | 4 +- include/constants/metatile_behaviors.h | 2 +- include/event_scripts.h | 2 +- include/metatile_behavior.h | 2 +- src/field_control_avatar.c | 4 +- src/metatile_behavior.c | 6 +- 26 files changed, 65 insertions(+), 65 deletions(-) diff --git a/data/event_scripts.s b/data/event_scripts.s index fba1cce26..f895783d6 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -780,7 +780,7 @@ Common_EventScript_NoRoomForDecor:: @ 8272071 msgbox gText_NoRoomLeftForAnother, MSGBOX_DEFAULT return -Common_EventScript_SetWeather15:: @ 827207A +Common_EventScript_SetAlternatingWeather:: @ 827207A setweather WEATHER_ALTERNATING return diff --git a/data/maps/EverGrandeCity/scripts.inc b/data/maps/EverGrandeCity/scripts.inc index 93e047dd0..04d3a9631 100644 --- a/data/maps/EverGrandeCity/scripts.inc +++ b/data/maps/EverGrandeCity/scripts.inc @@ -3,7 +3,7 @@ EverGrandeCity_MapScripts:: @ 81E7D1B .byte 0 EverGrandeCity_OnTransition: @ 81E7D21 - call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather end EverGrandeCity_EventScript_VictoryRoadSign:: @ 81E7D2B diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc index be8a7a521..b0d52d9f7 100644 --- a/data/maps/LilycoveCity/scripts.inc +++ b/data/maps/LilycoveCity/scripts.inc @@ -7,7 +7,7 @@ LilycoveCity_OnTransition: @ 81E2B47 setflag FLAG_VISITED_LILYCOVE_CITY setvar VAR_LINK_CONTEST_ROOM_STATE, 0 setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER - call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather call Common_EventScript_SetupRivalGfxId end diff --git a/data/maps/MossdeepCity/scripts.inc b/data/maps/MossdeepCity/scripts.inc index 3247df143..0b9da9912 100644 --- a/data/maps/MossdeepCity/scripts.inc +++ b/data/maps/MossdeepCity/scripts.inc @@ -7,7 +7,7 @@ MossdeepCity_OnTransition: @ 81E4A9C clearflag FLAG_MOSSDEEP_GYM_SWITCH_2 clearflag FLAG_MOSSDEEP_GYM_SWITCH_3 clearflag FLAG_MOSSDEEP_GYM_SWITCH_4 - call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather end MossdeepCity_EventScript_1E4AB2:: @ 81E4AB2 diff --git a/data/maps/Route124/scripts.inc b/data/maps/Route124/scripts.inc index ed6bc1ff0..23dd174f6 100644 --- a/data/maps/Route124/scripts.inc +++ b/data/maps/Route124/scripts.inc @@ -3,7 +3,7 @@ Route124_MapScripts:: @ 81F656C .byte 0 Route124_OnTransition: @ 81F6572 - call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather end Route124_EventScript_1F657C:: @ 81F657C diff --git a/data/maps/Route125/scripts.inc b/data/maps/Route125/scripts.inc index 13fe6dc8f..bf845c152 100644 --- a/data/maps/Route125/scripts.inc +++ b/data/maps/Route125/scripts.inc @@ -5,7 +5,7 @@ Route125_MapScripts:: @ 81F6748 .byte 0 Route125_OnTransition: @ 81F6758 - call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 call_if_eq UnusualWeather_EventScript_HideMapNamePopup compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_125_WEST diff --git a/data/maps/Route126/scripts.inc b/data/maps/Route126/scripts.inc index 640a5660e..d1a2ff0f3 100644 --- a/data/maps/Route126/scripts.inc +++ b/data/maps/Route126/scripts.inc @@ -3,7 +3,7 @@ Route126_MapScripts:: @ 81F68C6 .byte 0 Route126_OnTransition: @ 81F68CC - call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather end Route126_EventScript_1F68D6:: @ 81F68D6 diff --git a/data/maps/Route127/scripts.inc b/data/maps/Route127/scripts.inc index 33c833e32..db0fd0644 100644 --- a/data/maps/Route127/scripts.inc +++ b/data/maps/Route127/scripts.inc @@ -5,7 +5,7 @@ Route127_MapScripts:: @ 81F69D9 .byte 0 Route127_OnTransition: @ 81F69E9 - call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 call_if_eq UnusualWeather_EventScript_HideMapNamePopup compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_127_NORTH diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc index 6cd398a32..10397be89 100644 --- a/data/maps/Route128/scripts.inc +++ b/data/maps/Route128/scripts.inc @@ -4,7 +4,7 @@ Route128_MapScripts:: @ 81F6B38 .byte 0 Route128_OnTransition: @ 81F6B43 - call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather end Route128_MapScript2_1F6B4D: @ 81F6B4D diff --git a/data/maps/Route129/scripts.inc b/data/maps/Route129/scripts.inc index 43d828bcd..0245db703 100644 --- a/data/maps/Route129/scripts.inc +++ b/data/maps/Route129/scripts.inc @@ -23,7 +23,7 @@ Route129_OnTransition: @ 81F72AB end Route129_EventScript_1F72D8:: @ 81F72D8 - call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather return Route129_MapScript2_1F72E2: @ 81F72E2 diff --git a/data/maps/Route130/scripts.inc b/data/maps/Route130/scripts.inc index 18bccb185..9362e1d5d 100644 --- a/data/maps/Route130/scripts.inc +++ b/data/maps/Route130/scripts.inc @@ -31,7 +31,7 @@ Route130_EventScript_1F73B1:: @ 81F73B1 end Route130_EventScript_1F73B5:: @ 81F73B5 - call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather return Route130_EventScript_1F73BF:: @ 81F73BF diff --git a/data/maps/Route131/scripts.inc b/data/maps/Route131/scripts.inc index c1c3e26dc..1bb8cfdbc 100644 --- a/data/maps/Route131/scripts.inc +++ b/data/maps/Route131/scripts.inc @@ -13,7 +13,7 @@ Route131_EventScript_1F741B:: @ 81F741B return Route131_EventScript_1F741F:: @ 81F741F - call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather return Route131_EventScript_1F7429:: @ 81F7429 diff --git a/data/maps/SkyPillar_Outside/map.json b/data/maps/SkyPillar_Outside/map.json index 6a3764aa9..4c401ccf9 100644 --- a/data/maps/SkyPillar_Outside/map.json +++ b/data/maps/SkyPillar_Outside/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SkyPillar_Outside_EventScript_2393F8", + "script": "SkyPillar_Outside_EventScript_Wallace", "flag": "FLAG_HIDE_SKY_PILLAR_WALLACE" } ], diff --git a/data/maps/SkyPillar_Outside/scripts.inc b/data/maps/SkyPillar_Outside/scripts.inc index 72748842b..dfb1ffdb0 100644 --- a/data/maps/SkyPillar_Outside/scripts.inc +++ b/data/maps/SkyPillar_Outside/scripts.inc @@ -1,44 +1,44 @@ SkyPillar_Outside_MapScripts:: @ 82392A8 map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_Outside_OnTransition - map_script MAP_SCRIPT_ON_LOAD, SkyPillar_Outside_MapScript1_2392DD - map_script MAP_SCRIPT_ON_FRAME_TABLE, SkyPillar_Outside_MapScript2_2392FA + map_script MAP_SCRIPT_ON_LOAD, SkyPillar_Outside_OnLoad + map_script MAP_SCRIPT_ON_FRAME_TABLE, SkyPillar_Outside_OnFrame .byte 0 SkyPillar_Outside_OnTransition: @ 82392B8 compare VAR_SOOTOPOLIS_CITY_STATE, 3 - call_if_eq SkyPillar_Outside_EventScript_2392CF + call_if_eq SkyPillar_Outside_EventScript_HideMapNamePopup compare VAR_SOOTOPOLIS_CITY_STATE, 4 - call_if_ge SkyPillar_Outside_EventScript_2392D3 + call_if_ge SkyPillar_Outside_EventScript_CheckSetAlternatingWeather end -SkyPillar_Outside_EventScript_2392CF:: @ 82392CF +SkyPillar_Outside_EventScript_HideMapNamePopup:: @ 82392CF setflag FLAG_HIDE_MAP_NAME_POPUP return -SkyPillar_Outside_EventScript_2392D3:: @ 82392D3 - call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 +SkyPillar_Outside_EventScript_CheckSetAlternatingWeather:: @ 82392D3 + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather return -SkyPillar_Outside_MapScript1_2392DD: @ 82392DD - call_if_set FLAG_WALLACE_GOES_TO_SKY_PILLAR, SkyPillar_Outside_EventScript_2392E7 +SkyPillar_Outside_OnLoad: @ 82392DD + call_if_set FLAG_WALLACE_GOES_TO_SKY_PILLAR, SkyPillar_Outside_EventScript_OpenDoor end -SkyPillar_Outside_EventScript_2392E7:: @ 82392E7 +SkyPillar_Outside_EventScript_OpenDoor:: @ 82392E7 setmetatile 14, 4, METATILE_Pacifidlog_SkyPillar_DoorOpen_Top, 0 setmetatile 14, 5, METATILE_Pacifidlog_SkyPillar_DoorOpen_Bottom, 0 return -SkyPillar_Outside_MapScript2_2392FA: @ 82392FA - map_script_2 VAR_SOOTOPOLIS_CITY_STATE, 3, SkyPillar_Outside_EventScript_239304 +SkyPillar_Outside_OnFrame: @ 82392FA + map_script_2 VAR_SOOTOPOLIS_CITY_STATE, 3, SkyPillar_Outside_EventScript_WallaceScene .2byte 0 -SkyPillar_Outside_EventScript_239304:: @ 8239304 +SkyPillar_Outside_EventScript_WallaceScene:: @ 8239304 lockall - applymovement 1, SkyPillar_Outside_Movement_2393D3 + applymovement 1, SkyPillar_Outside_Movement_WallaceApproachPlayer waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - msgbox SkyPillar_Outside_Text_239416, MSGBOX_DEFAULT + msgbox SkyPillar_Outside_Text_OpenedDoorToSkyPillar, MSGBOX_DEFAULT closemessage delay 30 setvar VAR_0x8004, 1 @ vertical pan @@ -48,10 +48,10 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304 special ShakeCamera waitstate delay 40 - msgbox SkyPillar_Outside_Text_2394BC, MSGBOX_DEFAULT + msgbox SkyPillar_Outside_Text_EarthquakeNotMomentToWaste, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, SkyPillar_Outside_Movement_2393EB - applymovement 1, SkyPillar_Outside_Movement_2393DE + applymovement EVENT_OBJ_ID_PLAYER, SkyPillar_Outside_Movement_PlayerClimbSkyPillar + applymovement 1, SkyPillar_Outside_Movement_WallaceClimbSkyPillar waitmovement 0 setvar VAR_0x8004, 1 @ vertical pan setvar VAR_0x8005, 3 @ horizontal pan @@ -69,7 +69,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304 applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 delay 30 - msgbox SkyPillar_Outside_Text_23950C, MSGBOX_DEFAULT + msgbox SkyPillar_Outside_Text_SituationGettingWorse, MSGBOX_DEFAULT closemessage setflag FLAG_SYS_WEATHER_CTRL setweather WEATHER_ALTERNATING @@ -77,7 +77,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304 special WaitWeather waitstate delay 30 - msgbox SkyPillar_Outside_Text_23953A, MSGBOX_DEFAULT + msgbox SkyPillar_Outside_Text_GotToGoBackForSootopolis, MSGBOX_DEFAULT closemessage playse SE_KAIDAN fadescreenswapbuffers 1 @@ -89,7 +89,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304 releaseall end -SkyPillar_Outside_Movement_2393D3: @ 82393D3 +SkyPillar_Outside_Movement_WallaceApproachPlayer: @ 82393D3 walk_down walk_down walk_down @@ -102,7 +102,7 @@ SkyPillar_Outside_Movement_2393D3: @ 82393D3 walk_right step_end -SkyPillar_Outside_Movement_2393DE: @ 82393DE +SkyPillar_Outside_Movement_WallaceClimbSkyPillar: @ 82393DE walk_left walk_left walk_left @@ -117,7 +117,7 @@ SkyPillar_Outside_Movement_2393DE: @ 82393DE walk_up step_end -SkyPillar_Outside_Movement_2393EB: @ 82393EB +SkyPillar_Outside_Movement_PlayerClimbSkyPillar: @ 82393EB walk_left walk_left walk_left @@ -132,17 +132,17 @@ SkyPillar_Outside_Movement_2393EB: @ 82393EB walk_up step_end -SkyPillar_Outside_EventScript_2393F8:: @ 82393F8 +SkyPillar_Outside_EventScript_Wallace:: @ 82393F8 end -SkyPillar_Outside_EventScript_2393F9:: @ 82393F9 - msgbox SkyPillar_Outside_Text_239402, MSGBOX_SIGN +SkyPillar_Outside_EventScript_ClosedDoor:: @ 82393F9 + msgbox SkyPillar_Outside_Text_DoorIsClosed, MSGBOX_SIGN end -SkyPillar_Outside_Text_239402: @ 8239402 +SkyPillar_Outside_Text_DoorIsClosed: @ 8239402 .string "The door is closed.$" -SkyPillar_Outside_Text_239416: @ 8239416 +SkyPillar_Outside_Text_OpenedDoorToSkyPillar: @ 8239416 .string "WALLACE: Oh, my, I'm terribly sorry!\p" .string "In my haste, I didn't notice that\n" .string "I'd left you behind!\p" @@ -150,16 +150,16 @@ SkyPillar_Outside_Text_239416: @ 8239416 .string "the SKY PILLAR.\p" .string "{PLAYER}{KUN}, let's be on our way!$" -SkyPillar_Outside_Text_2394BC: @ 82394BC +SkyPillar_Outside_Text_EarthquakeNotMomentToWaste: @ 82394BC .string "WALLACE: It's an earthquake!\p" .string "There's not a moment to waste!\n" .string "We've got to hurry!$" -SkyPillar_Outside_Text_23950C: @ 823950C +SkyPillar_Outside_Text_SituationGettingWorse: @ 823950C .string "WALLACE: Hmm…\n" .string "The situation is getting worse…$" -SkyPillar_Outside_Text_23953A: @ 823953A +SkyPillar_Outside_Text_GotToGoBackForSootopolis: @ 823953A .string "WALLACE: This isn't good…\p" .string "The weather distortion is spreading\n" .string "even here…\p" diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index d74ca48a1..a7e8fc00f 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -110,7 +110,7 @@ SootopolisCity_EventScript_1E5805:: @ 81E5805 compare VAR_SKY_PILLAR_STATE, 1 goto_if_eq SootopolisCity_EventScript_1E583E compare VAR_SKY_PILLAR_STATE, 1 - goto_if_le Common_EventScript_SetWeather15 + goto_if_le Common_EventScript_SetAlternatingWeather return SootopolisCity_EventScript_1E583D:: @ 81E583D diff --git a/data/maps/Underwater3/scripts.inc b/data/maps/Underwater3/scripts.inc index 53b80053f..81435cf7b 100644 --- a/data/maps/Underwater3/scripts.inc +++ b/data/maps/Underwater3/scripts.inc @@ -1,8 +1,8 @@ Underwater3_MapScripts:: @ 81F7724 - map_script MAP_SCRIPT_ON_RESUME, Underwater3_MapScript1_1F772A + map_script MAP_SCRIPT_ON_RESUME, Underwater3_OnResume .byte 0 -Underwater3_MapScript1_1F772A: @ 81F772A +Underwater3_OnResume: @ 81F772A call UnusualWeather_Underwater_SetupEscapeWarp end diff --git a/data/maps/Underwater5/scripts.inc b/data/maps/Underwater5/scripts.inc index fe068207e..6c435a44d 100644 --- a/data/maps/Underwater5/scripts.inc +++ b/data/maps/Underwater5/scripts.inc @@ -1,8 +1,8 @@ Underwater5_MapScripts:: @ 81F7731 - map_script MAP_SCRIPT_ON_RESUME, Underwater5_MapScript1_1F7737 + map_script MAP_SCRIPT_ON_RESUME, Underwater5_OnResume .byte 0 -Underwater5_MapScript1_1F7737: @ 81F7737 +Underwater5_OnResume: @ 81F7737 call UnusualWeather_Underwater_SetupEscapeWarp end diff --git a/data/maps/Underwater6/scripts.inc b/data/maps/Underwater6/scripts.inc index d5a11c1bf..655dbde9f 100644 --- a/data/maps/Underwater6/scripts.inc +++ b/data/maps/Underwater6/scripts.inc @@ -1,8 +1,8 @@ Underwater6_MapScripts:: @ 81F773D - map_script MAP_SCRIPT_ON_RESUME, Underwater6_MapScript1_1F7743 + map_script MAP_SCRIPT_ON_RESUME, Underwater6_OnResume .byte 0 -Underwater6_MapScript1_1F7743: @ 81F7743 +Underwater6_OnResume: @ 81F7743 call UnusualWeather_Underwater_SetupEscapeWarp end diff --git a/data/maps/Underwater7/scripts.inc b/data/maps/Underwater7/scripts.inc index c3bee154e..5146731a4 100644 --- a/data/maps/Underwater7/scripts.inc +++ b/data/maps/Underwater7/scripts.inc @@ -1,8 +1,8 @@ Underwater7_MapScripts:: @ 81F7749 - map_script MAP_SCRIPT_ON_RESUME, Underwater7_MapScript1_1F774F + map_script MAP_SCRIPT_ON_RESUME, Underwater7_OnResume .byte 0 -Underwater7_MapScript1_1F774F: @ 81F774F +Underwater7_OnResume: @ 81F774F call UnusualWeather_Underwater_SetupEscapeWarp end diff --git a/data/maps/Underwater_Route134/scripts.inc b/data/maps/Underwater_Route134/scripts.inc index acffa23a2..ef62997de 100644 --- a/data/maps/Underwater_Route134/scripts.inc +++ b/data/maps/Underwater_Route134/scripts.inc @@ -1,8 +1,8 @@ Underwater_Route134_MapScripts:: @ 82390B5 - map_script MAP_SCRIPT_ON_RESUME, Underwater_Route134_MapScript1_2390BB + map_script MAP_SCRIPT_ON_RESUME, Underwater_Route134_OnResume .byte 0 -Underwater_Route134_MapScript1_2390BB: @ 82390BB +Underwater_Route134_OnResume: @ 82390BB setdivewarp MAP_ROUTE134, 255, 60, 31 end diff --git a/data/maps/Underwater_SootopolisCity/scripts.inc b/data/maps/Underwater_SootopolisCity/scripts.inc index d5040dba0..ec639604b 100644 --- a/data/maps/Underwater_SootopolisCity/scripts.inc +++ b/data/maps/Underwater_SootopolisCity/scripts.inc @@ -1,8 +1,8 @@ Underwater_SootopolisCity_MapScripts:: @ 822D94C - map_script MAP_SCRIPT_ON_RESUME, Underwater_SootopolisCity_MapScript1_22D952 + map_script MAP_SCRIPT_ON_RESUME, Underwater_SootopolisCity_OnResume .byte 0 -Underwater_SootopolisCity_MapScript1_22D952: @ 822D952 +Underwater_SootopolisCity_OnResume: @ 822D952 setdivewarp MAP_SOOTOPOLIS_CITY, 255, 29, 53 end diff --git a/include/constants/metatile_behaviors.h b/include/constants/metatile_behaviors.h index 44bbd9729..94cb0ffca 100755 --- a/include/constants/metatile_behaviors.h +++ b/include/constants/metatile_behaviors.h @@ -235,7 +235,7 @@ #define MB_CABLE_BOX_RESULTS_2 0xE7 #define MB_WIRELESS_BOX_RESULTS 0xE8 #define MB_TRAINER_HILL_TIMER 0xE9 -#define MB_UNKNOWN_CLOSED_DOOR 0xEA +#define MB_SKY_PILLAR_CLOSED_DOOR 0xEA #define MB_UNUSED_EB 0xEB #define MB_UNUSED_EC 0xEC #define MB_UNUSED_ED 0xED diff --git a/include/event_scripts.h b/include/event_scripts.h index 1b2759787..ad64847ec 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -524,7 +524,7 @@ extern const u8 EventScript_TestSignpostMsg[]; extern const u8 EventScript_HiddenItemScript[]; extern const u8 EventScript_TV[]; extern const u8 EventScript_ClosedSootopolisDoor[]; -extern const u8 SkyPillar_Outside_EventScript_2393F9[]; +extern const u8 SkyPillar_Outside_EventScript_ClosedDoor[]; extern const u8 EventScript_CableBoxResults[]; extern const u8 EventScript_PokeBlockFeeder[]; extern const u8 Route110_TrickHouseEntrance_EventScript_26A22A[]; diff --git a/include/metatile_behavior.h b/include/metatile_behavior.h index 7fd1d1301..b5dae6de0 100644 --- a/include/metatile_behavior.h +++ b/include/metatile_behavior.h @@ -107,7 +107,7 @@ bool8 MetatileBehavior_IsPacifidlogLog(u8); bool8 MetatileBehavior_IsTrickHousePuzzleDoor(u8); bool8 MetatileBehavior_IsRegionMap(u8); bool8 MetatileBehavior_IsClosedSootopolisDoor(u8); -bool8 MetatileBehavior_IsUnknownClosedDoor(u8); +bool8 MetatileBehavior_IsSkyPillarClosedDoor(u8); bool8 MetatileBehavior_IsRoulette(u8); bool8 MetatileBehavior_IsPokeblockFeeder(u8); bool8 MetatileBehavior_IsSecretBaseJumpMat(u8); diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index 1d57c672c..304b5d75b 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -373,8 +373,8 @@ static const u8 *GetInteractedMetatileScript(struct MapPosition *position, u8 me return EventScript_PC; if (MetatileBehavior_IsClosedSootopolisDoor(metatileBehavior) == TRUE) return EventScript_ClosedSootopolisDoor; - if (MetatileBehavior_IsUnknownClosedDoor(metatileBehavior) == TRUE) - return SkyPillar_Outside_EventScript_2393F9; + if (MetatileBehavior_IsSkyPillarClosedDoor(metatileBehavior) == TRUE) + return SkyPillar_Outside_EventScript_ClosedDoor; if (MetatileBehavior_IsCableBoxResults1(metatileBehavior) == TRUE) return EventScript_CableBoxResults; if (MetatileBehavior_IsPokeblockFeeder(metatileBehavior) == TRUE) diff --git a/src/metatile_behavior.c b/src/metatile_behavior.c index 16298183b..435ad7233 100644 --- a/src/metatile_behavior.c +++ b/src/metatile_behavior.c @@ -244,7 +244,7 @@ static const u8 sTileBitAttributes[] = [MB_CABLE_BOX_RESULTS_2] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), [MB_WIRELESS_BOX_RESULTS] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), [MB_TRAINER_HILL_TIMER] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), - [MB_UNKNOWN_CLOSED_DOOR] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_SKY_PILLAR_CLOSED_DOOR] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), [MB_UNUSED_EB] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), [MB_UNUSED_EC] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), [MB_UNUSED_ED] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), @@ -1172,9 +1172,9 @@ bool8 MetatileBehavior_IsClosedSootopolisDoor(u8 metatileBehavior) return FALSE; } -bool8 MetatileBehavior_IsUnknownClosedDoor(u8 metatileBehavior) +bool8 MetatileBehavior_IsSkyPillarClosedDoor(u8 metatileBehavior) { - if (metatileBehavior == MB_UNKNOWN_CLOSED_DOOR) + if (metatileBehavior == MB_SKY_PILLAR_CLOSED_DOOR) return TRUE; else return FALSE; From 06bb4ba4020fb50112e8a96c98e180ceeb115c15 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 8 Nov 2019 03:42:14 -0500 Subject: [PATCH 37/40] Document Secret Power TM script --- data/maps/Route111/map.json | 2 +- data/scripts/secret_power_tm.inc | 46 ++++++++++++++++---------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/data/maps/Route111/map.json b/data/maps/Route111/map.json index 0317366cd..37c70e351 100644 --- a/data/maps/Route111/map.json +++ b/data/maps/Route111/map.json @@ -456,7 +456,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route111_EventScript_2765FF", + "script": "Route111_EventScript_SecretPowerMan", "flag": "FLAG_HIDE_ROUTE_111_SECRET_POWER_MAN" }, { diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc index c89202ded..7be69ec58 100644 --- a/data/scripts/secret_power_tm.inc +++ b/data/scripts/secret_power_tm.inc @@ -1,4 +1,4 @@ -Route111_Text_2762C9: @ 82762C9 +Route111_Text_MakingRoomUseTMToMakeYourOwn: @ 82762C9 .string "What's that?\n" .string "What am I doing?\p" .string "I'm thinking about making my own room\n" @@ -6,7 +6,7 @@ Route111_Text_2762C9: @ 82762C9 .string "I know! I'll give you this TM.\n" .string "Will you use it to make your own room?$" -Route111_Text_27636E: @ 827636E +Route111_Text_ExplainSecretPower: @ 827636E .string "Find a big tree that looks like it might\n" .string "drop some vines.\p" .string "Use SECRET POWER in front of the tree.\n" @@ -24,59 +24,59 @@ Route111_Text_27636E: @ 827636E .string "I'm going to look for other places, too.\n" .string "Okay, bye!$" -Route111_Text_27655C: @ 827655C +Route111_Text_DontWantThis: @ 827655C .string "Oh, you don't want this?\n" .string "If you change your mind, tell me, okay?$" -Route111_Text_27659D: @ 827659D +Route111_Text_DontHaveAnyRoom: @ 827659D .string "Oh, you don't have any room for this.\p" .string "I'll hold on to it, so come back for it\n" .string "another time, okay?$" -Route111_EventScript_2765FF:: @ 82765FF +Route111_EventScript_SecretPowerMan:: @ 82765FF lock faceplayer - msgbox Route111_Text_2762C9, MSGBOX_YESNO + msgbox Route111_Text_MakingRoomUseTMToMakeYourOwn, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq Route111_EventScript_27661E - msgbox Route111_Text_27655C, MSGBOX_DEFAULT + goto_if_eq Route111_EventScript_GiveSecretPower + msgbox Route111_Text_DontWantThis, MSGBOX_DEFAULT release end -Route111_EventScript_27661E:: @ 827661E +Route111_EventScript_GiveSecretPower:: @ 827661E giveitem_std ITEM_TM43 - compare VAR_RESULT, 0 - goto_if_eq Route111_EventScript_276680 - msgbox Route111_Text_27636E, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + goto_if_eq Route111_EventScript_NoRoomForSecretPower + msgbox Route111_Text_ExplainSecretPower, MSGBOX_DEFAULT closemessage setflag FLAG_RECEIVED_SECRET_POWER clearflag FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN compare VAR_FACING, DIR_WEST - call_if_eq Route111_EventScript_27666A + call_if_eq Route111_EventScript_SecretPowerManExit compare VAR_FACING, DIR_EAST - call_if_eq Route111_EventScript_27666A + call_if_eq Route111_EventScript_SecretPowerManExit compare VAR_FACING, DIR_NORTH - call_if_eq Route111_EventScript_276675 + call_if_eq Route111_EventScript_SecretPowerManExitNorth removeobject VAR_LAST_TALKED release end -Route111_EventScript_27666A:: @ 827666A - applymovement VAR_LAST_TALKED, Route111_Movement_27668A +Route111_EventScript_SecretPowerManExit:: @ 827666A + applymovement VAR_LAST_TALKED, Route111_Movement_SecretPowerManExit waitmovement 0 return -Route111_EventScript_276675:: @ 8276675 - applymovement VAR_LAST_TALKED, Route111_Movement_276696 +Route111_EventScript_SecretPowerManExitNorth:: @ 8276675 + applymovement VAR_LAST_TALKED, Route111_Movement_SecretPowerManExitNorth waitmovement 0 return -Route111_EventScript_276680:: @ 8276680 - msgbox Route111_Text_27659D, MSGBOX_DEFAULT +Route111_EventScript_NoRoomForSecretPower:: @ 8276680 + msgbox Route111_Text_DontHaveAnyRoom, MSGBOX_DEFAULT release end -Route111_Movement_27668A: @ 827668A +Route111_Movement_SecretPowerManExit: @ 827668A walk_down walk_down walk_down @@ -90,7 +90,7 @@ Route111_Movement_27668A: @ 827668A walk_down step_end -Route111_Movement_276696: @ 8276696 +Route111_Movement_SecretPowerManExitNorth: @ 8276696 walk_left walk_down walk_down From ae1767fe462ac1085d033e8b377a0f4f4ae86089 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 8 Nov 2019 03:53:55 -0500 Subject: [PATCH 38/40] Document Mystery Event Club script --- data/scripts/mystery_event_club.inc | 90 +++++++++++++++-------------- 1 file changed, 46 insertions(+), 44 deletions(-) diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc index 1df0ed88c..6687bbd47 100644 --- a/data/scripts/mystery_event_club.inc +++ b/data/scripts/mystery_event_club.inc @@ -1,97 +1,98 @@ MysteryEventClub_EventScript_Man:: @ 8291539 lock faceplayer - goto_if_set FLAG_SYS_CHAT_USED, MysteryEventClub_EventScript_2915F5 + goto_if_set FLAG_SYS_CHAT_USED, MysteryEventClub_EventScript_GivenProfileBefore msgbox MysteryEventClub_Text_CollectTrainerProfiles, MSGBOX_DEFAULT - goto MysteryEventClub_EventScript_291552 + goto MysteryEventClub_EventScript_AskToSeeProfile end -MysteryEventClub_EventScript_291552:: @ 8291552 - msgbox MysteryEventClub_Text_2916FF, MSGBOX_DEFAULT +MysteryEventClub_EventScript_AskToSeeProfile:: @ 8291552 + msgbox MysteryEventClub_Text_MayISeeYourProfile, MSGBOX_DEFAULT multichoice 17, 6, MULTI_YESNOINFO_2, 0 switch VAR_RESULT - case 0, MysteryEventClub_EventScript_29159F - case 1, MysteryEventClub_EventScript_2915EB - case 2, MysteryEventClub_EventScript_291591 - case MULTI_B_PRESSED, MysteryEventClub_EventScript_2915EB + case 0, MysteryEventClub_EventScript_CreateProfile + case 1, MysteryEventClub_EventScript_DeclineShowProfile + case 2, MysteryEventClub_EventScript_Info + case MULTI_B_PRESSED, MysteryEventClub_EventScript_DeclineShowProfile end -MysteryEventClub_EventScript_291591:: @ 8291591 +MysteryEventClub_EventScript_Info:: @ 8291591 msgbox MysteryEventClub_Text_EasyChatExplanation, MSGBOX_DEFAULT - goto MysteryEventClub_EventScript_291552 + goto MysteryEventClub_EventScript_AskToSeeProfile end -MysteryEventClub_EventScript_29159F:: @ 829159F - msgbox MysteryEventClub_Text_291969, MSGBOX_DEFAULT +MysteryEventClub_EventScript_CreateProfile:: @ 829159F + msgbox MysteryEventClub_Text_LetsSeeItThen, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, EASY_CHAT_TYPE_PROFILE call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 0 - goto_if_eq MysteryEventClub_EventScript_2915CB + goto_if_eq MysteryEventClub_EventScript_CancelShowProfile compare VAR_RESULT, 1 - goto_if_eq MysteryEventClub_EventScript_2915D5 + goto_if_eq MysteryEventClub_EventScript_ShowProfile end -MysteryEventClub_EventScript_2915CB:: @ 82915CB - msgbox MysteryEventClub_Text_2919DC, MSGBOX_DEFAULT +MysteryEventClub_EventScript_CancelShowProfile:: @ 82915CB + msgbox MysteryEventClub_Text_NotIntoItRightNow, MSGBOX_DEFAULT release end -MysteryEventClub_EventScript_2915D5:: @ 82915D5 +MysteryEventClub_EventScript_ShowProfile:: @ 82915D5 setvar VAR_0x8004, 0 special sub_811EECC waitmessage delay 80 - msgbox MysteryEventClub_Text_291B22, MSGBOX_DEFAULT + msgbox MysteryEventClub_Text_FantasticProfile, MSGBOX_DEFAULT release end -MysteryEventClub_EventScript_2915EB:: @ 82915EB - msgbox MysteryEventClub_Text_291991, MSGBOX_DEFAULT +MysteryEventClub_EventScript_DeclineShowProfile:: @ 82915EB + msgbox MysteryEventClub_Text_ImagineYouWouldHaveWonderfulProfile, MSGBOX_DEFAULT release end -MysteryEventClub_EventScript_2915F5:: @ 82915F5 +MysteryEventClub_EventScript_GivenProfileBefore:: @ 82915F5 msgbox MysteryEventClub_Text_YouHaveWonderfulSmile, MSGBOX_DEFAULT - goto MysteryEventClub_EventScript_291603 + goto MysteryEventClub_EventScript_AskToSeeNewProfile end -MysteryEventClub_EventScript_291603:: @ 8291603 +MysteryEventClub_EventScript_AskToSeeNewProfile:: @ 8291603 msgbox MysteryEventClub_Text_MayISeeYourNewProfile, MSGBOX_DEFAULT multichoice 17, 6, MULTI_YESNOINFO_2, 0 switch VAR_RESULT - case 0, MysteryEventClub_EventScript_291650 - case 1, MysteryEventClub_EventScript_29167C - case 2, MysteryEventClub_EventScript_291642 - case MULTI_B_PRESSED, MysteryEventClub_EventScript_29167C + case 0, MysteryEventClub_EventScript_CreateNewProfile + case 1, MysteryEventClub_EventScript_DeclineNewProfile + case 2, MysteryEventClub_EventScript_InfoNewProfile + case MULTI_B_PRESSED, MysteryEventClub_EventScript_DeclineNewProfile end -MysteryEventClub_EventScript_291642:: @ 8291642 +MysteryEventClub_EventScript_InfoNewProfile:: @ 8291642 msgbox MysteryEventClub_Text_EasyChatExplanation, MSGBOX_DEFAULT - goto MysteryEventClub_EventScript_291603 + goto MysteryEventClub_EventScript_AskToSeeNewProfile end -MysteryEventClub_EventScript_291650:: @ 8291650 - msgbox MysteryEventClub_Text_291A6B, MSGBOX_DEFAULT +MysteryEventClub_EventScript_CreateNewProfile:: @ 8291650 + msgbox MysteryEventClub_Text_EvenBetterThanLastProfile, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, EASY_CHAT_TYPE_PROFILE call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 0 - goto_if_eq MysteryEventClub_EventScript_2915CB + goto_if_eq MysteryEventClub_EventScript_CancelShowProfile compare VAR_RESULT, 1 - goto_if_eq MysteryEventClub_EventScript_2915D5 + goto_if_eq MysteryEventClub_EventScript_ShowProfile end -MysteryEventClub_EventScript_29167C:: @ 829167C - msgbox MysteryEventClub_Text_291ABA, MSGBOX_DEFAULT +MysteryEventClub_EventScript_DeclineNewProfile:: @ 829167C + msgbox MysteryEventClub_Text_LikeProfileWayItIs, MSGBOX_DEFAULT release end -MysteryEventClub_EventScript_291686:: @ 8291686 +@ Unused +MysteryEventClub_EventScript_Ret:: @ 8291686 return MysteryEventClub_Text_CollectTrainerProfiles: @ 8291687 @@ -100,7 +101,7 @@ MysteryEventClub_Text_CollectTrainerProfiles: @ 8291687 .string "I have a hobby--collecting the profiles\n" .string "of POKéMON TRAINERS.$" -MysteryEventClub_Text_2916FF: @ 82916FF +MysteryEventClub_Text_MayISeeYourProfile: @ 82916FF .string "So, how about it?\n" .string "May I see your profile?$" @@ -123,16 +124,16 @@ MysteryEventClub_Text_EasyChatExplanation: @ 8291729 .string "Repeat for the remaining text choices,\n" .string "and you'll have your very own profile.$" -MysteryEventClub_Text_291969: @ 8291969 +MysteryEventClub_Text_LetsSeeItThen: @ 8291969 .string "Yes! Thank you!\n" .string "So, let's see it, then.$" -MysteryEventClub_Text_291991: @ 8291991 +MysteryEventClub_Text_ImagineYouWouldHaveWonderfulProfile: @ 8291991 .string "Oh, no, really?\p" .string "I imagine someone like you would have\n" .string "a wonderful profile…$" -MysteryEventClub_Text_2919DC: @ 82919DC +MysteryEventClub_Text_NotIntoItRightNow: @ 82919DC .string "Oh? You're not into it right now?\p" .string "Well, anytime is good by me!$" @@ -143,17 +144,17 @@ MysteryEventClub_Text_YouHaveWonderfulSmile: @ 8291A1B MysteryEventClub_Text_MayISeeYourNewProfile: @ 8291A4F .string "May I see your new profile?$" -MysteryEventClub_Text_291A6B: @ 8291A6B +MysteryEventClub_Text_EvenBetterThanLastProfile: @ 8291A6B .string "Yes! Thank you!\p" .string "I hope it's even better than the profile\n" .string "you showed me before.$" -MysteryEventClub_Text_291ABA: @ 8291ABA +MysteryEventClub_Text_LikeProfileWayItIs: @ 8291ABA .string "Oh, you like your profile the way it is.\p" .string "I don't blame you--it's a wonderful\n" .string "profile the way it is now.$" -MysteryEventClub_Text_291B22: @ 8291B22 +MysteryEventClub_Text_FantasticProfile: @ 8291B22 .string "F-fantastic!\p" .string "Your profile, it's wonderful!\n" .string "It really says what you're about.\p" @@ -161,7 +162,8 @@ MysteryEventClub_Text_291B22: @ 8291B22 .string "be captivated by you!\p" .string "Thank you!$" -MysteryEventClub_Text_291BB7: @ 8291BB7 +@ Unused +MysteryEventClub_Text_YouKnowSecretSaying: @ 8291BB7 .string "Oh?\n" .string "You know the secret saying!\p" .string "That means you're now a fellow member\n" From e4d65addf40ad017919bbaa92d08720d76ef332e Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sat, 9 Nov 2019 11:28:28 -0500 Subject: [PATCH 39/40] Document Mossdeep scripts --- data/maps/MossdeepCity/map.json | 48 ++--- data/maps/MossdeepCity/scripts.inc | 182 +++++++++--------- data/maps/MossdeepCity_House1/map.json | 4 +- data/maps/MossdeepCity_House1/scripts.inc | 24 +-- data/maps/MossdeepCity_House2/map.json | 6 +- data/maps/MossdeepCity_House2/scripts.inc | 34 ++-- data/maps/MossdeepCity_House3/map.json | 2 +- data/maps/MossdeepCity_House3/scripts.inc | 30 +-- data/maps/MossdeepCity_House4/map.json | 6 +- data/maps/MossdeepCity_House4/scripts.inc | 36 ++-- data/maps/MossdeepCity_StevensHouse/map.json | 14 +- .../MossdeepCity_StevensHouse/scripts.inc | 107 +++++----- 12 files changed, 247 insertions(+), 246 deletions(-) diff --git a/data/maps/MossdeepCity/map.json b/data/maps/MossdeepCity/map.json index 580b4ca62..e3b1af96b 100644 --- a/data/maps/MossdeepCity/map.json +++ b/data/maps/MossdeepCity/map.json @@ -40,7 +40,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_EventScript_1E4AD1", + "script": "MossdeepCity_EventScript_Sailor", "flag": "0" }, { @@ -53,7 +53,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_EventScript_1E4AF9", + "script": "MossdeepCity_EventScript_ExpertM", "flag": "0" }, { @@ -66,7 +66,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_EventScript_1E4AB2", + "script": "MossdeepCity_EventScript_PokefanF", "flag": "0" }, { @@ -79,7 +79,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_EventScript_1E4AF0", + "script": "MossdeepCity_EventScript_NinjaBoy", "flag": "0" }, { @@ -92,7 +92,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_EventScript_1E4B02", + "script": "MossdeepCity_EventScript_Girl", "flag": "0" }, { @@ -118,7 +118,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_EventScript_1E4C10", + "script": "MossdeepCity_EventScript_Man", "flag": "0" }, { @@ -131,7 +131,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_EventScript_1E4B0B", + "script": "MossdeepCity_EventScript_Woman", "flag": "0" }, { @@ -144,7 +144,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_EventScript_1E4C26", + "script": "MossdeepCity_EventScript_KingsRockBoy", "flag": "0" }, { @@ -235,7 +235,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_EventScript_1E4C85", + "script": "MossdeepCity_EventScript_Scott", "flag": "FLAG_HIDE_MOSSDEEP_CITY_SCOTT" }, { @@ -248,7 +248,7 @@ "movement_range_y": 3, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_EventScript_1E4C7C", + "script": "MossdeepCity_EventScript_BlackBelt", "flag": "0" } ], @@ -332,7 +332,7 @@ "elevation": 0, "var": "VAR_TEMP_1", "var_value": "0", - "script": "MossdeepCity_EventScript_1E4B38" + "script": "MossdeepCity_EventScript_VisitedMossdeep" }, { "type": "trigger", @@ -341,7 +341,7 @@ "elevation": 0, "var": "VAR_TEMP_1", "var_value": "0", - "script": "MossdeepCity_EventScript_1E4B38" + "script": "MossdeepCity_EventScript_VisitedMossdeep" }, { "type": "trigger", @@ -350,7 +350,7 @@ "elevation": 0, "var": "VAR_TEMP_1", "var_value": "0", - "script": "MossdeepCity_EventScript_1E4B38" + "script": "MossdeepCity_EventScript_VisitedMossdeep" }, { "type": "trigger", @@ -359,7 +359,7 @@ "elevation": 0, "var": "VAR_TEMP_1", "var_value": "0", - "script": "MossdeepCity_EventScript_1E4B38" + "script": "MossdeepCity_EventScript_VisitedMossdeep" }, { "type": "trigger", @@ -368,7 +368,7 @@ "elevation": 5, "var": "VAR_MOSSDEEP_CITY_STATE", "var_value": "1", - "script": "MossdeepCity_EventScript_1E4B41" + "script": "MossdeepCity_EventScript_TeamMagmaEnterSpaceCenter" }, { "type": "trigger", @@ -377,7 +377,7 @@ "elevation": 5, "var": "VAR_MOSSDEEP_CITY_STATE", "var_value": "1", - "script": "MossdeepCity_EventScript_1E4B41" + "script": "MossdeepCity_EventScript_TeamMagmaEnterSpaceCenter" }, { "type": "trigger", @@ -386,7 +386,7 @@ "elevation": 5, "var": "VAR_MOSSDEEP_CITY_STATE", "var_value": "1", - "script": "MossdeepCity_EventScript_1E4B41" + "script": "MossdeepCity_EventScript_TeamMagmaEnterSpaceCenter" }, { "type": "trigger", @@ -395,7 +395,7 @@ "elevation": 5, "var": "VAR_MOSSDEEP_CITY_STATE", "var_value": "1", - "script": "MossdeepCity_EventScript_1E4B41" + "script": "MossdeepCity_EventScript_TeamMagmaEnterSpaceCenter" }, { "type": "trigger", @@ -404,7 +404,7 @@ "elevation": 5, "var": "VAR_MOSSDEEP_CITY_STATE", "var_value": "1", - "script": "MossdeepCity_EventScript_1E4B41" + "script": "MossdeepCity_EventScript_TeamMagmaEnterSpaceCenter" }, { "type": "trigger", @@ -413,7 +413,7 @@ "elevation": 5, "var": "VAR_MOSSDEEP_CITY_STATE", "var_value": "1", - "script": "MossdeepCity_EventScript_1E4B41" + "script": "MossdeepCity_EventScript_TeamMagmaEnterSpaceCenter" } ], "bg_events": [ @@ -423,7 +423,7 @@ "y": 16, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MossdeepCity_EventScript_1E4B26" + "script": "MossdeepCity_EventScript_CitySign" }, { "type": "sign", @@ -431,7 +431,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MossdeepCity_EventScript_1E4B1D" + "script": "MossdeepCity_EventScript_GymSign" }, { "type": "sign", @@ -455,7 +455,7 @@ "y": 16, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MossdeepCity_EventScript_1E4B2F" + "script": "MossdeepCity_EventScript_SpaceCenterSign" }, { "type": "sign", @@ -479,7 +479,7 @@ "y": 21, "elevation": 7, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MossdeepCity_EventScript_1E4B14" + "script": "MossdeepCity_EventScript_WhiteRock" } ] } diff --git a/data/maps/MossdeepCity/scripts.inc b/data/maps/MossdeepCity/scripts.inc index 0b9da9912..fe12da311 100644 --- a/data/maps/MossdeepCity/scripts.inc +++ b/data/maps/MossdeepCity/scripts.inc @@ -10,83 +10,83 @@ MossdeepCity_OnTransition: @ 81E4A9C call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather end -MossdeepCity_EventScript_1E4AB2:: @ 81E4AB2 +MossdeepCity_EventScript_PokefanF:: @ 81E4AB2 lock faceplayer - goto_if_set FLAG_RECEIVED_HM08, MossdeepCity_EventScript_1E4AC7 - msgbox MossdeepCity_Text_1E4E90, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_HM08, MossdeepCity_EventScript_PokefanFMagmaGone + msgbox MossdeepCity_Text_SpaceCenterReceivedLetter, MSGBOX_DEFAULT release end -MossdeepCity_EventScript_1E4AC7:: @ 81E4AC7 - msgbox MossdeepCity_Text_1E4F15, MSGBOX_DEFAULT +MossdeepCity_EventScript_PokefanFMagmaGone:: @ 81E4AC7 + msgbox MossdeepCity_Text_SpaceCenterLaunchingRockets, MSGBOX_DEFAULT release end -MossdeepCity_EventScript_1E4AD1:: @ 81E4AD1 +MossdeepCity_EventScript_Sailor:: @ 81E4AD1 lock faceplayer - goto_if_set FLAG_RECEIVED_HM08, MossdeepCity_EventScript_1E4AE6 - msgbox MossdeepCity_Text_1E4F50, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_HM08, MossdeepCity_EventScript_SailorMagmaGone + msgbox MossdeepCity_Text_MossdeepTargetedByMagma, MSGBOX_DEFAULT release end -MossdeepCity_EventScript_1E4AE6:: @ 81E4AE6 - msgbox MossdeepCity_Text_1E5051, MSGBOX_DEFAULT +MossdeepCity_EventScript_SailorMagmaGone:: @ 81E4AE6 + msgbox MossdeepCity_Text_FeelReliefOnLand, MSGBOX_DEFAULT release end -MossdeepCity_EventScript_1E4AF0:: @ 81E4AF0 - msgbox MossdeepCity_Text_1E4E22, MSGBOX_NPC +MossdeepCity_EventScript_NinjaBoy:: @ 81E4AF0 + msgbox MossdeepCity_Text_WailmerWatching, MSGBOX_NPC end -MossdeepCity_EventScript_1E4AF9:: @ 81E4AF9 - msgbox MossdeepCity_Text_1E5135, MSGBOX_NPC +MossdeepCity_EventScript_ExpertM:: @ 81E4AF9 + msgbox MossdeepCity_Text_LifeNeedsSeaToLive, MSGBOX_NPC end -MossdeepCity_EventScript_1E4B02:: @ 81E4B02 - msgbox MossdeepCity_Text_1E50D9, MSGBOX_NPC +MossdeepCity_EventScript_Girl:: @ 81E4B02 + msgbox MossdeepCity_Text_NiceIfWorldCoveredByFlowers, MSGBOX_NPC end -MossdeepCity_EventScript_1E4B0B:: @ 81E4B0B - msgbox MossdeepCity_Text_1E529D, MSGBOX_NPC +MossdeepCity_EventScript_Woman:: @ 81E4B0B + msgbox MossdeepCity_Text_SpecialSpaceCenterRock, MSGBOX_NPC end -MossdeepCity_EventScript_1E4B14:: @ 81E4B14 - msgbox MossdeepCity_Text_1E5396, MSGBOX_SIGN +MossdeepCity_EventScript_WhiteRock:: @ 81E4B14 + msgbox MossdeepCity_Text_ItsAWhiteRock, MSGBOX_SIGN end -MossdeepCity_EventScript_1E4B1D:: @ 81E4B1D - msgbox MossdeepCity_Text_1E53A9, MSGBOX_SIGN +MossdeepCity_EventScript_GymSign:: @ 81E4B1D + msgbox MossdeepCity_Text_GymSign, MSGBOX_SIGN end -MossdeepCity_EventScript_1E4B26:: @ 81E4B26 - msgbox MossdeepCity_Text_1E53F2, MSGBOX_SIGN +MossdeepCity_EventScript_CitySign:: @ 81E4B26 + msgbox MossdeepCity_Text_CitySign, MSGBOX_SIGN end -MossdeepCity_EventScript_1E4B2F:: @ 81E4B2F - msgbox MossdeepCity_Text_1E541F, MSGBOX_SIGN +MossdeepCity_EventScript_SpaceCenterSign:: @ 81E4B2F + msgbox MossdeepCity_Text_SpaceCenterSign, MSGBOX_SIGN end -MossdeepCity_EventScript_1E4B38:: @ 81E4B38 +MossdeepCity_EventScript_VisitedMossdeep:: @ 81E4B38 setflag FLAG_VISITED_MOSSDEEP_CITY setvar VAR_TEMP_1, 1 end -MossdeepCity_EventScript_1E4B41:: @ 81E4B41 +MossdeepCity_EventScript_TeamMagmaEnterSpaceCenter:: @ 81E4B41 lockall - applymovement 14, MossdeepCity_Movement_1E4BAD + applymovement 14, MossdeepCity_Movement_MaxieGestureToSpaceCenter waitmovement 0 - applymovement 10, MossdeepCity_Movement_1E4BB7 - applymovement 11, MossdeepCity_Movement_1E4BB7 - applymovement 12, MossdeepCity_Movement_1E4BB7 - applymovement 13, MossdeepCity_Movement_1E4BB7 + applymovement 10, MossdeepCity_Movement_GruntFaceSpaceCenter + applymovement 11, MossdeepCity_Movement_GruntFaceSpaceCenter + applymovement 12, MossdeepCity_Movement_GruntFaceSpaceCenter + applymovement 13, MossdeepCity_Movement_GruntFaceSpaceCenter waitmovement 0 - applymovement 14, MossdeepCity_Movement_1E4BBC - applymovement 10, MossdeepCity_Movement_1E4BCA - applymovement 11, MossdeepCity_Movement_1E4BDD - applymovement 12, MossdeepCity_Movement_1E4BEF - applymovement 13, MossdeepCity_Movement_1E4C00 + applymovement 14, MossdeepCity_Movement_MaxieEnterSpaceCenter + applymovement 10, MossdeepCity_Movement_Grunt1EnterSpaceCenter + applymovement 11, MossdeepCity_Movement_Grunt2EnterSpaceCenter + applymovement 12, MossdeepCity_Movement_Grunt3EnterSpaceCenter + applymovement 13, MossdeepCity_Movement_Grunt4EnterSpaceCenter waitmovement 0 removeobject 14 removeobject 10 @@ -99,7 +99,7 @@ MossdeepCity_EventScript_1E4B41:: @ 81E4B41 releaseall end -MossdeepCity_Movement_1E4BAD: @ 81E4BAD +MossdeepCity_Movement_MaxieGestureToSpaceCenter: @ 81E4BAD delay_16 face_right delay_16 @@ -111,14 +111,14 @@ MossdeepCity_Movement_1E4BAD: @ 81E4BAD delay_16 step_end -MossdeepCity_Movement_1E4BB7: @ 81E4BB7 +MossdeepCity_Movement_GruntFaceSpaceCenter: @ 81E4BB7 face_right delay_16 delay_16 delay_16 step_end -MossdeepCity_Movement_1E4BBC: @ 81E4BBC +MossdeepCity_Movement_MaxieEnterSpaceCenter: @ 81E4BBC walk_down walk_right walk_right @@ -134,7 +134,7 @@ MossdeepCity_Movement_1E4BBC: @ 81E4BBC walk_right step_end -MossdeepCity_Movement_1E4BCA: @ 81E4BCA +MossdeepCity_Movement_Grunt1EnterSpaceCenter: @ 81E4BCA delay_16 delay_8 walk_down @@ -155,7 +155,7 @@ MossdeepCity_Movement_1E4BCA: @ 81E4BCA walk_right step_end -MossdeepCity_Movement_1E4BDD: @ 81E4BDD +MossdeepCity_Movement_Grunt2EnterSpaceCenter: @ 81E4BDD delay_16 delay_8 walk_down @@ -175,7 +175,7 @@ MossdeepCity_Movement_1E4BDD: @ 81E4BDD walk_right step_end -MossdeepCity_Movement_1E4BEF: @ 81E4BEF +MossdeepCity_Movement_Grunt3EnterSpaceCenter: @ 81E4BEF delay_16 delay_8 walk_down @@ -194,7 +194,7 @@ MossdeepCity_Movement_1E4BEF: @ 81E4BEF walk_right step_end -MossdeepCity_Movement_1E4C00: @ 81E4C00 +MossdeepCity_Movement_Grunt4EnterSpaceCenter: @ 81E4C00 delay_16 delay_8 walk_right @@ -212,77 +212,77 @@ MossdeepCity_Movement_1E4C00: @ 81E4C00 walk_right step_end -MossdeepCity_EventScript_1E4C10:: @ 81E4C10 +MossdeepCity_EventScript_Man:: @ 81E4C10 lock faceplayer - msgbox MossdeepCity_Text_1E5213, MSGBOX_DEFAULT + msgbox MossdeepCity_Text_SurfExhilarating, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end -MossdeepCity_EventScript_1E4C26:: @ 81E4C26 +MossdeepCity_EventScript_KingsRockBoy:: @ 81E4C26 lock faceplayer - goto_if_set FLAG_RECEIVED_KINGS_ROCK, MossdeepCity_EventScript_1E4C68 - msgbox MossdeepCity_Text_1E4CED, MSGBOX_YESNO + goto_if_set FLAG_RECEIVED_KINGS_ROCK, MossdeepCity_EventScript_ReceivedKingsRock + msgbox MossdeepCity_Text_WantKingsRockStevenGaveMe, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq MossdeepCity_EventScript_1E4C72 - msgbox MossdeepCity_Text_1E4D5B, MSGBOX_DEFAULT + goto_if_eq MossdeepCity_EventScript_DeclineKingsRock + msgbox MossdeepCity_Text_YouCanKeepIt, MSGBOX_DEFAULT giveitem_std ITEM_KINGS_ROCK - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_KINGS_ROCK release end -MossdeepCity_EventScript_1E4C68:: @ 81E4C68 - msgbox MossdeepCity_Text_1E4DB3, MSGBOX_DEFAULT +MossdeepCity_EventScript_ReceivedKingsRock:: @ 81E4C68 + msgbox MossdeepCity_Text_StevensHouseOverThere, MSGBOX_DEFAULT release end -MossdeepCity_EventScript_1E4C72:: @ 81E4C72 - msgbox MossdeepCity_Text_1E4DD7, MSGBOX_DEFAULT +MossdeepCity_EventScript_DeclineKingsRock:: @ 81E4C72 + msgbox MossdeepCity_Text_WhatToDoWithWeirdRock, MSGBOX_DEFAULT release end -MossdeepCity_EventScript_1E4C7C:: @ 81E4C7C - msgbox MossdeepCity_Text_1E5581, MSGBOX_NPC +MossdeepCity_EventScript_BlackBelt:: @ 81E4C7C + msgbox MossdeepCity_Text_SootopolisNewGymLeader, MSGBOX_NPC end -MossdeepCity_EventScript_1E4C85:: @ 81E4C85 +MossdeepCity_EventScript_Scott:: @ 81E4C85 lock faceplayer - msgbox MossdeepCity_Text_1E5453, MSGBOX_DEFAULT + msgbox MossdeepCity_Text_ScottSomethingWrongWithTown, MSGBOX_DEFAULT closemessage compare VAR_FACING, DIR_NORTH - call_if_eq MossdeepCity_EventScript_1E4CB0 + call_if_eq MossdeepCity_EventScript_ScottExitNorth compare VAR_FACING, DIR_EAST - call_if_eq MossdeepCity_EventScript_1E4CC2 + call_if_eq MossdeepCity_EventScript_ScottExitEast addvar VAR_SCOTT_STATE, 1 removeobject 16 release end -MossdeepCity_EventScript_1E4CB0:: @ 81E4CB0 - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Movement_1E4CD4 - applymovement 16, MossdeepCity_Movement_1E4CD8 +MossdeepCity_EventScript_ScottExitNorth:: @ 81E4CB0 + applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Movement_PlayerWatchScottExit + applymovement 16, MossdeepCity_Movement_ScottExitNorth waitmovement 0 return -MossdeepCity_EventScript_1E4CC2:: @ 81E4CC2 - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Movement_1E4CD4 - applymovement 16, MossdeepCity_Movement_1E4CE2 +MossdeepCity_EventScript_ScottExitEast:: @ 81E4CC2 + applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Movement_PlayerWatchScottExit + applymovement 16, MossdeepCity_Movement_ScottExitEast waitmovement 0 return -MossdeepCity_Movement_1E4CD4: @ 81E4CD4 +MossdeepCity_Movement_PlayerWatchScottExit: @ 81E4CD4 delay_16 delay_16 walk_in_place_fastest_left step_end -MossdeepCity_Movement_1E4CD8: @ 81E4CD8 +MossdeepCity_Movement_ScottExitNorth: @ 81E4CD8 walk_left walk_left walk_left @@ -294,7 +294,7 @@ MossdeepCity_Movement_1E4CD8: @ 81E4CD8 walk_left step_end -MossdeepCity_Movement_1E4CE2: @ 81E4CE2 +MossdeepCity_Movement_ScottExitEast: @ 81E4CE2 walk_down walk_left walk_left @@ -307,26 +307,26 @@ MossdeepCity_Movement_1E4CE2: @ 81E4CE2 walk_left step_end -MossdeepCity_Text_1E4CED: @ 81E4CED +MossdeepCity_Text_WantKingsRockStevenGaveMe: @ 81E4CED .string "I got this from STEVEN, but I don't\n" .string "know what it's good for.\p" .string "I think it's called KING'S ROCK.\n" .string "Do you want it?$" -MossdeepCity_Text_1E4D5B: @ 81E4D5B +MossdeepCity_Text_YouCanKeepIt: @ 81E4D5B .string "Why would you want it?\n" .string "You're weird.\p" .string "You can keep it, but keep it a secret\n" .string "from STEVEN.$" -MossdeepCity_Text_1E4DB3: @ 81E4DB3 +MossdeepCity_Text_StevensHouseOverThere: @ 81E4DB3 .string "STEVEN's house is right over there!$" -MossdeepCity_Text_1E4DD7: @ 81E4DD7 +MossdeepCity_Text_WhatToDoWithWeirdRock: @ 81E4DD7 .string "Yeah, you think so, too! What are you\n" .string "supposed to do with some weird rock?$" -MossdeepCity_Text_1E4E22: @ 81E4E22 +MossdeepCity_Text_WailmerWatching: @ 81E4E22 .string "Around MOSSDEEP, you can see wild\n" .string "WAILMER.\p" .string "It's called, uh…\n" @@ -334,17 +334,17 @@ MossdeepCity_Text_1E4E22: @ 81E4E22 .string "WAI, WAI, WAI…\p" .string "WAILMER watching!$" -MossdeepCity_Text_1E4E90: @ 81E4E90 +MossdeepCity_Text_SpaceCenterReceivedLetter: @ 81E4E90 .string "The island's SPACE CENTER has been\n" .string "launching huge rockets.\p" .string "There's been some kind of an uproar\n" .string "over a letter they received recently.$" -MossdeepCity_Text_1E4F15: @ 81E4F15 +MossdeepCity_Text_SpaceCenterLaunchingRockets: @ 81E4F15 .string "The island's SPACE CENTER has been\n" .string "launching huge rockets.$" -MossdeepCity_Text_1E4F50: @ 81E4F50 +MossdeepCity_Text_MossdeepTargetedByMagma: @ 81E4F50 .string "I heard from a SAILOR buddy that\n" .string "TEAM AQUA set up shop in LILYCOVE.\p" .string "I also heard that someone came along\n" @@ -354,18 +354,18 @@ MossdeepCity_Text_1E4F50: @ 81E4F50 .string "If you want to know what they're up to,\n" .string "go visit the SPACE CENTER.$" -MossdeepCity_Text_1E5051: @ 81E5051 +MossdeepCity_Text_FeelReliefOnLand: @ 81E5051 .string "I'm a SAILOR, so the sea's obviously\n" .string "more important to me.\p" .string "But you know? When I get back on land\n" .string "after a long voyage, I do feel relief!$" -MossdeepCity_Text_1E50D9: @ 81E50D9 +MossdeepCity_Text_NiceIfWorldCoveredByFlowers: @ 81E50D9 .string "Wouldn't it be nice?\p" .string "If the whole world was covered in\n" .string "plants and flowers like this island?$" -MossdeepCity_Text_1E5135: @ 81E5135 +MossdeepCity_Text_LifeNeedsSeaToLive: @ 81E5135 .string "All life needs the sea to live, even\n" .string "though it makes its home on the land.\p" .string "Life, having run its course, becomes\n" @@ -374,14 +374,14 @@ MossdeepCity_Text_1E5135: @ 81E5135 .string "the land.\p" .string "Yes, like the very shoreline here.$" -MossdeepCity_Text_1E5213: @ 81E5213 +MossdeepCity_Text_SurfExhilarating: @ 81E5213 .string "A voyage on a ship is fine.\p" .string "But crossing the sea with POKéMON\n" .string "using SURF…\p" .string "Now that's an exhilarating trip!\n" .string "Wouldn't you agree, youngster?$" -MossdeepCity_Text_1E529D: @ 81E529D +MossdeepCity_Text_SpecialSpaceCenterRock: @ 81E529D .string "This rock has a special meaning to\n" .string "the people at the SPACE CENTER.\p" .string "They put it here as their wish for\n" @@ -391,23 +391,23 @@ MossdeepCity_Text_1E529D: @ 81E529D .string "I use a wish tag to make it happen.\n" .string "That's what I do.$" -MossdeepCity_Text_1E5396: @ 81E5396 +MossdeepCity_Text_ItsAWhiteRock: @ 81E5396 .string "It's a white rock.$" -MossdeepCity_Text_1E53A9: @ 81E53A9 +MossdeepCity_Text_GymSign: @ 81E53A9 .string "MOSSDEEP CITY POKéMON GYM\n" .string "LEADERS: LIZA & TATE\p" .string "“The mystic combination!”$" -MossdeepCity_Text_1E53F2: @ 81E53F2 +MossdeepCity_Text_CitySign: @ 81E53F2 .string "MOSSDEEP CITY\n" .string "“Our slogan: Cherish POKéMON!”$" -MossdeepCity_Text_1E541F: @ 81E541F +MossdeepCity_Text_SpaceCenterSign: @ 81E541F .string "MOSSDEEP SPACE CENTER\n" .string "“The closest place to space.”$" -MossdeepCity_Text_1E5453: @ 81E5453 +MossdeepCity_Text_ScottSomethingWrongWithTown: @ 81E5453 .string "SCOTT: {PLAYER}{KUN}, feeling good?\n" .string "I'm doing great!\p" .string "I'd heard MOSSDEEP's GYM LEADER is\n" @@ -420,7 +420,7 @@ MossdeepCity_Text_1E5453: @ 81E5453 .string "I don't think it concerns me in any\n" .string "way, though.$" -MossdeepCity_Text_1E5581: @ 81E5581 +MossdeepCity_Text_SootopolisNewGymLeader: @ 81E5581 .string "Ahh… It feels great letting the waves\n" .string "wash over my feet…\p" .string "Speaking of the waves, you know that\n" diff --git a/data/maps/MossdeepCity_House1/map.json b/data/maps/MossdeepCity_House1/map.json index def086288..6b57ca6ef 100644 --- a/data/maps/MossdeepCity_House1/map.json +++ b/data/maps/MossdeepCity_House1/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_House1_EventScript_221FD6", + "script": "MossdeepCity_House1_EventScript_BlackBelt", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_House1_EventScript_222006", + "script": "MossdeepCity_House1_EventScript_Woman", "flag": "0" } ], diff --git a/data/maps/MossdeepCity_House1/scripts.inc b/data/maps/MossdeepCity_House1/scripts.inc index 60d612fb2..3ad07e023 100644 --- a/data/maps/MossdeepCity_House1/scripts.inc +++ b/data/maps/MossdeepCity_House1/scripts.inc @@ -1,42 +1,42 @@ MossdeepCity_House1_MapScripts:: @ 8221FD5 .byte 0 -MossdeepCity_House1_EventScript_221FD6:: @ 8221FD6 +MossdeepCity_House1_EventScript_BlackBelt:: @ 8221FD6 lock faceplayer bufferleadmonspeciesname 0 - msgbox MossdeepCity_House1_Text_22200F, MSGBOX_DEFAULT + msgbox MossdeepCity_House1_Text_HmmYourPokemon, MSGBOX_DEFAULT specialvar VAR_RESULT, GetPokeblockNameByMonNature compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_House1_EventScript_221FFC - msgbox MossdeepCity_House1_Text_22201D, MSGBOX_DEFAULT + goto_if_eq MossdeepCity_House1_EventScript_NeutralNature + msgbox MossdeepCity_House1_Text_ItLikesXPokeblocks, MSGBOX_DEFAULT release end -MossdeepCity_House1_EventScript_221FFC:: @ 8221FFC - msgbox MossdeepCity_House1_Text_222068, MSGBOX_DEFAULT +MossdeepCity_House1_EventScript_NeutralNature:: @ 8221FFC + msgbox MossdeepCity_House1_Text_DoesntLikeOrDislikePokeblocks, MSGBOX_DEFAULT release end -MossdeepCity_House1_EventScript_222006:: @ 8222006 - msgbox MossdeepCity_House1_Text_222099, MSGBOX_NPC +MossdeepCity_House1_EventScript_Woman:: @ 8222006 + msgbox MossdeepCity_House1_Text_HusbandCanTellPokeblockMonLikes, MSGBOX_NPC end -MossdeepCity_House1_Text_22200F: @ 822200F +MossdeepCity_House1_Text_HmmYourPokemon: @ 822200F .string "Hmm!\n" .string "Your {STR_VAR_1}…$" -MossdeepCity_House1_Text_22201D: @ 822201D +MossdeepCity_House1_Text_ItLikesXPokeblocks: @ 822201D .string "It likes {STR_VAR_1}S,\n" .string "doesn't it?\p" .string "No, I'm positive of it! It definitely\n" .string "likes {STR_VAR_1}S!$" -MossdeepCity_House1_Text_222068: @ 8222068 +MossdeepCity_House1_Text_DoesntLikeOrDislikePokeblocks: @ 8222068 .string "It doesn't appear to like or dislike\n" .string "any {POKEBLOCK}S.$" -MossdeepCity_House1_Text_222099: @ 8222099 +MossdeepCity_House1_Text_HusbandCanTellPokeblockMonLikes: @ 8222099 .string "My husband can tell what kind of\n" .string "{POKEBLOCK}S a POKéMON likes at a glance.$" diff --git a/data/maps/MossdeepCity_House2/map.json b/data/maps/MossdeepCity_House2/map.json index e63a1aee6..967fc0a55 100644 --- a/data/maps/MossdeepCity_House2/map.json +++ b/data/maps/MossdeepCity_House2/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_House2_EventScript_2220DF", + "script": "MossdeepCity_House2_EventScript_Man", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_House2_EventScript_2220E8", + "script": "MossdeepCity_House2_EventScript_Twin", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_House2_EventScript_2220F1", + "script": "MossdeepCity_House2_EventScript_Wingull", "flag": "FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL" } ], diff --git a/data/maps/MossdeepCity_House2/scripts.inc b/data/maps/MossdeepCity_House2/scripts.inc index 792ee7fd1..8f77aede2 100644 --- a/data/maps/MossdeepCity_House2/scripts.inc +++ b/data/maps/MossdeepCity_House2/scripts.inc @@ -1,43 +1,43 @@ MossdeepCity_House2_MapScripts:: @ 82220DE .byte 0 -MossdeepCity_House2_EventScript_2220DF:: @ 82220DF - msgbox MossdeepCity_House2_Text_222146, MSGBOX_NPC +MossdeepCity_House2_EventScript_Man:: @ 82220DF + msgbox MossdeepCity_House2_Text_SisterMailsBoyfriendInFortree, MSGBOX_NPC end -MossdeepCity_House2_EventScript_2220E8:: @ 82220E8 - msgbox MossdeepCity_House2_Text_2221A6, MSGBOX_NPC +MossdeepCity_House2_EventScript_Twin:: @ 82220E8 + msgbox MossdeepCity_House2_Text_PokemonCarriesMailBackAndForth, MSGBOX_NPC end -MossdeepCity_House2_EventScript_2220F1:: @ 82220F1 +MossdeepCity_House2_EventScript_Wingull:: @ 82220F1 lock faceplayer waitse playmoncry SPECIES_WINGULL, 0 - msgbox MossdeepCity_House2_Text_22222E, MSGBOX_DEFAULT + msgbox MossdeepCity_House2_Text_Wingull, MSGBOX_DEFAULT waitmoncry closemessage setflag FLAG_WINGULL_DELIVERED_MAIL clearflag FLAG_HIDE_FORTREE_CITY_HOUSE_4_WINGULL compare VAR_FACING, DIR_NORTH - call_if_eq MossdeepCity_House2_EventScript_222124 + call_if_eq MossdeepCity_House2_EventScript_WingullExitNorth compare VAR_FACING, DIR_WEST - call_if_eq MossdeepCity_House2_EventScript_22212F + call_if_eq MossdeepCity_House2_EventScript_WingullExitWest removeobject 3 release end -MossdeepCity_House2_EventScript_222124:: @ 8222124 - applymovement 3, MossdeepCity_House2_Movement_22213A +MossdeepCity_House2_EventScript_WingullExitNorth:: @ 8222124 + applymovement 3, MossdeepCity_House2_Movement_WingullExitNorth waitmovement 0 return -MossdeepCity_House2_EventScript_22212F:: @ 822212F - applymovement 3, MossdeepCity_House2_Movement_222141 +MossdeepCity_House2_EventScript_WingullExitWest:: @ 822212F + applymovement 3, MossdeepCity_House2_Movement_WingullExitEast waitmovement 0 return -MossdeepCity_House2_Movement_22213A: @ 822213A +MossdeepCity_House2_Movement_WingullExitNorth: @ 822213A walk_fast_right walk_fast_down walk_fast_down @@ -46,25 +46,25 @@ MossdeepCity_House2_Movement_22213A: @ 822213A delay_8 step_end -MossdeepCity_House2_Movement_222141: @ 8222141 +MossdeepCity_House2_Movement_WingullExitEast: @ 8222141 walk_fast_down walk_fast_down walk_fast_down delay_8 step_end -MossdeepCity_House2_Text_222146: @ 8222146 +MossdeepCity_House2_Text_SisterMailsBoyfriendInFortree: @ 8222146 .string "My little sister exchanges MAIL with\n" .string "her boyfriend in FORTREE.\p" .string "I don't envy her one bit at all.$" -MossdeepCity_House2_Text_2221A6: @ 82221A6 +MossdeepCity_House2_Text_PokemonCarriesMailBackAndForth: @ 82221A6 .string "Even though I can't see my friend in\n" .string "FORTREE, my POKéMON carries MAIL\l" .string "back and forth for us.\p" .string "I'm not lonesome, even though we're\n" .string "apart.$" -MossdeepCity_House2_Text_22222E: @ 822222E +MossdeepCity_House2_Text_Wingull: @ 822222E .string "WINGULL: Pihyoh!$" diff --git a/data/maps/MossdeepCity_House3/map.json b/data/maps/MossdeepCity_House3/map.json index 237a315ff..b2d7cb404 100644 --- a/data/maps/MossdeepCity_House3/map.json +++ b/data/maps/MossdeepCity_House3/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_House3_EventScript_2225C3", + "script": "MossdeepCity_House3_EventScript_SuperRodFisherman", "flag": "0" } ], diff --git a/data/maps/MossdeepCity_House3/scripts.inc b/data/maps/MossdeepCity_House3/scripts.inc index 1aa4e85df..96285cf25 100644 --- a/data/maps/MossdeepCity_House3/scripts.inc +++ b/data/maps/MossdeepCity_House3/scripts.inc @@ -1,31 +1,31 @@ MossdeepCity_House3_MapScripts:: @ 82225C2 .byte 0 -MossdeepCity_House3_EventScript_2225C3:: @ 82225C3 +MossdeepCity_House3_EventScript_SuperRodFisherman:: @ 82225C3 lock faceplayer - goto_if_set FLAG_RECEIVED_SUPER_ROD, MossdeepCity_House3_EventScript_222602 - msgbox MossdeepCity_House3_Text_222616, MSGBOX_YESNO + goto_if_set FLAG_RECEIVED_SUPER_ROD, MossdeepCity_House3_EventScript_ReceivedSuperRod + msgbox MossdeepCity_House3_Text_YouWantSuperRod, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq MossdeepCity_House3_EventScript_22260C - msgbox MossdeepCity_House3_Text_2226B6, MSGBOX_DEFAULT + goto_if_eq MossdeepCity_House3_EventScript_DeclineSuperRod + msgbox MossdeepCity_House3_Text_SuperRodIsSuper, MSGBOX_DEFAULT giveitem_std ITEM_SUPER_ROD setflag FLAG_RECEIVED_SUPER_ROD - msgbox MossdeepCity_House3_Text_2226F0, MSGBOX_DEFAULT + msgbox MossdeepCity_House3_Text_TryDroppingRodInWater, MSGBOX_DEFAULT release end -MossdeepCity_House3_EventScript_222602:: @ 8222602 - msgbox MossdeepCity_House3_Text_222751, MSGBOX_DEFAULT +MossdeepCity_House3_EventScript_ReceivedSuperRod:: @ 8222602 + msgbox MossdeepCity_House3_Text_GoAfterSeafloorPokemon, MSGBOX_DEFAULT release end -MossdeepCity_House3_EventScript_22260C:: @ 822260C - msgbox MossdeepCity_House3_Text_222733, MSGBOX_DEFAULT +MossdeepCity_House3_EventScript_DeclineSuperRod:: @ 822260C + msgbox MossdeepCity_House3_Text_DontYouLikeToFish, MSGBOX_DEFAULT release end -MossdeepCity_House3_Text_222616: @ 8222616 +MossdeepCity_House3_Text_YouWantSuperRod: @ 8222616 .string "Hey there, TRAINER!\n" .string "A SUPER ROD really is super!\p" .string "Say all you want, but this baby can\n" @@ -33,19 +33,19 @@ MossdeepCity_House3_Text_222616: @ 8222616 .string "What do you think?\n" .string "You want it, don't you?$" -MossdeepCity_House3_Text_2226B6: @ 82226B6 +MossdeepCity_House3_Text_SuperRodIsSuper: @ 82226B6 .string "You bet, you bet!\n" .string "After all, a SUPER ROD is really super!$" -MossdeepCity_House3_Text_2226F0: @ 82226F0 +MossdeepCity_House3_Text_TryDroppingRodInWater: @ 82226F0 .string "If there's any water, try dropping in\n" .string "your ROD and see what bites!$" -MossdeepCity_House3_Text_222733: @ 8222733 +MossdeepCity_House3_Text_DontYouLikeToFish: @ 8222733 .string "Hunh?\n" .string "Don't you like to fish?$" -MossdeepCity_House3_Text_222751: @ 8222751 +MossdeepCity_House3_Text_GoAfterSeafloorPokemon: @ 8222751 .string "Go after the seafloor POKéMON with\n" .string "your SUPER ROD.$" diff --git a/data/maps/MossdeepCity_House4/map.json b/data/maps/MossdeepCity_House4/map.json index 2d1b33335..7166674a3 100644 --- a/data/maps/MossdeepCity_House4/map.json +++ b/data/maps/MossdeepCity_House4/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_House4_EventScript_222DD8", + "script": "MossdeepCity_House4_EventScript_Woman", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_House4_EventScript_222DF7", + "script": "MossdeepCity_House4_EventScript_NinjaBoy", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_House4_EventScript_222E1E", + "script": "MossdeepCity_House4_EventScript_Skitty", "flag": "0" } ], diff --git a/data/maps/MossdeepCity_House4/scripts.inc b/data/maps/MossdeepCity_House4/scripts.inc index 4505b1f03..473c1cfbd 100644 --- a/data/maps/MossdeepCity_House4/scripts.inc +++ b/data/maps/MossdeepCity_House4/scripts.inc @@ -1,62 +1,62 @@ MossdeepCity_House4_MapScripts:: @ 8222DD7 .byte 0 -MossdeepCity_House4_EventScript_222DD8:: @ 8222DD8 +MossdeepCity_House4_EventScript_Woman:: @ 8222DD8 lock faceplayer - goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_House4_EventScript_222DED - msgbox MossdeepCity_House4_Text_222E31, MSGBOX_DEFAULT + goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_House4_EventScript_CanBattleAtSecretBases + msgbox MossdeepCity_House4_Text_BrotherLikesToFindBases, MSGBOX_DEFAULT release end -MossdeepCity_House4_EventScript_222DED:: @ 8222DED - msgbox MossdeepCity_House4_Text_222E73, MSGBOX_DEFAULT +MossdeepCity_House4_EventScript_CanBattleAtSecretBases:: @ 8222DED + msgbox MossdeepCity_House4_Text_BrotherLikesToVisitBasesAndBattle, MSGBOX_DEFAULT release end -MossdeepCity_House4_EventScript_222DF7:: @ 8222DF7 +MossdeepCity_House4_EventScript_NinjaBoy:: @ 8222DF7 lock faceplayer special CheckPlayerHasSecretBase - compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_House4_EventScript_222E14 + compare VAR_RESULT, FALSE + goto_if_eq MossdeepCity_House4_EventScript_NoSecretBase special GetSecretBaseNearbyMapName - msgbox MossdeepCity_House4_Text_222ECC, MSGBOX_DEFAULT + msgbox MossdeepCity_House4_Text_YouMadeSecretBaseNearX, MSGBOX_DEFAULT release end -MossdeepCity_House4_EventScript_222E14:: @ 8222E14 - msgbox MossdeepCity_House4_Text_222EF7, MSGBOX_DEFAULT +MossdeepCity_House4_EventScript_NoSecretBase:: @ 8222E14 + msgbox MossdeepCity_House4_Text_MakeSecretBase, MSGBOX_DEFAULT release end -MossdeepCity_House4_EventScript_222E1E:: @ 8222E1E +MossdeepCity_House4_EventScript_Skitty:: @ 8222E1E lock faceplayer waitse playmoncry SPECIES_SKITTY, 0 - msgbox MossdeepCity_House4_Text_222F31, MSGBOX_DEFAULT + msgbox MossdeepCity_House4_Text_Skitty, MSGBOX_DEFAULT waitmoncry release end -MossdeepCity_House4_Text_222E31: @ 8222E31 +MossdeepCity_House4_Text_BrotherLikesToFindBases: @ 8222E31 .string "My little brother says he likes to go\n" .string "find people's SECRET BASES.$" -MossdeepCity_House4_Text_222E73: @ 8222E73 +MossdeepCity_House4_Text_BrotherLikesToVisitBasesAndBattle: @ 8222E73 .string "My little brother says he likes to\n" .string "visit people's SECRET BASES and have\l" .string "POKéMON battles.$" -MossdeepCity_House4_Text_222ECC: @ 8222ECC +MossdeepCity_House4_Text_YouMadeSecretBaseNearX: @ 8222ECC .string "Was it you who made a SECRET BASE\n" .string "near {STR_VAR_1}?$" -MossdeepCity_House4_Text_222EF7: @ 8222EF7 +MossdeepCity_House4_Text_MakeSecretBase: @ 8222EF7 .string "You should make a SECRET BASE\n" .string "somewhere. I'll go find it!$" -MossdeepCity_House4_Text_222F31: @ 8222F31 +MossdeepCity_House4_Text_Skitty: @ 8222F31 .string "SKITTY: Miyaan?$" diff --git a/data/maps/MossdeepCity_StevensHouse/map.json b/data/maps/MossdeepCity_StevensHouse/map.json index 76844e258..c061999ef 100644 --- a/data/maps/MossdeepCity_StevensHouse/map.json +++ b/data/maps/MossdeepCity_StevensHouse/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_StevensHouse_EventScript_222912", + "script": "MossdeepCity_StevensHouse_EventScript_Steven", "flag": "FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_StevensHouse_EventScript_222841", + "script": "MossdeepCity_StevensHouse_EventScript_BeldumPokeball", "flag": "FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_StevensHouse_EventScript_22291B", + "script": "MossdeepCity_StevensHouse_EventScript_Letter", "flag": "FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY" } ], @@ -78,7 +78,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MossdeepCity_StevensHouse_EventScript_222909" + "script": "MossdeepCity_StevensHouse_EventScript_RockDisplay" }, { "type": "sign", @@ -86,7 +86,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MossdeepCity_StevensHouse_EventScript_222909" + "script": "MossdeepCity_StevensHouse_EventScript_RockDisplay" }, { "type": "sign", @@ -94,7 +94,7 @@ "y": 4, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MossdeepCity_StevensHouse_EventScript_222909" + "script": "MossdeepCity_StevensHouse_EventScript_RockDisplay" }, { "type": "sign", @@ -102,7 +102,7 @@ "y": 6, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MossdeepCity_StevensHouse_EventScript_222909" + "script": "MossdeepCity_StevensHouse_EventScript_RockDisplay" } ] } \ No newline at end of file diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc index 247bdc485..c14314b16 100644 --- a/data/maps/MossdeepCity_StevensHouse/scripts.inc +++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc @@ -1,32 +1,32 @@ MossdeepCity_StevensHouse_MapScripts:: @ 8222784 - map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_StevensHouse_MapScript1_222794 + map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_StevensHouse_OnLoad map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_StevensHouse_OnTransition - map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_StevensHouse_MapScript2_2227C0 + map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_StevensHouse_OnFrame .byte 0 -MossdeepCity_StevensHouse_MapScript1_222794: @ 8222794 - call_if_unset FLAG_SYS_GAME_CLEAR, MossdeepCity_StevensHouse_EventScript_22279E +MossdeepCity_StevensHouse_OnLoad: @ 8222794 + call_if_unset FLAG_SYS_GAME_CLEAR, MossdeepCity_StevensHouse_EventScript_HideStevensNote end -MossdeepCity_StevensHouse_EventScript_22279E:: @ 822279E +MossdeepCity_StevensHouse_EventScript_HideStevensNote:: @ 822279E setmetatile 6, 4, METATILE_GenericBuilding_TableEdge, 1 return MossdeepCity_StevensHouse_OnTransition: @ 82227A8 compare VAR_STEVENS_HOUSE_STATE, 2 - call_if_eq MossdeepCity_StevensHouse_EventScript_2227B4 + call_if_eq MossdeepCity_StevensHouse_EventScript_SetStevenPos end -MossdeepCity_StevensHouse_EventScript_2227B4:: @ 82227B4 +MossdeepCity_StevensHouse_EventScript_SetStevenPos:: @ 82227B4 setobjectxyperm 1, 6, 5 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP return -MossdeepCity_StevensHouse_MapScript2_2227C0: @ 82227C0 - map_script_2 VAR_STEVENS_HOUSE_STATE, 1, MossdeepCity_StevensHouse_EventScript_2227CA +MossdeepCity_StevensHouse_OnFrame: @ 82227C0 + map_script_2 VAR_STEVENS_HOUSE_STATE, 1, MossdeepCity_StevensHouse_EventScript_StevenGivesDive .2byte 0 -MossdeepCity_StevensHouse_EventScript_2227CA:: @ 82227CA +MossdeepCity_StevensHouse_EventScript_StevenGivesDive:: @ 82227CA lockall applymovement 1, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 @@ -35,16 +35,16 @@ MossdeepCity_StevensHouse_EventScript_2227CA:: @ 82227CA waitmovement 0 applymovement 1, Common_Movement_Delay48 waitmovement 0 - applymovement 1, MossdeepCity_StevensHouse_Movement_222833 + applymovement 1, MossdeepCity_StevensHouse_Movement_StevenApproachPlayer waitmovement 0 - msgbox MossdeepCity_StevensHouse_Text_222936, MSGBOX_DEFAULT + msgbox MossdeepCity_StevensHouse_Text_YouveEarnedHMDive, MSGBOX_DEFAULT giveitem_std ITEM_HM08 setflag FLAG_RECEIVED_HM08 setflag FLAG_OMIT_DIVE_FROM_STEVEN_LETTER - msgbox MossdeepCity_StevensHouse_Text_222A0E, MSGBOX_DEFAULT + msgbox MossdeepCity_StevensHouse_Text_ExplainDive, MSGBOX_DEFAULT closemessage delay 20 - applymovement 1, MossdeepCity_StevensHouse_Movement_22283B + applymovement 1, MossdeepCity_StevensHouse_Movement_StevenReturn waitmovement 0 setflag FLAG_HIDE_MOSSDEEP_CITY_SCOTT setflag FLAG_HIDE_SEAFLOOR_CAVERN_ENTRANCE_AQUA_GRUNT @@ -52,7 +52,7 @@ MossdeepCity_StevensHouse_EventScript_2227CA:: @ 82227CA releaseall end -MossdeepCity_StevensHouse_Movement_222833: @ 8222833 +MossdeepCity_StevensHouse_Movement_StevenApproachPlayer: @ 8222833 walk_left walk_left walk_left @@ -62,7 +62,7 @@ MossdeepCity_StevensHouse_Movement_222833: @ 8222833 walk_in_place_fastest_down step_end -MossdeepCity_StevensHouse_Movement_22283B: @ 822283B +MossdeepCity_StevensHouse_Movement_StevenReturn: @ 822283B walk_up walk_right walk_right @@ -70,89 +70,90 @@ MossdeepCity_StevensHouse_Movement_22283B: @ 822283B walk_in_place_fastest_up step_end -MossdeepCity_StevensHouse_EventScript_222841:: @ 8222841 +MossdeepCity_StevensHouse_EventScript_BeldumPokeball:: @ 8222841 lockall - msgbox MossdeepCity_StevensHouse_Text_222B9E, MSGBOX_YESNO + msgbox MossdeepCity_StevensHouse_Text_TakeBallContainingBeldum, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq MossdeepCity_StevensHouse_EventScript_22285B - goto MossdeepCity_StevensHouse_EventScript_222865 + goto_if_eq MossdeepCity_StevensHouse_EventScript_LeaveBeldum + goto MossdeepCity_StevensHouse_EventScript_GiveBeldum end -MossdeepCity_StevensHouse_EventScript_22285B:: @ 822285B - msgbox MossdeepCity_StevensHouse_Text_222C2A, MSGBOX_DEFAULT +MossdeepCity_StevensHouse_EventScript_LeaveBeldum:: @ 822285B + msgbox MossdeepCity_StevensHouse_Text_LeftPokeBallWhereItWas, MSGBOX_DEFAULT releaseall end -MossdeepCity_StevensHouse_EventScript_222865:: @ 8222865 +MossdeepCity_StevensHouse_EventScript_GiveBeldum:: @ 8222865 setvar VAR_TEMP_1, SPECIES_BELDUM givemon SPECIES_BELDUM, 5, ITEM_NONE compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_StevensHouse_EventScript_222895 + goto_if_eq MossdeepCity_StevensHouse_EventScript_SendBeldumParty compare VAR_RESULT, 1 - goto_if_eq MossdeepCity_StevensHouse_EventScript_2228BD + goto_if_eq MossdeepCity_StevensHouse_EventScript_SendBeldumPC goto Common_EventScript_NoMoreRoomForPokemon end -MossdeepCity_StevensHouse_EventScript_222895:: @ 8222895 - call MossdeepCity_StevensHouse_EventScript_2228EB +MossdeepCity_StevensHouse_EventScript_SendBeldumParty:: @ 8222895 + call MossdeepCity_StevensHouse_EventScript_ReceivedBeldumFanfare msgbox gText_NicknameThisPokemon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq MossdeepCity_StevensHouse_EventScript_222901 + goto_if_eq MossdeepCity_StevensHouse_EventScript_ReceivedBeldum call Common_EventScript_GetGiftMonPartySlot call Common_EventScript_NameReceivedPartyMon - goto MossdeepCity_StevensHouse_EventScript_222901 + goto MossdeepCity_StevensHouse_EventScript_ReceivedBeldum end -MossdeepCity_StevensHouse_EventScript_2228BD:: @ 82228BD - call MossdeepCity_StevensHouse_EventScript_2228EB +MossdeepCity_StevensHouse_EventScript_SendBeldumPC:: @ 82228BD + call MossdeepCity_StevensHouse_EventScript_ReceivedBeldumFanfare msgbox gText_NicknameThisPokemon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq MossdeepCity_StevensHouse_EventScript_2228E0 + goto_if_eq MossdeepCity_StevensHouse_EventScript_BeldumTransferredToPC call Common_EventScript_NameReceivedBoxMon - goto MossdeepCity_StevensHouse_EventScript_2228E0 + goto MossdeepCity_StevensHouse_EventScript_BeldumTransferredToPC end -MossdeepCity_StevensHouse_EventScript_2228E0:: @ 82228E0 +MossdeepCity_StevensHouse_EventScript_BeldumTransferredToPC:: @ 82228E0 call Common_EventScript_TransferredToPC - goto MossdeepCity_StevensHouse_EventScript_222901 + goto MossdeepCity_StevensHouse_EventScript_ReceivedBeldum end -MossdeepCity_StevensHouse_EventScript_2228EB:: @ 82228EB +MossdeepCity_StevensHouse_EventScript_ReceivedBeldumFanfare:: @ 82228EB bufferspeciesname 1, SPECIES_BELDUM removeobject 2 playfanfare MUS_FANFA4 - message MossdeepCity_StevensHouse_Text_222BED + message MossdeepCity_StevensHouse_Text_ObtainedBeldum waitmessage waitfanfare bufferspeciesname 0, SPECIES_BELDUM return -MossdeepCity_StevensHouse_EventScript_222901:: @ 8222901 +MossdeepCity_StevensHouse_EventScript_ReceivedBeldum:: @ 8222901 setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL setflag FLAG_RECEIVED_BELDUM releaseall end -MossdeepCity_StevensHouse_EventScript_222909:: @ 8222909 - msgbox MossdeepCity_StevensHouse_Text_222D97, MSGBOX_SIGN +MossdeepCity_StevensHouse_EventScript_RockDisplay:: @ 8222909 + msgbox MossdeepCity_StevensHouse_Text_CollectionOfRareRocks, MSGBOX_SIGN end -MossdeepCity_StevensHouse_EventScript_222912:: @ 8222912 - msgbox MossdeepCity_StevensHouse_Text_222B11, MSGBOX_NPC +MossdeepCity_StevensHouse_EventScript_Steven:: @ 8222912 + msgbox MossdeepCity_StevensHouse_Text_UnderwateCavernBetweenMossdeepSootopolis, MSGBOX_NPC end -MossdeepCity_StevensHouse_EventScript_22291B:: @ 822291B +MossdeepCity_StevensHouse_EventScript_Letter:: @ 822291B lockall - msgbox MossdeepCity_StevensHouse_Text_222C4E, MSGBOX_DEFAULT + msgbox MossdeepCity_StevensHouse_Text_LetterFromSteven, MSGBOX_DEFAULT releaseall end -MossdeepCity_StevensHouse_EventScript_222926:: @ 8222926 +@ Unused, leftover from RS +MossdeepCity_StevensHouse_EventScript_DiveItemBall:: @ 8222926 giveitem_std ITEM_HM08, 1, 1 setflag FLAG_RECEIVED_HM08 end -MossdeepCity_StevensHouse_Text_222936: @ 8222936 +MossdeepCity_StevensHouse_Text_YouveEarnedHMDive: @ 8222936 .string "STEVEN: {PLAYER}{KUN}…\p" .string "As you can see, there's not much here,\n" .string "but this is my home.\p" @@ -162,7 +163,7 @@ MossdeepCity_StevensHouse_Text_222936: @ 8222936 .string "No need to be shy--you've earned\n" .string "this HM.$" -MossdeepCity_StevensHouse_Text_222A0E: @ 8222A0E +MossdeepCity_StevensHouse_Text_ExplainDive: @ 8222A0E .string "STEVEN: While you're using SURF, you\n" .string "should notice dark patches of water.\p" .string "Use DIVE if you come to deep water\n" @@ -172,30 +173,30 @@ MossdeepCity_StevensHouse_Text_222A0E: @ 8222A0E .string "In some places, it won't be possible\n" .string "for you to surface, though.$" -MossdeepCity_StevensHouse_Text_222B11: @ 8222B11 +MossdeepCity_StevensHouse_Text_UnderwateCavernBetweenMossdeepSootopolis: @ 8222B11 .string "STEVEN: Apparently, there's an\n" .string "underwater cavern between\l" .string "MOSSDEEP and SOOTOPOLIS.\p" .string "You know, the one that CAPT. STERN\n" .string "found in his submarine.$" -MossdeepCity_StevensHouse_Text_222B9E: @ 8222B9E +MossdeepCity_StevensHouse_Text_TakeBallContainingBeldum: @ 8222B9E .string "{PLAYER} checked the POKé BALL.\p" .string "It contained the POKéMON\n" .string "BELDUM.\p" .string "Take the POKé BALL?$" -MossdeepCity_StevensHouse_Text_222BED: @ 8222BED +MossdeepCity_StevensHouse_Text_ObtainedBeldum: @ 8222BED .string "{PLAYER} obtained a BELDUM.$" MossdeepCity_StevensHouse_Text_222C03: @ 8222C03 .string "There is no space for another POKéMON.$" -MossdeepCity_StevensHouse_Text_222C2A: @ 8222C2A +MossdeepCity_StevensHouse_Text_LeftPokeBallWhereItWas: @ 8222C2A .string "{PLAYER} left the POKé BALL where\n" .string "it was.$" -MossdeepCity_StevensHouse_Text_222C4E: @ 8222C4E +MossdeepCity_StevensHouse_Text_LetterFromSteven: @ 8222C4E .string "It's a letter.\p" .string "… … … … … …\p" .string "To {PLAYER}{KUN}…\p" @@ -212,7 +213,7 @@ MossdeepCity_StevensHouse_Text_222C4E: @ 8222C4E .string "May our paths cross someday.\p" .string "STEVEN STONE$" -MossdeepCity_StevensHouse_Text_222D97: @ 8222D97 +MossdeepCity_StevensHouse_Text_CollectionOfRareRocks: @ 8222D97 .string "It's a collection of rare rocks and\n" .string "stones assembled by STEVEN.$" From 5ac8b126e96bae1be77725f9638a0e01c56b0767 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sat, 9 Nov 2019 12:23:30 -0500 Subject: [PATCH 40/40] Document Mt Pyre scripts --- data/maps/MtPyre_1F/map.json | 6 +-- data/maps/MtPyre_1F/scripts.inc | 28 +++++----- data/maps/MtPyre_2F/map.json | 14 ++--- data/maps/MtPyre_2F/scripts.inc | 76 +++++++++++++-------------- data/maps/MtPyre_3F/map.json | 6 +-- data/maps/MtPyre_3F/scripts.inc | 58 ++++++++++---------- data/maps/MtPyre_4F/map.json | 2 +- data/maps/MtPyre_4F/scripts.inc | 14 ++--- data/maps/MtPyre_5F/map.json | 2 +- data/maps/MtPyre_5F/scripts.inc | 14 ++--- data/maps/MtPyre_6F/map.json | 4 +- data/maps/MtPyre_6F/scripts.inc | 46 ++++++++-------- data/maps/MtPyre_Exterior/map.json | 10 ++-- data/maps/MtPyre_Exterior/scripts.inc | 12 ++--- 14 files changed, 148 insertions(+), 144 deletions(-) diff --git a/data/maps/MtPyre_1F/map.json b/data/maps/MtPyre_1F/map.json index 8b2e146f5..2e03ae728 100644 --- a/data/maps/MtPyre_1F/map.json +++ b/data/maps/MtPyre_1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MtPyre_1F_EventScript_230F3F", + "script": "MtPyre_1F_EventScript_CleanseTagWoman", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MtPyre_1F_EventScript_230F78", + "script": "MtPyre_1F_EventScript_PokefanF", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MtPyre_1F_EventScript_230F81", + "script": "MtPyre_1F_EventScript_Man", "flag": "0" } ], diff --git a/data/maps/MtPyre_1F/scripts.inc b/data/maps/MtPyre_1F/scripts.inc index a06f34a29..2574e6851 100644 --- a/data/maps/MtPyre_1F/scripts.inc +++ b/data/maps/MtPyre_1F/scripts.inc @@ -1,48 +1,48 @@ MtPyre_1F_MapScripts:: @ 8230F3E .byte 0 -MtPyre_1F_EventScript_230F3F:: @ 8230F3F +MtPyre_1F_EventScript_CleanseTagWoman:: @ 8230F3F lock faceplayer - goto_if_set FLAG_RECEIVED_CLEANSE_TAG, MtPyre_1F_EventScript_230F6E - msgbox MtPyre_1F_Text_230F8A, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_CLEANSE_TAG, MtPyre_1F_EventScript_ReceivedCleanseTag + msgbox MtPyre_1F_Text_TakeThisForYourOwnGood, MSGBOX_DEFAULT giveitem_std ITEM_CLEANSE_TAG - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_CLEANSE_TAG release end -MtPyre_1F_EventScript_230F6E:: @ 8230F6E - msgbox MtPyre_1F_Text_231005, MSGBOX_DEFAULT +MtPyre_1F_EventScript_ReceivedCleanseTag:: @ 8230F6E + msgbox MtPyre_1F_Text_ExplainCleanseTag, MSGBOX_DEFAULT release end -MtPyre_1F_EventScript_230F78:: @ 8230F78 - msgbox MtPyre_1F_Text_23104F, MSGBOX_NPC +MtPyre_1F_EventScript_PokefanF:: @ 8230F78 + msgbox MtPyre_1F_Text_ComeToPayRespects, MSGBOX_NPC end -MtPyre_1F_EventScript_230F81:: @ 8230F81 - msgbox MtPyre_1F_Text_2310BA, MSGBOX_NPC +MtPyre_1F_EventScript_Man:: @ 8230F81 + msgbox MtPyre_1F_Text_RestingPlaceOfZigzagoon, MSGBOX_NPC end -MtPyre_1F_Text_230F8A: @ 8230F8A +MtPyre_1F_Text_TakeThisForYourOwnGood: @ 8230F8A .string "All sorts of beings wander the slopes\n" .string "of MT. PYRE…\p" .string "There is no telling what may happen.\n" .string "Take this. It's for your own good.$" -MtPyre_1F_Text_231005: @ 8231005 +MtPyre_1F_Text_ExplainCleanseTag: @ 8231005 .string "Have a POKéMON hold that\n" .string "CLEANSE TAG.\p" .string "It will help ward off wild POKéMON.$" -MtPyre_1F_Text_23104F: @ 823104F +MtPyre_1F_Text_ComeToPayRespects: @ 823104F .string "Did you come to pay your respect\n" .string "to the spirits of departed POKéMON?\p" .string "You must care for your POKéMON a lot.$" -MtPyre_1F_Text_2310BA: @ 82310BA +MtPyre_1F_Text_RestingPlaceOfZigzagoon: @ 82310BA .string "This is the final resting place of my\n" .string "ZIGZAGOON. I cherished it…$" diff --git a/data/maps/MtPyre_2F/map.json b/data/maps/MtPyre_2F/map.json index 64657cb0d..e6882c311 100644 --- a/data/maps/MtPyre_2F/map.json +++ b/data/maps/MtPyre_2F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "MtPyre_2F_EventScript_231128", + "script": "MtPyre_2F_EventScript_Mark", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MtPyre_2F_EventScript_231116", + "script": "MtPyre_2F_EventScript_Woman", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MtPyre_2F_EventScript_23111F", + "script": "MtPyre_2F_EventScript_PokefanM", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "MtPyre_2F_EventScript_23115A", + "script": "MtPyre_2F_EventScript_Dez", "flag": "0" }, { @@ -89,7 +89,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "MtPyre_2F_EventScript_23113F", + "script": "MtPyre_2F_EventScript_Luke", "flag": "0" }, { @@ -102,7 +102,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "MtPyre_2F_EventScript_23118C", + "script": "MtPyre_2F_EventScript_Zander", "flag": "0" }, { @@ -115,7 +115,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "MtPyre_2F_EventScript_231175", + "script": "MtPyre_2F_EventScript_Leah", "flag": "0" } ], diff --git a/data/maps/MtPyre_2F/scripts.inc b/data/maps/MtPyre_2F/scripts.inc index be98ac8e7..52c1a154c 100644 --- a/data/maps/MtPyre_2F/scripts.inc +++ b/data/maps/MtPyre_2F/scripts.inc @@ -9,83 +9,83 @@ MtPyre_2F_SetHoleWarp: @ 823110B setholewarp MAP_MT_PYRE_1F, 255, 0, 0 end -MtPyre_2F_EventScript_231116:: @ 8231116 - msgbox MtPyre_2F_Text_2311A3, MSGBOX_NPC +MtPyre_2F_EventScript_Woman:: @ 8231116 + msgbox MtPyre_2F_Text_MemoriesOfSkitty, MSGBOX_NPC end -MtPyre_2F_EventScript_23111F:: @ 823111F - msgbox MtPyre_2F_Text_2311E6, MSGBOX_NPC +MtPyre_2F_EventScript_PokefanM:: @ 823111F + msgbox MtPyre_2F_Text_TumbledFromFloorAbove, MSGBOX_NPC end -MtPyre_2F_EventScript_231128:: @ 8231128 - trainerbattle_single TRAINER_MARK, MtPyre_2F_Text_231258, MtPyre_2F_Text_2312A2 - msgbox MtPyre_2F_Text_2312CB, MSGBOX_AUTOCLOSE +MtPyre_2F_EventScript_Mark:: @ 8231128 + trainerbattle_single TRAINER_MARK, MtPyre_2F_Text_MarkIntro, MtPyre_2F_Text_MarkDefeat + msgbox MtPyre_2F_Text_MarkPostBattle, MSGBOX_AUTOCLOSE end -MtPyre_2F_EventScript_23113F:: @ 823113F - trainerbattle_double TRAINER_DEZ_AND_LUKE, MtPyre_2F_Text_23130F, MtPyre_2F_Text_2313A1, MtPyre_2F_Text_231414 - msgbox MtPyre_2F_Text_2313B1, MSGBOX_AUTOCLOSE +MtPyre_2F_EventScript_Luke:: @ 823113F + trainerbattle_double TRAINER_DEZ_AND_LUKE, MtPyre_2F_Text_LukeIntro, MtPyre_2F_Text_LukeDefeat, MtPyre_2F_Text_LukeNotEnoughMons + msgbox MtPyre_2F_Text_LukePostBattle, MSGBOX_AUTOCLOSE end -MtPyre_2F_EventScript_23115A:: @ 823115A - trainerbattle_double TRAINER_DEZ_AND_LUKE, MtPyre_2F_Text_231492, MtPyre_2F_Text_231534, MtPyre_2F_Text_231582 - msgbox MtPyre_2F_Text_23154D, MSGBOX_AUTOCLOSE +MtPyre_2F_EventScript_Dez:: @ 823115A + trainerbattle_double TRAINER_DEZ_AND_LUKE, MtPyre_2F_Text_DezIntro, MtPyre_2F_Text_DezDefeat, MtPyre_2F_Text_DezNotEnoughMons + msgbox MtPyre_2F_Text_DezPostBattle, MSGBOX_AUTOCLOSE end -MtPyre_2F_EventScript_231175:: @ 8231175 - trainerbattle_single TRAINER_LEAH, MtPyre_2F_Text_231604, MtPyre_2F_Text_231645 - msgbox MtPyre_2F_Text_23165A, MSGBOX_AUTOCLOSE +MtPyre_2F_EventScript_Leah:: @ 8231175 + trainerbattle_single TRAINER_LEAH, MtPyre_2F_Text_LeahIntro, MtPyre_2F_Text_LeahDefeat + msgbox MtPyre_2F_Text_LeahPostBattle, MSGBOX_AUTOCLOSE end -MtPyre_2F_EventScript_23118C:: @ 823118C - trainerbattle_single TRAINER_ZANDER, MtPyre_2F_Text_2316C7, MtPyre_2F_Text_2316E1 - msgbox MtPyre_2F_Text_2316FB, MSGBOX_AUTOCLOSE +MtPyre_2F_EventScript_Zander:: @ 823118C + trainerbattle_single TRAINER_ZANDER, MtPyre_2F_Text_ZanderIntro, MtPyre_2F_Text_ZanderDefeat + msgbox MtPyre_2F_Text_ZanderPostBattle, MSGBOX_AUTOCLOSE end -MtPyre_2F_Text_2311A3: @ 82311A3 +MtPyre_2F_Text_MemoriesOfSkitty: @ 82311A3 .string "Memories of my darling SKITTY…\n" .string "My eyes overflow thinking about it.$" -MtPyre_2F_Text_2311E6: @ 82311E6 +MtPyre_2F_Text_TumbledFromFloorAbove: @ 82311E6 .string "Ooch, ouch… There are holes in the\n" .string "ground here and there.\p" .string "I didn't notice and took a tumble from\n" .string "the floor above.$" -MtPyre_2F_Text_231258: @ 8231258 +MtPyre_2F_Text_MarkIntro: @ 8231258 .string "Hey! Are you searching for POKéMON?\n" .string "You came along after me! You're rude!$" -MtPyre_2F_Text_2312A2: @ 82312A2 +MtPyre_2F_Text_MarkDefeat: @ 82312A2 .string "Ayieeeeh!\n" .string "I'm sorry, forgive me, please!$" -MtPyre_2F_Text_2312CB: @ 82312CB +MtPyre_2F_Text_MarkPostBattle: @ 82312CB .string "People don't come here often, so\n" .string "I thought there'd be rare POKéMON.$" -MtPyre_2F_Text_23130F: @ 823130F +MtPyre_2F_Text_LukeIntro: @ 823130F .string "LUKE: We're here on a dare.\p" .string "Heheh, if I show her how cool I am,\n" .string "she'll fall for me. I know it!\p" .string "I know! I'll cream you and show her\n" .string "how cool I am!$" -MtPyre_2F_Text_2313A1: @ 82313A1 +MtPyre_2F_Text_LukeDefeat: @ 82313A1 .string "LUKE: Whoopsie!$" -MtPyre_2F_Text_2313B1: @ 82313B1 +MtPyre_2F_Text_LukePostBattle: @ 82313B1 .string "LUKE: Well, we lost but that's okay!\n" .string "I'm right here by your side.\l" .string "We'll make it through this dare!$" -MtPyre_2F_Text_231414: @ 8231414 +MtPyre_2F_Text_LukeNotEnoughMons: @ 8231414 .string "LUKE: If you want to take me on,\n" .string "bring some more POKéMON.\p" .string "If you don't, I won't be able to show\n" .string "off to my girl how cool I am!$" -MtPyre_2F_Text_231492: @ 8231492 +MtPyre_2F_Text_DezIntro: @ 8231492 .string "DEZ: I came here on a dare with my\n" .string "boyfriend.\p" .string "It's really scary, but I'm with my\n" @@ -93,42 +93,42 @@ MtPyre_2F_Text_231492: @ 8231492 .string "I know! I'll get my boyfriend to look\n" .string "cool by beating you!$" -MtPyre_2F_Text_231534: @ 8231534 +MtPyre_2F_Text_DezDefeat: @ 8231534 .string "DEZ: Waaaah! I'm scared!$" -MtPyre_2F_Text_23154D: @ 823154D +MtPyre_2F_Text_DezPostBattle: @ 823154D .string "DEZ: We're lovey-dovey, so we don't\n" .string "care if we lose!$" -MtPyre_2F_Text_231582: @ 8231582 +MtPyre_2F_Text_DezNotEnoughMons: @ 8231582 .string "DEZ: If you want to challenge us, you\n" .string "should bring at least two POKéMON.\p" .string "My boyfriend's strong.\n" .string "Just one POKéMON won't do at all.$" -MtPyre_2F_Text_231604: @ 8231604 +MtPyre_2F_Text_LeahIntro: @ 8231604 .string "You are an unfamiliar sight…\n" .string "Depart before anything befalls you!$" -MtPyre_2F_Text_231645: @ 8231645 +MtPyre_2F_Text_LeahDefeat: @ 8231645 .string "Hmm…\n" .string "You're durable.$" -MtPyre_2F_Text_23165A: @ 823165A +MtPyre_2F_Text_LeahPostBattle: @ 823165A .string "Our family has been TRAINERS here\n" .string "since my great-grandmother's time…\p" .string "It is my duty to protect this\n" .string "mountain…$" -MtPyre_2F_Text_2316C7: @ 82316C7 +MtPyre_2F_Text_ZanderIntro: @ 82316C7 .string "Kiyaaaaah!\n" .string "I'm terrified!$" -MtPyre_2F_Text_2316E1: @ 82316E1 +MtPyre_2F_Text_ZanderDefeat: @ 82316E1 .string "Nooooooo!\n" .string "I lost my wits!$" -MtPyre_2F_Text_2316FB: @ 82316FB +MtPyre_2F_Text_ZanderPostBattle: @ 82316FB .string "I get freaked out every time I see\n" .string "anything move…\p" .string "I shouldn't have come here to train…$" diff --git a/data/maps/MtPyre_3F/map.json b/data/maps/MtPyre_3F/map.json index 3e06adf8c..058c4db0a 100644 --- a/data/maps/MtPyre_3F/map.json +++ b/data/maps/MtPyre_3F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "MtPyre_3F_EventScript_231753", + "script": "MtPyre_3F_EventScript_William", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "MtPyre_3F_EventScript_23176A", + "script": "MtPyre_3F_EventScript_Kayla", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "MtPyre_3F_EventScript_231781", + "script": "MtPyre_3F_EventScript_Gabrielle", "flag": "0" } ], diff --git a/data/maps/MtPyre_3F/scripts.inc b/data/maps/MtPyre_3F/scripts.inc index 3b84a581b..02cea0c22 100644 --- a/data/maps/MtPyre_3F/scripts.inc +++ b/data/maps/MtPyre_3F/scripts.inc @@ -1,74 +1,74 @@ MtPyre_3F_MapScripts:: @ 8231752 .byte 0 -MtPyre_3F_EventScript_231753:: @ 8231753 - trainerbattle_single TRAINER_WILLIAM, MtPyre_3F_Text_2317E3, MtPyre_3F_Text_231853 - msgbox MtPyre_3F_Text_231869, MSGBOX_AUTOCLOSE +MtPyre_3F_EventScript_William:: @ 8231753 + trainerbattle_single TRAINER_WILLIAM, MtPyre_3F_Text_WilliamIntro, MtPyre_3F_Text_WilliamDefeat + msgbox MtPyre_3F_Text_WilliamPostBattle, MSGBOX_AUTOCLOSE end -MtPyre_3F_EventScript_23176A:: @ 823176A - trainerbattle_single TRAINER_KAYLA, MtPyre_3F_Text_2318A1, MtPyre_3F_Text_2318DD - msgbox MtPyre_3F_Text_2318F2, MSGBOX_AUTOCLOSE +MtPyre_3F_EventScript_Kayla:: @ 823176A + trainerbattle_single TRAINER_KAYLA, MtPyre_3F_Text_KaylaIntro MtPyre_3F_Text_KaylaDefeat + msgbox MtPyre_3F_Text_KaylaPostBattle, MSGBOX_AUTOCLOSE end -MtPyre_3F_EventScript_231781:: @ 8231781 - trainerbattle_single TRAINER_GABRIELLE_1, MtPyre_3F_Text_231952, MtPyre_3F_Text_23196A, MtPyre_3F_EventScript_2317AD +MtPyre_3F_EventScript_Gabrielle:: @ 8231781 + trainerbattle_single TRAINER_GABRIELLE_1, MtPyre_3F_Text_GabrielleIntro, MtPyre_3F_Text_GabrielleDefeat, MtPyre_3F_EventScript_RegisterGabrielle specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq MtPyre_3F_EventScript_2317CC - msgbox MtPyre_3F_Text_23199B, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq MtPyre_3F_EventScript_RematchGabrielle + msgbox MtPyre_3F_Text_GabriellePostBattle, MSGBOX_DEFAULT release end -MtPyre_3F_EventScript_2317AD:: @ 82317AD +MtPyre_3F_EventScript_RegisterGabrielle:: @ 82317AD special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox MtPyre_3F_Text_231A49, MSGBOX_DEFAULT + msgbox MtPyre_3F_Text_GabrielleRegister, MSGBOX_DEFAULT register_matchcall TRAINER_GABRIELLE_1 release end -MtPyre_3F_EventScript_2317CC:: @ 82317CC - trainerbattle_rematch TRAINER_GABRIELLE_1, MtPyre_3F_Text_231AAB, MtPyre_3F_Text_231AE6 - msgbox MtPyre_3F_Text_231B0D, MSGBOX_AUTOCLOSE +MtPyre_3F_EventScript_RematchGabrielle:: @ 82317CC + trainerbattle_rematch TRAINER_GABRIELLE_1, MtPyre_3F_Text_GabrielleRematchIntro, MtPyre_3F_Text_GabrielleRematchDefeat + msgbox MtPyre_3F_Text_GabriellePostRematch, MSGBOX_AUTOCLOSE end -MtPyre_3F_Text_2317E3: @ 82317E3 +MtPyre_3F_Text_WilliamIntro: @ 82317E3 .string "The rich atmosphere of the mountain\n" .string "has elevated my psychic power!\p" .string "A mere child like you…\n" .string "You dream of winning?$" -MtPyre_3F_Text_231853: @ 8231853 +MtPyre_3F_Text_WilliamDefeat: @ 8231853 .string "I drown in self-pity…$" -MtPyre_3F_Text_231869: @ 8231869 +MtPyre_3F_Text_WilliamPostBattle: @ 8231869 .string "My psychic powers have surely\n" .string "grown several times, but…$" -MtPyre_3F_Text_2318A1: @ 82318A1 +MtPyre_3F_Text_KaylaIntro: @ 82318A1 .string "Ahahahaha!\p" .string "This is no place for children, least\n" .string "of all you!$" -MtPyre_3F_Text_2318DD: @ 82318DD +MtPyre_3F_Text_KaylaDefeat: @ 82318DD .string "I lost that cleanly…$" -MtPyre_3F_Text_2318F2: @ 82318F2 +MtPyre_3F_Text_KaylaPostBattle: @ 82318F2 .string "This means my training is still not\n" .string "enough…\p" .string "I've got to keep working toward the\n" .string "summit…\p" .string "Go, me!$" -MtPyre_3F_Text_231952: @ 8231952 +MtPyre_3F_Text_GabrielleIntro: @ 8231952 .string "Why have you come here?$" -MtPyre_3F_Text_23196A: @ 823196A +MtPyre_3F_Text_GabrielleDefeat: @ 823196A .string "That was amazing!\n" .string "You're a very special TRAINER.$" -MtPyre_3F_Text_23199B: @ 823199B +MtPyre_3F_Text_GabriellePostBattle: @ 823199B .string "POKéMON no longer of this world.\n" .string "POKéMON that are with you now.\p" .string "And the POKéMON that you will meet\n" @@ -76,21 +76,21 @@ MtPyre_3F_Text_23199B: @ 823199B .string "They are all to be equally cherished.\n" .string "Please remember that.$" -MtPyre_3F_Text_231A49: @ 8231A49 +MtPyre_3F_Text_GabrielleRegister: @ 8231A49 .string "I would like to see your POKéMON\n" .string "when they grow up some more…\p" .string "Please, I need to see your POKéNAV.$" -MtPyre_3F_Text_231AAB: @ 8231AAB +MtPyre_3F_Text_GabrielleRematchIntro: @ 8231AAB .string "Oh, it's you…\p" .string "Have you come to show me your grown\n" .string "POKéMON?$" -MtPyre_3F_Text_231AE6: @ 8231AE6 +MtPyre_3F_Text_GabrielleRematchDefeat: @ 8231AE6 .string "How amazing!\n" .string "You are a special person.$" -MtPyre_3F_Text_231B0D: @ 8231B0D +MtPyre_3F_Text_GabriellePostRematch: @ 8231B0D .string "POKéMON no longer of this world.\n" .string "POKéMON that are with you now.\p" .string "And the POKéMON that you will meet\n" diff --git a/data/maps/MtPyre_4F/map.json b/data/maps/MtPyre_4F/map.json index 782a6221e..5c3d72ef8 100644 --- a/data/maps/MtPyre_4F/map.json +++ b/data/maps/MtPyre_4F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "MtPyre_4F_EventScript_231C6E", + "script": "MtPyre_4F_EventScript_Tasha", "flag": "0" }, { diff --git a/data/maps/MtPyre_4F/scripts.inc b/data/maps/MtPyre_4F/scripts.inc index 27883c8ed..683b38607 100644 --- a/data/maps/MtPyre_4F/scripts.inc +++ b/data/maps/MtPyre_4F/scripts.inc @@ -1,20 +1,22 @@ MtPyre_4F_MapScripts:: @ 8231BC8 .byte 0 -MtPyre_5F_EventScript_231BC9:: @ 8231BC9 - trainerbattle_single TRAINER_ATSUSHI, MtPyre_5F_Text_231BE0, MtPyre_5F_Text_231C08 - msgbox MtPyre_5F_Text_231C24, MSGBOX_AUTOCLOSE +@ Seems like the scripts for the 4F and 5F were swapped + +MtPyre_5F_EventScript_Atsushi:: @ 8231BC9 + trainerbattle_single TRAINER_ATSUSHI, MtPyre_5F_Text_AtsushiIntro, MtPyre_5F_Text_AtsushiDefeat + msgbox MtPyre_5F_Text_AtsushiPostBattle, MSGBOX_AUTOCLOSE end -MtPyre_5F_Text_231BE0: @ 8231BE0 +MtPyre_5F_Text_AtsushiIntro: @ 8231BE0 .string "Teacher…\n" .string "Please watch over my progress!$" -MtPyre_5F_Text_231C08: @ 8231C08 +MtPyre_5F_Text_AtsushiDefeat: @ 8231C08 .string "Teacher…\n" .string "Please forgive me!$" -MtPyre_5F_Text_231C24: @ 8231C24 +MtPyre_5F_Text_AtsushiPostBattle: @ 8231C24 .string "Until I improve, my teacher, who rests\n" .string "here, will never find true peace…$" diff --git a/data/maps/MtPyre_5F/map.json b/data/maps/MtPyre_5F/map.json index edd3544ca..1f814bda8 100644 --- a/data/maps/MtPyre_5F/map.json +++ b/data/maps/MtPyre_5F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "MtPyre_5F_EventScript_231BC9", + "script": "MtPyre_5F_EventScript_Atsushi", "flag": "0" }, { diff --git a/data/maps/MtPyre_5F/scripts.inc b/data/maps/MtPyre_5F/scripts.inc index cbd3b3afa..f27370d7c 100644 --- a/data/maps/MtPyre_5F/scripts.inc +++ b/data/maps/MtPyre_5F/scripts.inc @@ -1,21 +1,23 @@ MtPyre_5F_MapScripts:: @ 8231C6D .byte 0 -MtPyre_4F_EventScript_231C6E:: @ 8231C6E - trainerbattle_single TRAINER_TASHA, MtPyre_4F_Text_231C85, MtPyre_4F_Text_231CDB - msgbox MtPyre_4F_Text_231CEE, MSGBOX_AUTOCLOSE +@ Seems like the scripts for the 4F and 5F were swapped + +MtPyre_4F_EventScript_Tasha:: @ 8231C6E + trainerbattle_single TRAINER_TASHA, MtPyre_4F_Text_TashaIntro, MtPyre_4F_Text_TashaDefeat + msgbox MtPyre_4F_Text_TashaPostBattle, MSGBOX_AUTOCLOSE end -MtPyre_4F_Text_231C85: @ 8231C85 +MtPyre_4F_Text_TashaIntro: @ 8231C85 .string "I love all things horrifying…\n" .string "It's like a disease…\p" .string "When I'm here…\n" .string "I shiver with fear…$" -MtPyre_4F_Text_231CDB: @ 8231CDB +MtPyre_4F_Text_TashaDefeat: @ 8231CDB .string "Losing, I dislike…$" -MtPyre_4F_Text_231CEE: @ 8231CEE +MtPyre_4F_Text_TashaPostBattle: @ 8231CEE .string "I want to see dreadful things…\n" .string "I can't leave…\p" .string "Stay…\n" diff --git a/data/maps/MtPyre_6F/map.json b/data/maps/MtPyre_6F/map.json index 3c889a7e0..c2de09055 100644 --- a/data/maps/MtPyre_6F/map.json +++ b/data/maps/MtPyre_6F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "MtPyre_6F_EventScript_231D3B", + "script": "MtPyre_6F_EventScript_Valerie", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "MtPyre_6F_EventScript_231D9D", + "script": "MtPyre_6F_EventScript_Cedric", "flag": "0" } ], diff --git a/data/maps/MtPyre_6F/scripts.inc b/data/maps/MtPyre_6F/scripts.inc index bc975e942..e3bdd928e 100644 --- a/data/maps/MtPyre_6F/scripts.inc +++ b/data/maps/MtPyre_6F/scripts.inc @@ -1,69 +1,69 @@ MtPyre_6F_MapScripts:: @ 8231D3A .byte 0 -MtPyre_6F_EventScript_231D3B:: @ 8231D3B - trainerbattle_single TRAINER_VALERIE_1, MtPyre_6F_Text_231DB4, MtPyre_6F_Text_231DE2, MtPyre_6F_EventScript_231D67 +MtPyre_6F_EventScript_Valerie:: @ 8231D3B + trainerbattle_single TRAINER_VALERIE_1, MtPyre_6F_Text_ValerieIntro, MtPyre_6F_Text_ValerieDefeat, MtPyre_6F_EventScript_RegisterValerie specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq MtPyre_6F_EventScript_231D86 - msgbox MtPyre_6F_Text_231DFC, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq MtPyre_6F_EventScript_RematchValerie + msgbox MtPyre_6F_Text_ValeriePostBattle, MSGBOX_DEFAULT release end -MtPyre_6F_EventScript_231D67:: @ 8231D67 +MtPyre_6F_EventScript_RegisterValerie:: @ 8231D67 special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox MtPyre_6F_Text_231E43, MSGBOX_DEFAULT + msgbox MtPyre_6F_Text_ValerieRegister, MSGBOX_DEFAULT register_matchcall TRAINER_VALERIE_1 release end -MtPyre_6F_EventScript_231D86:: @ 8231D86 - trainerbattle_rematch TRAINER_VALERIE_1, MtPyre_6F_Text_231EB3, MtPyre_6F_Text_231ECB - msgbox MtPyre_6F_Text_231EE1, MSGBOX_AUTOCLOSE +MtPyre_6F_EventScript_RematchValerie:: @ 8231D86 + trainerbattle_rematch TRAINER_VALERIE_1, MtPyre_6F_Text_ValerieRematchIntro, MtPyre_6F_Text_ValerieRematchDefeat + msgbox MtPyre_6F_Text_ValeriePostRematch, MSGBOX_AUTOCLOSE end -MtPyre_6F_EventScript_231D9D:: @ 8231D9D - trainerbattle_single TRAINER_CEDRIC, MtPyre_6F_Text_231F11, MtPyre_6F_Text_231F4A - msgbox MtPyre_6F_Text_231F5C, MSGBOX_AUTOCLOSE +MtPyre_6F_EventScript_Cedric:: @ 8231D9D + trainerbattle_single TRAINER_CEDRIC, MtPyre_6F_Text_CedricIntro, MtPyre_6F_Text_CedricDefeat + msgbox MtPyre_6F_Text_CedricPostBattle, MSGBOX_AUTOCLOSE end -MtPyre_6F_Text_231DB4: @ 8231DB4 +MtPyre_6F_Text_ValerieIntro: @ 8231DB4 .string "When I'm here…\n" .string "A curious power flows into me…$" -MtPyre_6F_Text_231DE2: @ 8231DE2 +MtPyre_6F_Text_ValerieDefeat: @ 8231DE2 .string "The power is ebbing away…$" -MtPyre_6F_Text_231DFC: @ 8231DFC +MtPyre_6F_Text_ValeriePostBattle: @ 8231DFC .string "Perhaps the power is from the spirits\n" .string "of POKéMON in fitful sleep here…$" -MtPyre_6F_Text_231E43: @ 8231E43 +MtPyre_6F_Text_ValerieRegister: @ 8231E43 .string "Fufufu… I lost the match, but…\n" .string "I have this little ability…\p" .string "Without ever laying my hands on\n" .string "your POKéNAV… Hiyah!$" -MtPyre_6F_Text_231EB3: @ 8231EB3 +MtPyre_6F_Text_ValerieRematchIntro: @ 8231EB3 .string "Behind you…\n" .string "What is it…$" -MtPyre_6F_Text_231ECB: @ 8231ECB +MtPyre_6F_Text_ValerieRematchDefeat: @ 8231ECB .string "Something faded away…$" -MtPyre_6F_Text_231EE1: @ 8231EE1 +MtPyre_6F_Text_ValeriePostRematch: @ 8231EE1 .string "The POKéMON at rest here…\n" .string "Sometimes, they play…$" -MtPyre_6F_Text_231F11: @ 8231F11 +MtPyre_6F_Text_CedricIntro: @ 8231F11 .string "Have you lost your bearings?\n" .string "Have no fear for I am here!$" -MtPyre_6F_Text_231F4A: @ 8231F4A +MtPyre_6F_Text_CedricDefeat: @ 8231F4A .string "Weren't you lost?$" -MtPyre_6F_Text_231F5C: @ 8231F5C +MtPyre_6F_Text_CedricPostBattle: @ 8231F5C .string "I had this feeling that a lost TRAINER\n" .string "would be panicked and easy to beat.\p" .string "It's dirty and I won't try it again…$" diff --git a/data/maps/MtPyre_Exterior/map.json b/data/maps/MtPyre_Exterior/map.json index c7653bbd1..2fbcd5673 100644 --- a/data/maps/MtPyre_Exterior/map.json +++ b/data/maps/MtPyre_Exterior/map.json @@ -72,7 +72,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "MtPyre_Exterior_EventScript_231FED" + "script": "MtPyre_Exterior_EventScript_FogTrigger" }, { "type": "trigger", @@ -81,7 +81,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "MtPyre_Exterior_EventScript_231FED" + "script": "MtPyre_Exterior_EventScript_FogTrigger" }, { "type": "trigger", @@ -90,7 +90,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "MtPyre_Exterior_EventScript_231FF2" + "script": "MtPyre_Exterior_EventScript_SunTrigger" }, { "type": "trigger", @@ -99,7 +99,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "MtPyre_Exterior_EventScript_231FF2" + "script": "MtPyre_Exterior_EventScript_SunTrigger" }, { "type": "trigger", @@ -108,7 +108,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "MtPyre_Exterior_EventScript_231FED" + "script": "MtPyre_Exterior_EventScript_FogTrigger" } ], "bg_events": [ diff --git a/data/maps/MtPyre_Exterior/scripts.inc b/data/maps/MtPyre_Exterior/scripts.inc index b66c50374..11d3f987c 100644 --- a/data/maps/MtPyre_Exterior/scripts.inc +++ b/data/maps/MtPyre_Exterior/scripts.inc @@ -3,25 +3,25 @@ MtPyre_Exterior_MapScripts:: @ 8231FCC .byte 0 MtPyre_Exterior_OnTransition: @ 8231FD2 - call MtPyre_Exterior_EventScript_231FD8 + call MtPyre_Exterior_EventScript_CheckEnterFromSummit end -MtPyre_Exterior_EventScript_231FD8:: @ 8231FD8 +MtPyre_Exterior_EventScript_CheckEnterFromSummit:: @ 8231FD8 getplayerxy VAR_TEMP_0, VAR_TEMP_1 compare VAR_TEMP_1, 12 - goto_if_lt MtPyre_Exterior_EventScript_231FE9 + goto_if_lt MtPyre_Exterior_EventScript_EnterFromSummit return -MtPyre_Exterior_EventScript_231FE9:: @ 8231FE9 +MtPyre_Exterior_EventScript_EnterFromSummit:: @ 8231FE9 setweather WEATHER_FOG_1 return -MtPyre_Exterior_EventScript_231FED:: @ 8231FED +MtPyre_Exterior_EventScript_FogTrigger:: @ 8231FED setweather WEATHER_FOG_1 doweather end -MtPyre_Exterior_EventScript_231FF2:: @ 8231FF2 +MtPyre_Exterior_EventScript_SunTrigger:: @ 8231FF2 setweather WEATHER_SUNNY doweather end