From ac7949a08d405282fbd16ef45ea694a19b91b967 Mon Sep 17 00:00:00 2001 From: Isaac Rivera Date: Tue, 26 Nov 2024 00:18:37 -0500 Subject: [PATCH] decaps, small script reworks, small ai change for 2 turn moves --- data/maps/JaggedPass/scripts.inc | 4 +- data/maps/JaggedPass/scripts.pory | 4 +- data/maps/MagmaHideout_4F/scripts.inc | 450 +++++++++--------- data/maps/MagmaHideout_4F/scripts.pory | 1 + .../MossdeepCity_StevensHouse/scripts.inc | 340 +++++++------ .../MossdeepCity_StevensHouse/scripts.pory | 29 +- data/maps/SeafloorCavern_Entrance/scripts.inc | 4 +- .../maps/SeafloorCavern_Entrance/scripts.pory | 4 +- data/maps/Underwater_Route128/map.json | 10 +- data/maps/Underwater_SootopolisCity/map.json | 14 +- data/text/match_call.inc | 4 +- src/battle_ai_main.c | 2 +- src/strings.c | 6 +- 13 files changed, 435 insertions(+), 437 deletions(-) diff --git a/data/maps/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc index 8eba2cb07cb0..0872ab162928 100644 --- a/data/maps/JaggedPass/scripts.inc +++ b/data/maps/JaggedPass/scripts.inc @@ -455,7 +455,7 @@ JaggedPass_Text_GruntDefeat: # 228 "data/maps/JaggedPass/scripts.pory" .string "Urrrgh…\p" # 229 "data/maps/JaggedPass/scripts.pory" - .string "I should've ducked into our HIDEOUT\n" + .string "I should've ducked into our Hideout\n" # 230 "data/maps/JaggedPass/scripts.pory" .string "right away…$" # 231 "data/maps/JaggedPass/scripts.pory" @@ -477,7 +477,7 @@ JaggedPass_Text_BoulderShakingInResponseToEmblem: # 239 "data/maps/JaggedPass/scripts.pory" .string "Oh! This boulder is shaking in response\n" # 240 "data/maps/JaggedPass/scripts.pory" - .string "to the MAGMA EMBLEM!$" + .string "to the Magma Emblem!$" # 241 "data/maps/JaggedPass/scripts.pory" # 242 "data/maps/JaggedPass/scripts.pory" diff --git a/data/maps/JaggedPass/scripts.pory b/data/maps/JaggedPass/scripts.pory index 7552e04b0280..a45dd322fbaf 100644 --- a/data/maps/JaggedPass/scripts.pory +++ b/data/maps/JaggedPass/scripts.pory @@ -226,7 +226,7 @@ JaggedPass_Text_GruntIntro: JaggedPass_Text_GruntDefeat: .string "Urrrgh…\p" - .string "I should've ducked into our HIDEOUT\n" + .string "I should've ducked into our Hideout\n" .string "right away…$" JaggedPass_Text_GoWhereverYouWant: @@ -237,7 +237,7 @@ JaggedPass_Text_GoWhereverYouWant: JaggedPass_Text_BoulderShakingInResponseToEmblem: .string "Oh! This boulder is shaking in response\n" - .string "to the MAGMA EMBLEM!$" + .string "to the Magma Emblem!$" JaggedPass_Text_AutumnIntro: .string "I climb this hill every day.\n" diff --git a/data/maps/MagmaHideout_4F/scripts.inc b/data/maps/MagmaHideout_4F/scripts.inc index 9e245c2cd4f0..593101015098 100644 --- a/data/maps/MagmaHideout_4F/scripts.inc +++ b/data/maps/MagmaHideout_4F/scripts.inc @@ -237,522 +237,524 @@ MagmaHideout_4F_EventScript_MaxieContinued:: # 119 "data/maps/MagmaHideout_4F/scripts.pory" setflag FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS # 120 "data/maps/MagmaHideout_4F/scripts.pory" - fadescreen FADE_FROM_BLACK + setflag FLAG_HIDE_SEAFLOOR_CAVERN_ENTRANCE_AQUA_GRUNT # 121 "data/maps/MagmaHideout_4F/scripts.pory" - releaseall + fadescreen FADE_FROM_BLACK # 122 "data/maps/MagmaHideout_4F/scripts.pory" - end + releaseall # 123 "data/maps/MagmaHideout_4F/scripts.pory" - + end # 124 "data/maps/MagmaHideout_4F/scripts.pory" -MagmaHideout_4F_Movement_GroudonApproach: + # 125 "data/maps/MagmaHideout_4F/scripts.pory" - delay_16 +MagmaHideout_4F_Movement_GroudonApproach: # 126 "data/maps/MagmaHideout_4F/scripts.pory" delay_16 # 127 "data/maps/MagmaHideout_4F/scripts.pory" - walk_slow_down -# 128 "data/maps/MagmaHideout_4F/scripts.pory" delay_16 +# 128 "data/maps/MagmaHideout_4F/scripts.pory" + walk_slow_down # 129 "data/maps/MagmaHideout_4F/scripts.pory" delay_16 # 130 "data/maps/MagmaHideout_4F/scripts.pory" delay_16 # 131 "data/maps/MagmaHideout_4F/scripts.pory" - step_end + delay_16 # 132 "data/maps/MagmaHideout_4F/scripts.pory" - + step_end # 133 "data/maps/MagmaHideout_4F/scripts.pory" -MagmaHideout_4F_Movement_GroudonExit: + # 134 "data/maps/MagmaHideout_4F/scripts.pory" - delay_16 +MagmaHideout_4F_Movement_GroudonExit: # 135 "data/maps/MagmaHideout_4F/scripts.pory" delay_16 # 136 "data/maps/MagmaHideout_4F/scripts.pory" - slide_up -# 137 "data/maps/MagmaHideout_4F/scripts.pory" delay_16 +# 137 "data/maps/MagmaHideout_4F/scripts.pory" + slide_up # 138 "data/maps/MagmaHideout_4F/scripts.pory" delay_16 # 139 "data/maps/MagmaHideout_4F/scripts.pory" delay_16 # 140 "data/maps/MagmaHideout_4F/scripts.pory" - step_end + delay_16 # 141 "data/maps/MagmaHideout_4F/scripts.pory" - + step_end # 142 "data/maps/MagmaHideout_4F/scripts.pory" -MagmaHideout_4F_EventScript_Grunt11:: + # 143 "data/maps/MagmaHideout_4F/scripts.pory" - msgbox MagmaHideout_4F_Text_GruntScared, MSGBOX_NPC +MagmaHideout_4F_EventScript_Grunt11:: # 144 "data/maps/MagmaHideout_4F/scripts.pory" - end + msgbox MagmaHideout_4F_Text_GruntScared, MSGBOX_NPC # 145 "data/maps/MagmaHideout_4F/scripts.pory" - + end # 146 "data/maps/MagmaHideout_4F/scripts.pory" -MagmaHideout_4F_EventScript_Grunt12:: + # 147 "data/maps/MagmaHideout_4F/scripts.pory" - msgbox MagmaHideout_4F_Text_GruntScared2, MSGBOX_NPC +MagmaHideout_4F_EventScript_Grunt12:: # 148 "data/maps/MagmaHideout_4F/scripts.pory" - end + msgbox MagmaHideout_4F_Text_GruntScared2, MSGBOX_NPC # 149 "data/maps/MagmaHideout_4F/scripts.pory" - + end # 150 "data/maps/MagmaHideout_4F/scripts.pory" -MagmaHideout_4F_EventScript_Grunt13:: + # 151 "data/maps/MagmaHideout_4F/scripts.pory" - msgbox MagmaHideout_4F_Text_GruntRightThing, MSGBOX_NPC +MagmaHideout_4F_EventScript_Grunt13:: # 152 "data/maps/MagmaHideout_4F/scripts.pory" - end + msgbox MagmaHideout_4F_Text_GruntRightThing, MSGBOX_NPC # 153 "data/maps/MagmaHideout_4F/scripts.pory" - + end # 154 "data/maps/MagmaHideout_4F/scripts.pory" -MagmaHideout_4F_EventScript_Tabitha:: + # 155 "data/maps/MagmaHideout_4F/scripts.pory" - msgbox MagmaHideout_4F_Text_NeverStopMaxie, MSGBOX_NPC +MagmaHideout_4F_EventScript_Tabitha:: # 156 "data/maps/MagmaHideout_4F/scripts.pory" - end + msgbox MagmaHideout_4F_Text_NeverStopMaxie, MSGBOX_NPC # 157 "data/maps/MagmaHideout_4F/scripts.pory" - + end # 158 "data/maps/MagmaHideout_4F/scripts.pory" -MagmaHideout_4F_Text_GruntScared: + # 159 "data/maps/MagmaHideout_4F/scripts.pory" - .string "I've had enough! I quit! I don't know\n" +MagmaHideout_4F_Text_GruntScared: # 160 "data/maps/MagmaHideout_4F/scripts.pory" - .string "what Maxie's doing back there, but he's\l" + .string "I've had enough! I quit! I don't know\n" # 161 "data/maps/MagmaHideout_4F/scripts.pory" - .string "going to bring this whole mountain down\l" + .string "what Maxie's doing back there, but he's\l" # 162 "data/maps/MagmaHideout_4F/scripts.pory" - .string "on top of us!$" + .string "going to bring this whole mountain down\l" # 163 "data/maps/MagmaHideout_4F/scripts.pory" - + .string "on top of us!$" # 164 "data/maps/MagmaHideout_4F/scripts.pory" -MagmaHideout_4F_Text_GruntScared2: + # 165 "data/maps/MagmaHideout_4F/scripts.pory" - .string "Hail Arceus, full of gra….$" +MagmaHideout_4F_Text_GruntScared2: # 166 "data/maps/MagmaHideout_4F/scripts.pory" - + .string "Hail Arceus, full of gra….$" # 167 "data/maps/MagmaHideout_4F/scripts.pory" -MagmaHideout_4F_Text_GruntRightThing: + # 168 "data/maps/MagmaHideout_4F/scripts.pory" - .string "I can't believe I lost to you again…$" +MagmaHideout_4F_Text_GruntRightThing: # 169 "data/maps/MagmaHideout_4F/scripts.pory" - + .string "I can't believe I lost to you again…$" # 170 "data/maps/MagmaHideout_4F/scripts.pory" -MagmaHideout_4F_Text_NeverStopMaxie: + # 171 "data/maps/MagmaHideout_4F/scripts.pory" - .string "You'll never stop Maxie now.\n" +MagmaHideout_4F_Text_NeverStopMaxie: # 172 "data/maps/MagmaHideout_4F/scripts.pory" - .string "Mwuahahahahahaha!$" + .string "You'll never stop Maxie now.\n" # 173 "data/maps/MagmaHideout_4F/scripts.pory" - + .string "Mwuahahahahahaha!$" # 174 "data/maps/MagmaHideout_4F/scripts.pory" -MagmaHideout_4F_Text_Grunt13Intro: + # 175 "data/maps/MagmaHideout_4F/scripts.pory" - .string "You're not finished yet!\n" +MagmaHideout_4F_Text_Grunt13Intro: # 176 "data/maps/MagmaHideout_4F/scripts.pory" - .string "You're not getting by me easily!$" + .string "You're not finished yet!\n" # 177 "data/maps/MagmaHideout_4F/scripts.pory" - + .string "You're not getting by me easily!$" # 178 "data/maps/MagmaHideout_4F/scripts.pory" -MagmaHideout_4F_Text_Grunt13Defeat: + # 179 "data/maps/MagmaHideout_4F/scripts.pory" - .string "I can't believe I lost to you again…$" +MagmaHideout_4F_Text_Grunt13Defeat: # 180 "data/maps/MagmaHideout_4F/scripts.pory" - + .string "I can't believe I lost to you again…$" # 181 "data/maps/MagmaHideout_4F/scripts.pory" -MagmaHideout_4F_Text_Grunt13PostBattle: + # 182 "data/maps/MagmaHideout_4F/scripts.pory" - .string "Courtney: {PLAYER} is weakened now,\n" +MagmaHideout_4F_Text_Grunt13PostBattle: # 183 "data/maps/MagmaHideout_4F/scripts.pory" - .string "finish them off, Tabitha.$" + .string "Courtney: {PLAYER} is weakened now,\n" # 184 "data/maps/MagmaHideout_4F/scripts.pory" - + .string "finish them off, Tabitha.$" # 185 "data/maps/MagmaHideout_4F/scripts.pory" -MagmaHideout_4F_Text_TabithaIntro: + # 186 "data/maps/MagmaHideout_4F/scripts.pory" - .string "Hehehe!\n" +MagmaHideout_4F_Text_TabithaIntro: # 187 "data/maps/MagmaHideout_4F/scripts.pory" - .string "You made it this far, so I'll tell you!\p" + .string "Hehehe!\n" # 188 "data/maps/MagmaHideout_4F/scripts.pory" - .string "That's right!\n" + .string "You made it this far, so I'll tell you!\p" # 189 "data/maps/MagmaHideout_4F/scripts.pory" - .string "Up ahead, GROUDON is sleeping!\p" + .string "That's right!\n" # 190 "data/maps/MagmaHideout_4F/scripts.pory" - .string "MAXIE went to GROUDON just seconds\n" + .string "Up ahead, GROUDON is sleeping!\p" # 191 "data/maps/MagmaHideout_4F/scripts.pory" - .string "ago!\p" + .string "MAXIE went to GROUDON just seconds\n" # 192 "data/maps/MagmaHideout_4F/scripts.pory" - .string "It's going to awaken real soon!\n" + .string "ago!\p" # 193 "data/maps/MagmaHideout_4F/scripts.pory" - .string "Hehe! Hehehe!$" + .string "It's going to awaken real soon!\n" # 194 "data/maps/MagmaHideout_4F/scripts.pory" - + .string "Hehe! Hehehe!$" # 195 "data/maps/MagmaHideout_4F/scripts.pory" -MagmaHideout_4F_Text_TabithaDefeat: + # 196 "data/maps/MagmaHideout_4F/scripts.pory" - .string "I may not have been able to defeat you,\n" +MagmaHideout_4F_Text_TabithaDefeat: # 197 "data/maps/MagmaHideout_4F/scripts.pory" - .string "but I bet I still accomplished the\l" + .string "I may not have been able to defeat you,\n" # 198 "data/maps/MagmaHideout_4F/scripts.pory" - .string "mission…$" + .string "but I bet I still accomplished the\l" # 199 "data/maps/MagmaHideout_4F/scripts.pory" - + .string "mission…$" # 200 "data/maps/MagmaHideout_4F/scripts.pory" -MagmaHideout_4F_Text_TabithaPostBattle: + # 201 "data/maps/MagmaHideout_4F/scripts.pory" - .string "…And while you wasted time with me,\n" +MagmaHideout_4F_Text_TabithaPostBattle: # 202 "data/maps/MagmaHideout_4F/scripts.pory" - .string "MAXIE should have awakened GROUDON…$" + .string "…And while you wasted time with me,\n" # 203 "data/maps/MagmaHideout_4F/scripts.pory" - + .string "MAXIE should have awakened GROUDON…$" # 204 "data/maps/MagmaHideout_4F/scripts.pory" -MagmaHideout_4F_Text_MaxieAwakenGroudon: + # 205 "data/maps/MagmaHideout_4F/scripts.pory" - .string "Groudon…\p" +MagmaHideout_4F_Text_MaxieAwakenGroudon: # 206 "data/maps/MagmaHideout_4F/scripts.pory" - .string "Nothing could awaken you from your\n" + .string "Groudon…\p" # 207 "data/maps/MagmaHideout_4F/scripts.pory" - .string "sleep bathed in magma…\p" + .string "Nothing could awaken you from your\n" # 208 "data/maps/MagmaHideout_4F/scripts.pory" - .string "This Red Orb though… This will awaken\n" + .string "sleep bathed in magma…\p" # 209 "data/maps/MagmaHideout_4F/scripts.pory" - .string "your Primal powers, won't it?\p" + .string "This Red Orb though… This will awaken\n" # 210 "data/maps/MagmaHideout_4F/scripts.pory" - .string "I have brought you the Red Orb.\n" + .string "your Primal powers, won't it?\p" # 211 "data/maps/MagmaHideout_4F/scripts.pory" - .string "Let its shine awaken you!\p" + .string "I have brought you the Red Orb.\n" # 212 "data/maps/MagmaHideout_4F/scripts.pory" - .string "And finally…\n" + .string "Let its shine awaken you!\p" # 213 "data/maps/MagmaHideout_4F/scripts.pory" - .string "You will be mine!$" + .string "And finally…\n" # 214 "data/maps/MagmaHideout_4F/scripts.pory" - + .string "You will be mine!$" # 215 "data/maps/MagmaHideout_4F/scripts.pory" -MagmaHideout_4F_Text_MaxieMasterBall: + # 216 "data/maps/MagmaHideout_4F/scripts.pory" - .string "Master Ball, go!$" +MagmaHideout_4F_Text_MaxieMasterBall: # 217 "data/maps/MagmaHideout_4F/scripts.pory" - + .string "Master Ball, go!$" # 218 "data/maps/MagmaHideout_4F/scripts.pory" -MagmaHideout_4F_Text_MaxieCaputredGroudon: + # 219 "data/maps/MagmaHideout_4F/scripts.pory" - .string "YES! Groudon is mine! And with this Red\n" +MagmaHideout_4F_Text_MaxieCaputredGroudon: # 220 "data/maps/MagmaHideout_4F/scripts.pory" - .string "Orb to unleash its Primal powers, there\l" + .string "YES! Groudon is mine! And with this Red\n" # 221 "data/maps/MagmaHideout_4F/scripts.pory" - .string "is no one that can stop me…$" + .string "Orb to unleash its Primal powers, there\l" # 222 "data/maps/MagmaHideout_4F/scripts.pory" - + .string "is no one that can stop me…$" # 223 "data/maps/MagmaHideout_4F/scripts.pory" -MagmaHideout_4F_Text_NotEvenYou: + # 224 "data/maps/MagmaHideout_4F/scripts.pory" - .string "Not even you, {PLAYER}. Prepare to\n" +MagmaHideout_4F_Text_NotEvenYou: # 225 "data/maps/MagmaHideout_4F/scripts.pory" - .string "become the first witness of the\l" + .string "Not even you, {PLAYER}. Prepare to\n" # 226 "data/maps/MagmaHideout_4F/scripts.pory" - .string "terrible power of Primal Groudon!$" + .string "become the first witness of the\l" # 227 "data/maps/MagmaHideout_4F/scripts.pory" - + .string "terrible power of Primal Groudon!$" # 228 "data/maps/MagmaHideout_4F/scripts.pory" -MagmaHideout_4F_Text_MaxieGroudonWhatsWrong: + # 229 "data/maps/MagmaHideout_4F/scripts.pory" - .string "Maxie: GROUDON!\n" +MagmaHideout_4F_Text_MaxieGroudonWhatsWrong: # 230 "data/maps/MagmaHideout_4F/scripts.pory" - .string "What's wrong?\p" + .string "Maxie: GROUDON!\n" # 231 "data/maps/MagmaHideout_4F/scripts.pory" - .string "Wasn't the BLUE ORB the key?\p" + .string "What's wrong?\p" # 232 "data/maps/MagmaHideout_4F/scripts.pory" - .string "GROUDON!\n" + .string "Wasn't the BLUE ORB the key?\p" # 233 "data/maps/MagmaHideout_4F/scripts.pory" - .string "Where have you gone…$" + .string "GROUDON!\n" # 234 "data/maps/MagmaHideout_4F/scripts.pory" - + .string "Where have you gone…$" # 235 "data/maps/MagmaHideout_4F/scripts.pory" -MagmaHideout_4F_Text_MaxieOhItWasYou: + # 236 "data/maps/MagmaHideout_4F/scripts.pory" - .string "Maxie: Oh, so it was you?\p" +MagmaHideout_4F_Text_MaxieOhItWasYou: # 237 "data/maps/MagmaHideout_4F/scripts.pory" - .string "I've seen you poking around uninvited\n" + .string "Maxie: Oh, so it was you?\p" # 238 "data/maps/MagmaHideout_4F/scripts.pory" - .string "here and there…\p" + .string "I've seen you poking around uninvited\n" # 239 "data/maps/MagmaHideout_4F/scripts.pory" - .string "I get it now!\n" + .string "here and there…\p" # 240 "data/maps/MagmaHideout_4F/scripts.pory" - .string "You must have pulled a cheap stunt!$" + .string "I get it now!\n" # 241 "data/maps/MagmaHideout_4F/scripts.pory" - + .string "You must have pulled a cheap stunt!$" # 242 "data/maps/MagmaHideout_4F/scripts.pory" -MagmaHideout_4F_Text_MaxieDefeat: + # 243 "data/maps/MagmaHideout_4F/scripts.pory" - .string "NO! No, no, no, no, NO!$" +MagmaHideout_4F_Text_MaxieDefeat: # 244 "data/maps/MagmaHideout_4F/scripts.pory" - + .string "NO! No, no, no, no, NO!$" # 245 "data/maps/MagmaHideout_4F/scripts.pory" -MagmaHideout_4F_Text_MaxieImGoingAfterGroudon: + # 246 "data/maps/MagmaHideout_4F/scripts.pory" - .string "What?! Groudon escaped my Master Ball?\n" +MagmaHideout_4F_Text_MaxieImGoingAfterGroudon: # 247 "data/maps/MagmaHideout_4F/scripts.pory" - .string "That's impossible! Perhaps its power\l" + .string "What?! Groudon escaped my Master Ball?\n" # 248 "data/maps/MagmaHideout_4F/scripts.pory" - .string "cannot be contained after all…\p" + .string "That's impossible! Perhaps its power\l" # 249 "data/maps/MagmaHideout_4F/scripts.pory" - .string "… … … … … …\p" + .string "cannot be contained after all…\p" # 250 "data/maps/MagmaHideout_4F/scripts.pory" - .string "Does this mean Groudon will start to\n" + .string "… … … … … …\p" # 251 "data/maps/MagmaHideout_4F/scripts.pory" - .string "rampage out of control?\p" + .string "Does this mean Groudon will start to\n" # 252 "data/maps/MagmaHideout_4F/scripts.pory" - .string "… … … … … …\p" + .string "rampage out of control?\p" # 253 "data/maps/MagmaHideout_4F/scripts.pory" - .string "This wasn't a part of my plan…\p" + .string "… … … … … …\p" # 254 "data/maps/MagmaHideout_4F/scripts.pory" - .string "I never intended for things to go this\n" + .string "This wasn't a part of my plan…\p" # 255 "data/maps/MagmaHideout_4F/scripts.pory" - .string "way, I wanted to be in full control of\l" + .string "I never intended for things to go this\n" # 256 "data/maps/MagmaHideout_4F/scripts.pory" - .string "Groudon to reshape the Earth, but now…\p" + .string "way, I wanted to be in full control of\l" # 257 "data/maps/MagmaHideout_4F/scripts.pory" - .string "I have to go, I fear I may have made a\n" + .string "Groudon to reshape the Earth, but now…\p" # 258 "data/maps/MagmaHideout_4F/scripts.pory" + .string "I have to go, I fear I may have made a\n" +# 259 "data/maps/MagmaHideout_4F/scripts.pory" .string "grave mistake.$" MagmaHideout_EventScript_MaxieTrigger1:: -# 262 "data/maps/MagmaHideout_4F/scripts.pory" - lockall # 263 "data/maps/MagmaHideout_4F/scripts.pory" - playbgm MUS_ENCOUNTER_MAGMA, FALSE + lockall # 264 "data/maps/MagmaHideout_4F/scripts.pory" - applymovement OBJ_EVENT_ID_PLAYER, ApproachMaxie1 + playbgm MUS_ENCOUNTER_MAGMA, FALSE # 265 "data/maps/MagmaHideout_4F/scripts.pory" - waitmovement 0 + applymovement OBJ_EVENT_ID_PLAYER, ApproachMaxie1 # 266 "data/maps/MagmaHideout_4F/scripts.pory" + waitmovement 0 +# 267 "data/maps/MagmaHideout_4F/scripts.pory" goto MagmaHideout_4F_EventScript_Maxie end MagmaHideout_EventScript_MaxieTrigger2:: -# 270 "data/maps/MagmaHideout_4F/scripts.pory" - lockall # 271 "data/maps/MagmaHideout_4F/scripts.pory" - playbgm MUS_ENCOUNTER_MAGMA, FALSE + lockall # 272 "data/maps/MagmaHideout_4F/scripts.pory" - applymovement OBJ_EVENT_ID_PLAYER, ApproachMaxie2 + playbgm MUS_ENCOUNTER_MAGMA, FALSE # 273 "data/maps/MagmaHideout_4F/scripts.pory" - waitmovement 0 + applymovement OBJ_EVENT_ID_PLAYER, ApproachMaxie2 # 274 "data/maps/MagmaHideout_4F/scripts.pory" + waitmovement 0 +# 275 "data/maps/MagmaHideout_4F/scripts.pory" goto MagmaHideout_4F_EventScript_Maxie end ApproachMaxie1:: -# 279 "data/maps/MagmaHideout_4F/scripts.pory" - walk_right # 280 "data/maps/MagmaHideout_4F/scripts.pory" walk_right # 281 "data/maps/MagmaHideout_4F/scripts.pory" + walk_right +# 282 "data/maps/MagmaHideout_4F/scripts.pory" step_end return ApproachMaxie2:: -# 284 "data/maps/MagmaHideout_4F/scripts.pory" - walk_right # 285 "data/maps/MagmaHideout_4F/scripts.pory" - walk_up -# 286 "data/maps/MagmaHideout_4F/scripts.pory" walk_right +# 286 "data/maps/MagmaHideout_4F/scripts.pory" + walk_up # 287 "data/maps/MagmaHideout_4F/scripts.pory" + walk_right +# 288 "data/maps/MagmaHideout_4F/scripts.pory" step_end return MagmaHideout_EventScript_BackToBackTrigger:: -# 291 "data/maps/MagmaHideout_4F/scripts.pory" +# 292 "data/maps/MagmaHideout_4F/scripts.pory" goto MagmaHideout_EventScript_BackToBackScene end MagmaHideout_EventScript_BackToBackScene:: -# 296 "data/maps/MagmaHideout_4F/scripts.pory" - lockall # 297 "data/maps/MagmaHideout_4F/scripts.pory" - playbgm MUS_ENCOUNTER_MAGMA, FALSE + lockall # 298 "data/maps/MagmaHideout_4F/scripts.pory" - applymovement OBJ_EVENT_ID_PLAYER, MagmaHideout_LookAtTabitha + playbgm MUS_ENCOUNTER_MAGMA, FALSE # 299 "data/maps/MagmaHideout_4F/scripts.pory" - waitmovement 0 + applymovement OBJ_EVENT_ID_PLAYER, MagmaHideout_LookAtTabitha # 300 "data/maps/MagmaHideout_4F/scripts.pory" - applymovement LOCALID_TABITHA, Common_Movement_WalkInPlaceFasterDown -# 301 "data/maps/MagmaHideout_4F/scripts.pory" waitmovement 0 +# 301 "data/maps/MagmaHideout_4F/scripts.pory" + applymovement LOCALID_TABITHA, Common_Movement_WalkInPlaceFasterDown # 302 "data/maps/MagmaHideout_4F/scripts.pory" - msgbox DelayForMaxie + waitmovement 0 # 303 "data/maps/MagmaHideout_4F/scripts.pory" - waitmessage + msgbox DelayForMaxie # 304 "data/maps/MagmaHideout_4F/scripts.pory" - playse SE_PIN + waitmessage # 305 "data/maps/MagmaHideout_4F/scripts.pory" playse SE_PIN # 306 "data/maps/MagmaHideout_4F/scripts.pory" - applymovement LOCALID_TABITHA, Common_Movement_ExclamationMark + playse SE_PIN # 307 "data/maps/MagmaHideout_4F/scripts.pory" - applymovement LOCAL_ID_COURTNEY, Common_Movement_ExclamationMark + applymovement LOCALID_TABITHA, Common_Movement_ExclamationMark # 308 "data/maps/MagmaHideout_4F/scripts.pory" - waitmovement 0 + applymovement LOCAL_ID_COURTNEY, Common_Movement_ExclamationMark # 309 "data/maps/MagmaHideout_4F/scripts.pory" - applymovement LOCALID_TABITHA, Common_Movement_WalkInPlaceFasterRight + waitmovement 0 # 310 "data/maps/MagmaHideout_4F/scripts.pory" - applymovement LOCAL_ID_COURTNEY, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_TABITHA, Common_Movement_WalkInPlaceFasterRight # 311 "data/maps/MagmaHideout_4F/scripts.pory" - waitmovement 0 + applymovement LOCAL_ID_COURTNEY, Common_Movement_WalkInPlaceFasterRight # 312 "data/maps/MagmaHideout_4F/scripts.pory" - applymovement LOCALID_TABITHA, Common_Movement_WalkInPlaceFasterRight -# 313 "data/maps/MagmaHideout_4F/scripts.pory" waitmovement 0 +# 313 "data/maps/MagmaHideout_4F/scripts.pory" + applymovement LOCALID_TABITHA, Common_Movement_WalkInPlaceFasterRight # 314 "data/maps/MagmaHideout_4F/scripts.pory" - msgbox GetThem + waitmovement 0 # 315 "data/maps/MagmaHideout_4F/scripts.pory" - waitmessage + msgbox GetThem # 316 "data/maps/MagmaHideout_4F/scripts.pory" - applymovement LOCAL_ID_COURTNEY, Common_Movement_WalkInPlaceFasterRight + waitmessage # 317 "data/maps/MagmaHideout_4F/scripts.pory" - msgbox YesSir + applymovement LOCAL_ID_COURTNEY, Common_Movement_WalkInPlaceFasterRight # 318 "data/maps/MagmaHideout_4F/scripts.pory" - waitmessage + msgbox YesSir # 319 "data/maps/MagmaHideout_4F/scripts.pory" - applymovement LOCAL_ID_COURTNEY, MagmaHideout_Movement_BackToBackGruntApproachPlayer + waitmessage # 320 "data/maps/MagmaHideout_4F/scripts.pory" - waitmovement 0 + applymovement LOCAL_ID_COURTNEY, MagmaHideout_Movement_BackToBackGruntApproachPlayer # 321 "data/maps/MagmaHideout_4F/scripts.pory" - applymovement OBJ_EVENT_ID_PLAYER, MagmaHideout_LookAtGrunt -# 322 "data/maps/MagmaHideout_4F/scripts.pory" waitmovement 0 +# 322 "data/maps/MagmaHideout_4F/scripts.pory" + applymovement OBJ_EVENT_ID_PLAYER, MagmaHideout_LookAtGrunt # 323 "data/maps/MagmaHideout_4F/scripts.pory" - trainerbattle_no_intro TRAINER_COURTNEY, MagmaHideout_4F_Text_Grunt13Defeat + waitmovement 0 # 324 "data/maps/MagmaHideout_4F/scripts.pory" - msgbox MagmaHideout_4F_Text_Grunt13PostBattle, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_COURTNEY, MagmaHideout_4F_Text_Grunt13Defeat # 325 "data/maps/MagmaHideout_4F/scripts.pory" - closemessage + msgbox MagmaHideout_4F_Text_Grunt13PostBattle, MSGBOX_DEFAULT # 326 "data/maps/MagmaHideout_4F/scripts.pory" - applymovement LOCAL_ID_COURTNEY, GruntLost + closemessage # 327 "data/maps/MagmaHideout_4F/scripts.pory" - waitmovement 0 + applymovement LOCAL_ID_COURTNEY, GruntLost # 328 "data/maps/MagmaHideout_4F/scripts.pory" - copyobjectxytoperm LOCAL_ID_COURTNEY + waitmovement 0 # 329 "data/maps/MagmaHideout_4F/scripts.pory" - playbgm MUS_ENCOUNTER_MAGMA, FALSE + copyobjectxytoperm LOCAL_ID_COURTNEY # 330 "data/maps/MagmaHideout_4F/scripts.pory" - applymovement LOCALID_TABITHA, MagmaHideout_Movement_BackToBackTabithaApproachPlayer + playbgm MUS_ENCOUNTER_MAGMA, FALSE # 331 "data/maps/MagmaHideout_4F/scripts.pory" - waitmovement 0 + applymovement LOCALID_TABITHA, MagmaHideout_Movement_BackToBackTabithaApproachPlayer # 332 "data/maps/MagmaHideout_4F/scripts.pory" - applymovement OBJ_EVENT_ID_PLAYER, MagmaHideout_LookAtTabitha -# 333 "data/maps/MagmaHideout_4F/scripts.pory" waitmovement 0 +# 333 "data/maps/MagmaHideout_4F/scripts.pory" + applymovement OBJ_EVENT_ID_PLAYER, MagmaHideout_LookAtTabitha # 334 "data/maps/MagmaHideout_4F/scripts.pory" - msgbox DealWithYouMyself, MSGBOX_DEFAULT + waitmovement 0 # 335 "data/maps/MagmaHideout_4F/scripts.pory" - trainerbattle_no_intro TRAINER_TABITHA_MAGMA_HIDEOUT, MagmaHideout_4F_Text_TabithaDefeat + msgbox DealWithYouMyself, MSGBOX_DEFAULT # 336 "data/maps/MagmaHideout_4F/scripts.pory" - msgbox ThinkWeDidOurJobs, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_TABITHA_MAGMA_HIDEOUT, MagmaHideout_4F_Text_TabithaDefeat # 337 "data/maps/MagmaHideout_4F/scripts.pory" - closemessage + msgbox ThinkWeDidOurJobs, MSGBOX_DEFAULT # 338 "data/maps/MagmaHideout_4F/scripts.pory" - fadenewbgm MUS_AQUA_MAGMA_HIDEOUT + closemessage # 339 "data/maps/MagmaHideout_4F/scripts.pory" - applymovement LOCALID_TABITHA, TabithaLost + fadenewbgm MUS_AQUA_MAGMA_HIDEOUT # 340 "data/maps/MagmaHideout_4F/scripts.pory" - waitmovement 0 + applymovement LOCALID_TABITHA, TabithaLost # 341 "data/maps/MagmaHideout_4F/scripts.pory" - copyobjectxytoperm LOCALID_TABITHA + waitmovement 0 # 342 "data/maps/MagmaHideout_4F/scripts.pory" - setobjectmovementtype LOCALID_TABITHA, MOVEMENT_TYPE_FACE_RIGHT + copyobjectxytoperm LOCALID_TABITHA # 343 "data/maps/MagmaHideout_4F/scripts.pory" - setvar VAR_BEAT_MAGMA_BACK_TO_BACK, 1 + setobjectmovementtype LOCALID_TABITHA, MOVEMENT_TYPE_FACE_RIGHT # 344 "data/maps/MagmaHideout_4F/scripts.pory" + setvar VAR_BEAT_MAGMA_BACK_TO_BACK, 1 +# 345 "data/maps/MagmaHideout_4F/scripts.pory" releaseall end MagmaHideout_Movement_BackToBackGruntApproachPlayer:: -# 349 "data/maps/MagmaHideout_4F/scripts.pory" - walk_right # 350 "data/maps/MagmaHideout_4F/scripts.pory" walk_right # 351 "data/maps/MagmaHideout_4F/scripts.pory" - face_up + walk_right # 352 "data/maps/MagmaHideout_4F/scripts.pory" + face_up +# 353 "data/maps/MagmaHideout_4F/scripts.pory" step_end return MagmaHideout_LookAtGrunt:: -# 356 "data/maps/MagmaHideout_4F/scripts.pory" - face_down # 357 "data/maps/MagmaHideout_4F/scripts.pory" + face_down +# 358 "data/maps/MagmaHideout_4F/scripts.pory" step_end return MagmaHideout_Movement_BackToBackTabithaApproachPlayer:: -# 361 "data/maps/MagmaHideout_4F/scripts.pory" - walk_right # 362 "data/maps/MagmaHideout_4F/scripts.pory" + walk_right +# 363 "data/maps/MagmaHideout_4F/scripts.pory" step_end return MagmaHideout_LookAtTabitha:: -# 366 "data/maps/MagmaHideout_4F/scripts.pory" - face_left # 367 "data/maps/MagmaHideout_4F/scripts.pory" + face_left +# 368 "data/maps/MagmaHideout_4F/scripts.pory" step_end return GruntLost:: -# 371 "data/maps/MagmaHideout_4F/scripts.pory" - lock_facing_direction # 372 "data/maps/MagmaHideout_4F/scripts.pory" - walk_down + lock_facing_direction # 373 "data/maps/MagmaHideout_4F/scripts.pory" - unlock_facing_direction + walk_down # 374 "data/maps/MagmaHideout_4F/scripts.pory" + unlock_facing_direction +# 375 "data/maps/MagmaHideout_4F/scripts.pory" step_end return TabithaLost:: -# 378 "data/maps/MagmaHideout_4F/scripts.pory" - lock_facing_direction # 379 "data/maps/MagmaHideout_4F/scripts.pory" - walk_left + lock_facing_direction # 380 "data/maps/MagmaHideout_4F/scripts.pory" - unlock_facing_direction + walk_left # 381 "data/maps/MagmaHideout_4F/scripts.pory" + unlock_facing_direction +# 382 "data/maps/MagmaHideout_4F/scripts.pory" step_end return SetMagmaAdminsPermLoc:: -# 417 "data/maps/MagmaHideout_4F/scripts.pory" - setobjectxyperm LOCAL_ID_COURTNEY, 38, 24 # 418 "data/maps/MagmaHideout_4F/scripts.pory" - setobjectxyperm LOCALID_TABITHA, 36, 22 + setobjectxyperm LOCAL_ID_COURTNEY, 38, 24 # 419 "data/maps/MagmaHideout_4F/scripts.pory" + setobjectxyperm LOCALID_TABITHA, 36, 22 +# 420 "data/maps/MagmaHideout_4F/scripts.pory" setobjectmovementtype LOCALID_TABITHA, MOVEMENT_TYPE_FACE_RIGHT return AddSleepingGroudon:: -# 423 "data/maps/MagmaHideout_4F/scripts.pory" - clearflag FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_ASLEEP # 424 "data/maps/MagmaHideout_4F/scripts.pory" + clearflag FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_ASLEEP +# 425 "data/maps/MagmaHideout_4F/scripts.pory" addobject LOCALID_GROUDON_SLEEPING return DelayForMaxie:: -# 384 "data/maps/MagmaHideout_4F/scripts.pory" +# 385 "data/maps/MagmaHideout_4F/scripts.pory" .string "Tabitha: Listen up, Courtney! We have\n" .string "to do everything we can to stall\l" .string "that brat!\p" @@ -762,23 +764,23 @@ DelayForMaxie:: .string "time for Maxie to capture Groudon!$" GetThem:: -# 394 "data/maps/MagmaHideout_4F/scripts.pory" +# 395 "data/maps/MagmaHideout_4F/scripts.pory" .string "Tabitha: It's {PLAYER}! Don't just\n" .string "stand there, get them!$" YesSir:: -# 399 "data/maps/MagmaHideout_4F/scripts.pory" +# 400 "data/maps/MagmaHideout_4F/scripts.pory" .string "Courtney: You're not my boss anymore,\n" .string "Tabitha. We're equals.\p" .string "But I'll pummel this brat as revenge for\n" .string "Mt. Chimney!$" DealWithYouMyself:: -# 406 "data/maps/MagmaHideout_4F/scripts.pory" +# 407 "data/maps/MagmaHideout_4F/scripts.pory" .string "Tabitha: Looks like I get to deal the\n" .string "final blow myself!$" ThinkWeDidOurJobs:: -# 411 "data/maps/MagmaHideout_4F/scripts.pory" +# 412 "data/maps/MagmaHideout_4F/scripts.pory" .string "Something tells me we did our jobs… Do\n" .string "you feel that aura of power in the air?$" diff --git a/data/maps/MagmaHideout_4F/scripts.pory b/data/maps/MagmaHideout_4F/scripts.pory index b6feeda00912..85c245038adf 100644 --- a/data/maps/MagmaHideout_4F/scripts.pory +++ b/data/maps/MagmaHideout_4F/scripts.pory @@ -117,6 +117,7 @@ MagmaHideout_4F_EventScript_MaxieContinued:: removeobject LOCAL_ID_COURTNEY removeobject LOCALID_TABITHA setflag FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS + setflag FLAG_HIDE_SEAFLOOR_CAVERN_ENTRANCE_AQUA_GRUNT fadescreen FADE_FROM_BLACK releaseall end diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc index 8ed04f3562a8..6c4fc1612bd6 100644 --- a/data/maps/MossdeepCity_StevensHouse/scripts.inc +++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc @@ -103,17 +103,17 @@ MossdeepCity_StevensHouse_EventScript_StevenGivesDive:: # 52 "data/maps/MossdeepCity_StevensHouse/scripts.pory" setflag FLAG_HIDE_MOSSDEEP_CITY_SCOTT # 53 "data/maps/MossdeepCity_StevensHouse/scripts.pory" - setflag FLAG_HIDE_SEAFLOOR_CAVERN_ENTRANCE_AQUA_GRUNT -# 54 "data/maps/MossdeepCity_StevensHouse/scripts.pory" setvar VAR_STEVENS_HOUSE_STATE, 2 -# 55 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 54 "data/maps/MossdeepCity_StevensHouse/scripts.pory" releaseall -# 56 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 55 "data/maps/MossdeepCity_StevensHouse/scripts.pory" end -# 57 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 56 "data/maps/MossdeepCity_StevensHouse/scripts.pory" -# 58 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 57 "data/maps/MossdeepCity_StevensHouse/scripts.pory" MossdeepCity_StevensHouse_Movement_StevenApproachPlayer: +# 58 "data/maps/MossdeepCity_StevensHouse/scripts.pory" + walk_left # 59 "data/maps/MossdeepCity_StevensHouse/scripts.pory" walk_left # 60 "data/maps/MossdeepCity_StevensHouse/scripts.pory" @@ -125,334 +125,332 @@ MossdeepCity_StevensHouse_Movement_StevenApproachPlayer: # 63 "data/maps/MossdeepCity_StevensHouse/scripts.pory" walk_left # 64 "data/maps/MossdeepCity_StevensHouse/scripts.pory" - walk_left -# 65 "data/maps/MossdeepCity_StevensHouse/scripts.pory" walk_in_place_faster_down -# 66 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 65 "data/maps/MossdeepCity_StevensHouse/scripts.pory" step_end -# 67 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 66 "data/maps/MossdeepCity_StevensHouse/scripts.pory" -# 68 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 67 "data/maps/MossdeepCity_StevensHouse/scripts.pory" MossdeepCity_StevensHouse_Movement_StevenReturn: -# 69 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 68 "data/maps/MossdeepCity_StevensHouse/scripts.pory" walk_up +# 69 "data/maps/MossdeepCity_StevensHouse/scripts.pory" + walk_right # 70 "data/maps/MossdeepCity_StevensHouse/scripts.pory" walk_right # 71 "data/maps/MossdeepCity_StevensHouse/scripts.pory" walk_right # 72 "data/maps/MossdeepCity_StevensHouse/scripts.pory" - walk_right -# 73 "data/maps/MossdeepCity_StevensHouse/scripts.pory" walk_in_place_faster_up -# 74 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 73 "data/maps/MossdeepCity_StevensHouse/scripts.pory" step_end -# 75 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 74 "data/maps/MossdeepCity_StevensHouse/scripts.pory" -# 76 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 75 "data/maps/MossdeepCity_StevensHouse/scripts.pory" MossdeepCity_StevensHouse_EventScript_BeldumPokeball:: -# 77 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 76 "data/maps/MossdeepCity_StevensHouse/scripts.pory" lockall -# 78 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 77 "data/maps/MossdeepCity_StevensHouse/scripts.pory" msgbox MossdeepCity_StevensHouse_Text_TakeBallContainingBeldum, MSGBOX_YESNO -# 79 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 78 "data/maps/MossdeepCity_StevensHouse/scripts.pory" goto_if_eq VAR_RESULT, NO, MossdeepCity_StevensHouse_EventScript_LeaveBeldum -# 80 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 79 "data/maps/MossdeepCity_StevensHouse/scripts.pory" goto MossdeepCity_StevensHouse_EventScript_GiveBeldum -# 81 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 80 "data/maps/MossdeepCity_StevensHouse/scripts.pory" end -# 82 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 81 "data/maps/MossdeepCity_StevensHouse/scripts.pory" -# 83 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 82 "data/maps/MossdeepCity_StevensHouse/scripts.pory" MossdeepCity_StevensHouse_EventScript_LeaveBeldum:: -# 84 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 83 "data/maps/MossdeepCity_StevensHouse/scripts.pory" msgbox MossdeepCity_StevensHouse_Text_LeftPokeBallWhereItWas, MSGBOX_DEFAULT -# 85 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 84 "data/maps/MossdeepCity_StevensHouse/scripts.pory" releaseall -# 86 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 85 "data/maps/MossdeepCity_StevensHouse/scripts.pory" end -# 87 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 86 "data/maps/MossdeepCity_StevensHouse/scripts.pory" -# 88 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 87 "data/maps/MossdeepCity_StevensHouse/scripts.pory" MossdeepCity_StevensHouse_EventScript_GiveBeldum:: -# 89 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 88 "data/maps/MossdeepCity_StevensHouse/scripts.pory" setvar VAR_TEMP_TRANSFERRED_SPECIES, SPECIES_BELDUM -# 90 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 89 "data/maps/MossdeepCity_StevensHouse/scripts.pory" givemonrandom SPECIES_BELDUM, 5 -# 91 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 90 "data/maps/MossdeepCity_StevensHouse/scripts.pory" goto_if_eq VAR_RESULT, MON_GIVEN_TO_PARTY, MossdeepCity_StevensHouse_EventScript_SendBeldumParty -# 92 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 91 "data/maps/MossdeepCity_StevensHouse/scripts.pory" goto_if_eq VAR_RESULT, MON_GIVEN_TO_PC, MossdeepCity_StevensHouse_EventScript_SendBeldumPC -# 93 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 92 "data/maps/MossdeepCity_StevensHouse/scripts.pory" goto Common_EventScript_NoMoreRoomForPokemon -# 94 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 93 "data/maps/MossdeepCity_StevensHouse/scripts.pory" end -# 95 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 94 "data/maps/MossdeepCity_StevensHouse/scripts.pory" -# 96 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 95 "data/maps/MossdeepCity_StevensHouse/scripts.pory" MossdeepCity_StevensHouse_EventScript_SendBeldumParty:: -# 97 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 96 "data/maps/MossdeepCity_StevensHouse/scripts.pory" call MossdeepCity_StevensHouse_EventScript_ReceivedBeldumFanfare -# 98 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 97 "data/maps/MossdeepCity_StevensHouse/scripts.pory" msgbox gText_NicknameThisPokemon, MSGBOX_YESNO -# 99 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 98 "data/maps/MossdeepCity_StevensHouse/scripts.pory" goto_if_eq VAR_RESULT, NO, MossdeepCity_StevensHouse_EventScript_ReceivedBeldum -# 100 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 99 "data/maps/MossdeepCity_StevensHouse/scripts.pory" call Common_EventScript_GetGiftMonPartySlot -# 101 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 100 "data/maps/MossdeepCity_StevensHouse/scripts.pory" call Common_EventScript_NameReceivedPartyMon -# 102 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 101 "data/maps/MossdeepCity_StevensHouse/scripts.pory" goto MossdeepCity_StevensHouse_EventScript_ReceivedBeldum -# 103 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 102 "data/maps/MossdeepCity_StevensHouse/scripts.pory" end -# 104 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 103 "data/maps/MossdeepCity_StevensHouse/scripts.pory" -# 105 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 104 "data/maps/MossdeepCity_StevensHouse/scripts.pory" MossdeepCity_StevensHouse_EventScript_SendBeldumPC:: -# 106 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 105 "data/maps/MossdeepCity_StevensHouse/scripts.pory" call MossdeepCity_StevensHouse_EventScript_ReceivedBeldumFanfare -# 107 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 106 "data/maps/MossdeepCity_StevensHouse/scripts.pory" msgbox gText_NicknameThisPokemon, MSGBOX_YESNO -# 108 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 107 "data/maps/MossdeepCity_StevensHouse/scripts.pory" goto_if_eq VAR_RESULT, NO, MossdeepCity_StevensHouse_EventScript_BeldumTransferredToPC -# 109 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 108 "data/maps/MossdeepCity_StevensHouse/scripts.pory" call Common_EventScript_NameReceivedBoxMon -# 110 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 109 "data/maps/MossdeepCity_StevensHouse/scripts.pory" goto MossdeepCity_StevensHouse_EventScript_BeldumTransferredToPC -# 111 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 110 "data/maps/MossdeepCity_StevensHouse/scripts.pory" end -# 112 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 111 "data/maps/MossdeepCity_StevensHouse/scripts.pory" -# 113 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 112 "data/maps/MossdeepCity_StevensHouse/scripts.pory" MossdeepCity_StevensHouse_EventScript_BeldumTransferredToPC:: -# 114 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 113 "data/maps/MossdeepCity_StevensHouse/scripts.pory" call Common_EventScript_TransferredToPC -# 115 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 114 "data/maps/MossdeepCity_StevensHouse/scripts.pory" goto MossdeepCity_StevensHouse_EventScript_ReceivedBeldum -# 116 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 115 "data/maps/MossdeepCity_StevensHouse/scripts.pory" end -# 117 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 116 "data/maps/MossdeepCity_StevensHouse/scripts.pory" -# 118 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 117 "data/maps/MossdeepCity_StevensHouse/scripts.pory" MossdeepCity_StevensHouse_EventScript_ReceivedBeldumFanfare:: -# 119 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 118 "data/maps/MossdeepCity_StevensHouse/scripts.pory" bufferspeciesname STR_VAR_2, SPECIES_BELDUM -# 120 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 119 "data/maps/MossdeepCity_StevensHouse/scripts.pory" removeobject LOCALID_BELDUM_BALL -# 121 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 120 "data/maps/MossdeepCity_StevensHouse/scripts.pory" playfanfare MUS_OBTAIN_ITEM -# 122 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 121 "data/maps/MossdeepCity_StevensHouse/scripts.pory" message MossdeepCity_StevensHouse_Text_ObtainedBeldum -# 123 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 122 "data/maps/MossdeepCity_StevensHouse/scripts.pory" waitmessage -# 124 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 123 "data/maps/MossdeepCity_StevensHouse/scripts.pory" waitfanfare -# 125 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 124 "data/maps/MossdeepCity_StevensHouse/scripts.pory" bufferspeciesname STR_VAR_1, SPECIES_BELDUM -# 126 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 125 "data/maps/MossdeepCity_StevensHouse/scripts.pory" return -# 127 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 126 "data/maps/MossdeepCity_StevensHouse/scripts.pory" -# 128 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 127 "data/maps/MossdeepCity_StevensHouse/scripts.pory" MossdeepCity_StevensHouse_EventScript_ReceivedBeldum:: -# 129 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 128 "data/maps/MossdeepCity_StevensHouse/scripts.pory" setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL -# 130 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 129 "data/maps/MossdeepCity_StevensHouse/scripts.pory" setflag FLAG_RECEIVED_BELDUM -# 131 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 130 "data/maps/MossdeepCity_StevensHouse/scripts.pory" releaseall -# 132 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 131 "data/maps/MossdeepCity_StevensHouse/scripts.pory" end -# 133 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 132 "data/maps/MossdeepCity_StevensHouse/scripts.pory" -# 134 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 133 "data/maps/MossdeepCity_StevensHouse/scripts.pory" MossdeepCity_StevensHouse_EventScript_RockDisplay:: -# 135 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 134 "data/maps/MossdeepCity_StevensHouse/scripts.pory" msgbox MossdeepCity_StevensHouse_Text_CollectionOfRareRocks, MSGBOX_SIGN -# 136 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 135 "data/maps/MossdeepCity_StevensHouse/scripts.pory" end -# 137 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 136 "data/maps/MossdeepCity_StevensHouse/scripts.pory" -# 138 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 137 "data/maps/MossdeepCity_StevensHouse/scripts.pory" MossdeepCity_StevensHouse_EventScript_Steven:: -# 139 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 138 "data/maps/MossdeepCity_StevensHouse/scripts.pory" goto_if_set FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT, MossdeepCity_StevensHouse_EventScript_StevenBeatMagma -# 140 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 139 "data/maps/MossdeepCity_StevensHouse/scripts.pory" msgbox MossdeepCity_StevensHouse_Text_MagmaHideout, MSGBOX_NPC -# 141 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 140 "data/maps/MossdeepCity_StevensHouse/scripts.pory" end -# 142 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 141 "data/maps/MossdeepCity_StevensHouse/scripts.pory" -# 143 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 142 "data/maps/MossdeepCity_StevensHouse/scripts.pory" MossdeepCity_StevensHouse_EventScript_StevenBeatMagma:: -# 144 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 143 "data/maps/MossdeepCity_StevensHouse/scripts.pory" msgbox MossdeepCity_StevensHouse_Text_UnderwateCavernBetweenMossdeepSootopolis, MSGBOX_NPC -# 145 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 144 "data/maps/MossdeepCity_StevensHouse/scripts.pory" end -# 146 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 145 "data/maps/MossdeepCity_StevensHouse/scripts.pory" -# 147 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 146 "data/maps/MossdeepCity_StevensHouse/scripts.pory" MossdeepCity_StevensHouse_EventScript_Letter:: -# 148 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 147 "data/maps/MossdeepCity_StevensHouse/scripts.pory" lockall -# 149 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 148 "data/maps/MossdeepCity_StevensHouse/scripts.pory" msgbox MossdeepCity_StevensHouse_Text_LetterFromSteven, MSGBOX_DEFAULT -# 150 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 149 "data/maps/MossdeepCity_StevensHouse/scripts.pory" releaseall -# 151 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 150 "data/maps/MossdeepCity_StevensHouse/scripts.pory" end -# 152 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 151 "data/maps/MossdeepCity_StevensHouse/scripts.pory" -# 153 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 152 "data/maps/MossdeepCity_StevensHouse/scripts.pory" @ Unused, leftover from RS -# 154 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 153 "data/maps/MossdeepCity_StevensHouse/scripts.pory" MossdeepCity_StevensHouse_EventScript_DiveItemBall:: -# 155 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 154 "data/maps/MossdeepCity_StevensHouse/scripts.pory" finditem ITEM_HM_DIVE -# 156 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 155 "data/maps/MossdeepCity_StevensHouse/scripts.pory" setflag FLAG_RECEIVED_HM_DIVE -# 157 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 156 "data/maps/MossdeepCity_StevensHouse/scripts.pory" end -# 158 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 157 "data/maps/MossdeepCity_StevensHouse/scripts.pory" -# 159 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 158 "data/maps/MossdeepCity_StevensHouse/scripts.pory" MossdeepCity_StevensHouse_Text_YouveEarnedHMDive: -# 160 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 159 "data/maps/MossdeepCity_StevensHouse/scripts.pory" .string "Steven: {PLAYER}{KUN}…\p" -# 161 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 160 "data/maps/MossdeepCity_StevensHouse/scripts.pory" .string "As you can see, there's not much here,\n" -# 162 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 161 "data/maps/MossdeepCity_StevensHouse/scripts.pory" .string "but this is my home.\p" -# 163 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 162 "data/maps/MossdeepCity_StevensHouse/scripts.pory" .string "Thank you for all that you've done.\p" -# 164 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 163 "data/maps/MossdeepCity_StevensHouse/scripts.pory" .string "This is my token of appreciation.\n" +# 164 "data/maps/MossdeepCity_StevensHouse/scripts.pory" + .string "It's the Hidden Machine Dive.\p" # 165 "data/maps/MossdeepCity_StevensHouse/scripts.pory" - .string "It's the Hidden Machine DIVE.\p" -# 166 "data/maps/MossdeepCity_StevensHouse/scripts.pory" .string "No need to be shy--you've earned\n" -# 167 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 166 "data/maps/MossdeepCity_StevensHouse/scripts.pory" .string "this HM.$" -# 168 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 167 "data/maps/MossdeepCity_StevensHouse/scripts.pory" -# 169 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 168 "data/maps/MossdeepCity_StevensHouse/scripts.pory" MossdeepCity_StevensHouse_Text_ExplainDive: +# 169 "data/maps/MossdeepCity_StevensHouse/scripts.pory" + .string "Steven: While you're using Surf, you\n" # 170 "data/maps/MossdeepCity_StevensHouse/scripts.pory" - .string "Steven: While you're using SURF, you\n" -# 171 "data/maps/MossdeepCity_StevensHouse/scripts.pory" .string "should notice dark patches of water.\p" +# 171 "data/maps/MossdeepCity_StevensHouse/scripts.pory" + .string "Use Dive if you come to deep water\n" # 172 "data/maps/MossdeepCity_StevensHouse/scripts.pory" - .string "Use DIVE if you come to deep water\n" -# 173 "data/maps/MossdeepCity_StevensHouse/scripts.pory" .string "like it. You'll drop to the seafloor.\p" -# 174 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 173 "data/maps/MossdeepCity_StevensHouse/scripts.pory" .string "When you want to come back up, use\n" +# 174 "data/maps/MossdeepCity_StevensHouse/scripts.pory" + .string "Dive again.\p" # 175 "data/maps/MossdeepCity_StevensHouse/scripts.pory" - .string "DIVE again.\p" -# 176 "data/maps/MossdeepCity_StevensHouse/scripts.pory" .string "In some places, it won't be possible\n" -# 177 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 176 "data/maps/MossdeepCity_StevensHouse/scripts.pory" .string "for you to surface, though.$" -# 178 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 177 "data/maps/MossdeepCity_StevensHouse/scripts.pory" -# 179 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 178 "data/maps/MossdeepCity_StevensHouse/scripts.pory" MossdeepCity_StevensHouse_Text_MagmaHideout: -# 180 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 179 "data/maps/MossdeepCity_StevensHouse/scripts.pory" .string "That Magma Emblem should do something\n" +# 180 "data/maps/MossdeepCity_StevensHouse/scripts.pory" + .string "if you go to Jagged Pass with it, though\p" # 181 "data/maps/MossdeepCity_StevensHouse/scripts.pory" - .string "if you go to Jagged Pass with it, though \p" -# 182 "data/maps/MossdeepCity_StevensHouse/scripts.pory" .string "I'm not sure what. I would recommend\n" -# 183 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 182 "data/maps/MossdeepCity_StevensHouse/scripts.pory" .string "heading there before helping Drake\l" -# 184 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 183 "data/maps/MossdeepCity_StevensHouse/scripts.pory" .string "with Team Aqua.$" -# 185 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 184 "data/maps/MossdeepCity_StevensHouse/scripts.pory" -# 186 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 185 "data/maps/MossdeepCity_StevensHouse/scripts.pory" MossdeepCity_StevensHouse_Text_UnderwateCavernBetweenMossdeepSootopolis: -# 187 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 186 "data/maps/MossdeepCity_StevensHouse/scripts.pory" .string "Apparently, there's an\n" -# 188 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 187 "data/maps/MossdeepCity_StevensHouse/scripts.pory" .string "underwater cavern between\l" -# 189 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 188 "data/maps/MossdeepCity_StevensHouse/scripts.pory" .string "Mossdeep and Sootopolis.\p" -# 190 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 189 "data/maps/MossdeepCity_StevensHouse/scripts.pory" .string "You know, the one that Capt. Stern\n" -# 191 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 190 "data/maps/MossdeepCity_StevensHouse/scripts.pory" .string "found in his submarine.$" -# 192 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 191 "data/maps/MossdeepCity_StevensHouse/scripts.pory" -# 193 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 192 "data/maps/MossdeepCity_StevensHouse/scripts.pory" MossdeepCity_StevensHouse_Text_TakeBallContainingBeldum: +# 193 "data/maps/MossdeepCity_StevensHouse/scripts.pory" + .string "{PLAYER} checked the Poké Ball.\p" # 194 "data/maps/MossdeepCity_StevensHouse/scripts.pory" - .string "{PLAYER} checked the POKé BALL.\p" -# 195 "data/maps/MossdeepCity_StevensHouse/scripts.pory" .string "It contained the Pokémon\n" +# 195 "data/maps/MossdeepCity_StevensHouse/scripts.pory" + .string "Beldum.\p" # 196 "data/maps/MossdeepCity_StevensHouse/scripts.pory" - .string "BELDUM.\p" + .string "Take the Poké Ball?$" # 197 "data/maps/MossdeepCity_StevensHouse/scripts.pory" - .string "Take the POKé BALL?$" -# 198 "data/maps/MossdeepCity_StevensHouse/scripts.pory" -# 199 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 198 "data/maps/MossdeepCity_StevensHouse/scripts.pory" MossdeepCity_StevensHouse_Text_ObtainedBeldum: +# 199 "data/maps/MossdeepCity_StevensHouse/scripts.pory" + .string "{PLAYER} obtained a Beldum.$" # 200 "data/maps/MossdeepCity_StevensHouse/scripts.pory" - .string "{PLAYER} obtained a BELDUM.$" -# 201 "data/maps/MossdeepCity_StevensHouse/scripts.pory" -# 202 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 201 "data/maps/MossdeepCity_StevensHouse/scripts.pory" @ Unused -# 203 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 202 "data/maps/MossdeepCity_StevensHouse/scripts.pory" MossdeepCity_StevensHouse_Text_NoSpaceForAnotherMon: -# 204 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 203 "data/maps/MossdeepCity_StevensHouse/scripts.pory" .string "There is no space for another Pokémon.$" -# 205 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 204 "data/maps/MossdeepCity_StevensHouse/scripts.pory" -# 206 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 205 "data/maps/MossdeepCity_StevensHouse/scripts.pory" MossdeepCity_StevensHouse_Text_LeftPokeBallWhereItWas: +# 206 "data/maps/MossdeepCity_StevensHouse/scripts.pory" + .string "{PLAYER} left the Poké Ball where\n" # 207 "data/maps/MossdeepCity_StevensHouse/scripts.pory" - .string "{PLAYER} left the POKé BALL where\n" -# 208 "data/maps/MossdeepCity_StevensHouse/scripts.pory" .string "it was.$" -# 209 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 208 "data/maps/MossdeepCity_StevensHouse/scripts.pory" -# 210 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 209 "data/maps/MossdeepCity_StevensHouse/scripts.pory" MossdeepCity_StevensHouse_Text_LetterFromSteven: -# 211 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 210 "data/maps/MossdeepCity_StevensHouse/scripts.pory" .string "It's a letter.\p" -# 212 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 211 "data/maps/MossdeepCity_StevensHouse/scripts.pory" .string "… … … … … …\p" -# 213 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 212 "data/maps/MossdeepCity_StevensHouse/scripts.pory" .string "To {PLAYER}{KUN}…\p" -# 214 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 213 "data/maps/MossdeepCity_StevensHouse/scripts.pory" .string "I've decided to do a little soul-\n" -# 215 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 214 "data/maps/MossdeepCity_StevensHouse/scripts.pory" .string "searching and train on the road.\p" -# 216 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 215 "data/maps/MossdeepCity_StevensHouse/scripts.pory" .string "I don't plan to return home for some\n" -# 217 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 216 "data/maps/MossdeepCity_StevensHouse/scripts.pory" .string "time.\p" -# 218 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 217 "data/maps/MossdeepCity_StevensHouse/scripts.pory" .string "I have a favor to ask of you.\p" +# 218 "data/maps/MossdeepCity_StevensHouse/scripts.pory" + .string "I want you to take the Poké Ball on\n" # 219 "data/maps/MossdeepCity_StevensHouse/scripts.pory" - .string "I want you to take the POKé BALL on\n" -# 220 "data/maps/MossdeepCity_StevensHouse/scripts.pory" .string "the desk.\p" +# 220 "data/maps/MossdeepCity_StevensHouse/scripts.pory" + .string "Inside it is a Beldum, my favorite\n" # 221 "data/maps/MossdeepCity_StevensHouse/scripts.pory" - .string "Inside it is a BELDUM, my favorite\n" -# 222 "data/maps/MossdeepCity_StevensHouse/scripts.pory" .string "Pokémon.\p" -# 223 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 222 "data/maps/MossdeepCity_StevensHouse/scripts.pory" .string "I'm counting on you.\p" -# 224 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 223 "data/maps/MossdeepCity_StevensHouse/scripts.pory" .string "May our paths cross someday.\p" +# 224 "data/maps/MossdeepCity_StevensHouse/scripts.pory" + .string "Steven Stone$" # 225 "data/maps/MossdeepCity_StevensHouse/scripts.pory" - .string "STEVEN STONE$" -# 226 "data/maps/MossdeepCity_StevensHouse/scripts.pory" -# 227 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 226 "data/maps/MossdeepCity_StevensHouse/scripts.pory" MossdeepCity_StevensHouse_Text_CollectionOfRareRocks: -# 228 "data/maps/MossdeepCity_StevensHouse/scripts.pory" +# 227 "data/maps/MossdeepCity_StevensHouse/scripts.pory" .string "It's a collection of rare rocks and\n" -# 229 "data/maps/MossdeepCity_StevensHouse/scripts.pory" - .string "stones assembled by STEVEN.$" +# 228 "data/maps/MossdeepCity_StevensHouse/scripts.pory" + .string "stones assembled by Steven.$" diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.pory b/data/maps/MossdeepCity_StevensHouse/scripts.pory index a325560a9103..cdb26be21cf0 100644 --- a/data/maps/MossdeepCity_StevensHouse/scripts.pory +++ b/data/maps/MossdeepCity_StevensHouse/scripts.pory @@ -50,7 +50,6 @@ MossdeepCity_StevensHouse_EventScript_StevenGivesDive:: applymovement LOCALID_STEVEN, MossdeepCity_StevensHouse_Movement_StevenReturn waitmovement 0 setflag FLAG_HIDE_MOSSDEEP_CITY_SCOTT - setflag FLAG_HIDE_SEAFLOOR_CAVERN_ENTRANCE_AQUA_GRUNT setvar VAR_STEVENS_HOUSE_STATE, 2 releaseall end @@ -162,23 +161,23 @@ MossdeepCity_StevensHouse_Text_YouveEarnedHMDive: .string "but this is my home.\p" .string "Thank you for all that you've done.\p" .string "This is my token of appreciation.\n" - .string "It's the Hidden Machine DIVE.\p" + .string "It's the Hidden Machine Dive.\p" .string "No need to be shy--you've earned\n" .string "this HM.$" MossdeepCity_StevensHouse_Text_ExplainDive: - .string "Steven: While you're using SURF, you\n" + .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" + .string "Use Dive if you come to deep water\n" .string "like it. You'll drop to the seafloor.\p" .string "When you want to come back up, use\n" - .string "DIVE again.\p" + .string "Dive again.\p" .string "In some places, it won't be possible\n" .string "for you to surface, though.$" MossdeepCity_StevensHouse_Text_MagmaHideout: .string "That Magma Emblem should do something\n" - .string "if you go to Jagged Pass with it, though \p" + .string "if you go to Jagged Pass with it, though\p" .string "I'm not sure what. I would recommend\n" .string "heading there before helping Drake\l" .string "with Team Aqua.$" @@ -191,20 +190,20 @@ MossdeepCity_StevensHouse_Text_UnderwateCavernBetweenMossdeepSootopolis: .string "found in his submarine.$" MossdeepCity_StevensHouse_Text_TakeBallContainingBeldum: - .string "{PLAYER} checked the POKé BALL.\p" + .string "{PLAYER} checked the Poké Ball.\p" .string "It contained the Pokémon\n" - .string "BELDUM.\p" - .string "Take the POKé BALL?$" + .string "Beldum.\p" + .string "Take the Poké Ball?$" MossdeepCity_StevensHouse_Text_ObtainedBeldum: - .string "{PLAYER} obtained a BELDUM.$" + .string "{PLAYER} obtained a Beldum.$" @ Unused MossdeepCity_StevensHouse_Text_NoSpaceForAnotherMon: .string "There is no space for another Pokémon.$" MossdeepCity_StevensHouse_Text_LeftPokeBallWhereItWas: - .string "{PLAYER} left the POKé BALL where\n" + .string "{PLAYER} left the Poké Ball where\n" .string "it was.$" MossdeepCity_StevensHouse_Text_LetterFromSteven: @@ -216,16 +215,16 @@ MossdeepCity_StevensHouse_Text_LetterFromSteven: .string "I don't plan to return home for some\n" .string "time.\p" .string "I have a favor to ask of you.\p" - .string "I want you to take the POKé BALL on\n" + .string "I want you to take the Poké Ball on\n" .string "the desk.\p" - .string "Inside it is a BELDUM, my favorite\n" + .string "Inside it is a Beldum, my favorite\n" .string "Pokémon.\p" .string "I'm counting on you.\p" .string "May our paths cross someday.\p" - .string "STEVEN STONE$" + .string "Steven Stone$" MossdeepCity_StevensHouse_Text_CollectionOfRareRocks: .string "It's a collection of rare rocks and\n" - .string "stones assembled by STEVEN.$" + .string "stones assembled by Steven.$" ` diff --git a/data/maps/SeafloorCavern_Entrance/scripts.inc b/data/maps/SeafloorCavern_Entrance/scripts.inc index e12a3979f67d..c285c3c4b14d 100644 --- a/data/maps/SeafloorCavern_Entrance/scripts.inc +++ b/data/maps/SeafloorCavern_Entrance/scripts.inc @@ -145,7 +145,7 @@ SeafloorCavern_Entrance_Text_HearMagmaNearMossdeep: # 73 "data/maps/SeafloorCavern_Entrance/scripts.pory" .string "Speaking of Team Magma, I hear they\n" # 74 "data/maps/SeafloorCavern_Entrance/scripts.pory" - .string "were spotted near MOSSDEEP.\p" + .string "were spotted near Jagged Pass.\p" # 75 "data/maps/SeafloorCavern_Entrance/scripts.pory" .string "That bunch of goons, they sure don't\n" # 76 "data/maps/SeafloorCavern_Entrance/scripts.pory" @@ -169,7 +169,7 @@ SeafloorCavern_Entrance_Text_HearMagmaNearMossdeepShort: # 85 "data/maps/SeafloorCavern_Entrance/scripts.pory" .string "Speaking of Team Magma, I hear they\n" # 86 "data/maps/SeafloorCavern_Entrance/scripts.pory" - .string "were spotted near MOSSDEEP.\p" + .string "were spotted near Jagged Pass.\p" # 87 "data/maps/SeafloorCavern_Entrance/scripts.pory" .string "That bunch of goons, they sure don't\n" # 88 "data/maps/SeafloorCavern_Entrance/scripts.pory" diff --git a/data/maps/SeafloorCavern_Entrance/scripts.pory b/data/maps/SeafloorCavern_Entrance/scripts.pory index f265db3e2d56..9fde2061ff76 100644 --- a/data/maps/SeafloorCavern_Entrance/scripts.pory +++ b/data/maps/SeafloorCavern_Entrance/scripts.pory @@ -71,7 +71,7 @@ SeafloorCavern_Entrance_Text_HearMagmaNearMossdeep: .string "You're a perfect fit for the likes of\n" .string "Team Magma!\p" .string "Speaking of Team Magma, I hear they\n" - .string "were spotted near MOSSDEEP.\p" + .string "were spotted near Jagged Pass.\p" .string "That bunch of goons, they sure don't\n" .string "look good near the sea!$" @@ -83,7 +83,7 @@ SeafloorCavern_Entrance_Text_HearMagmaNearMossdeepShort: .string "You're a perfect fit for the likes of\n" .string "Team Magma!\p" .string "Speaking of Team Magma, I hear they\n" - .string "were spotted near MOSSDEEP.\p" + .string "were spotted near Jagged Pass.\p" .string "That bunch of goons, they sure don't\n" .string "look good near the sea!$" diff --git a/data/maps/Underwater_Route128/map.json b/data/maps/Underwater_Route128/map.json index 50086f5fec3c..28906d7a13d7 100644 --- a/data/maps/Underwater_Route128/map.json +++ b/data/maps/Underwater_Route128/map.json @@ -37,15 +37,7 @@ } ], "coord_events": [ - { - "type": "trigger", - "x": 38, - "y": 27, - "elevation": 0, - "var": "VAR_BEAT_MAXIE_HIDEOUT", - "var_value": "0", - "script": "Underwater_Route128__Trigger_BlockCavernEntrance" - } + ], "bg_events": [ { diff --git a/data/maps/Underwater_SootopolisCity/map.json b/data/maps/Underwater_SootopolisCity/map.json index 86a337399aef..1b2d106c048e 100644 --- a/data/maps/Underwater_SootopolisCity/map.json +++ b/data/maps/Underwater_SootopolisCity/map.json @@ -12,8 +12,10 @@ "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": null, - "object_events": [], + "connections": 0, + "object_events": [ + + ], "warp_events": [ { "x": 9, @@ -30,6 +32,10 @@ "dest_warp_id": "0" } ], - "coord_events": [], - "bg_events": [] + "coord_events": [ + + ], + "bg_events": [ + + ] } diff --git a/data/text/match_call.inc b/data/text/match_call.inc index ebbb4be3e146..d3669aac8066 100644 --- a/data/text/match_call.inc +++ b/data/text/match_call.inc @@ -2310,7 +2310,7 @@ MatchCall_Text_MayRayquazaCall: .string "… … … … … …\n" .string "… … … … … Beep!\p" .string "May: Hi, {PLAYER}{KUN}!\p" - .string "I was just in PACIFIDLOG a little\n" + .string "I was just in Pacifidlog a little\n" .string "while ago.\p" .string "I saw a giant green Pokémon\n" .string "flying high in the sky.\p" @@ -2325,7 +2325,7 @@ MatchCall_Text_BrendanRayquazaCall: .string "… … … … … …\n" .string "… … … … … Beep!\p" .string "Brendan: Hey, {PLAYER}!\n" - .string "I was in PACIFIDLOG just now.\p" + .string "I was in Pacifidlog just now.\p" .string "I saw this huge green Pokémon\n" .string "flying across the sky.\p" .string "I've never seen anything that\n" diff --git a/src/battle_ai_main.c b/src/battle_ai_main.c index 00d9249dc710..bdaca1659594 100644 --- a/src/battle_ai_main.c +++ b/src/battle_ai_main.c @@ -730,7 +730,7 @@ static s32 AI_CheckBadMove(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) if (IsSemiInvulnerable(battlerDef, move) && moveEffect != EFFECT_SEMI_INVULNERABLE && AI_IsFaster(battlerAtk, battlerDef, move)) RETURN_SCORE_MINUS(10); - if (IsTwoTurnNotSemiInvulnerableMove(battlerAtk, move) && CanTargetFaintAi(battlerDef, battlerAtk)) + if (IsTwoTurnNotSemiInvulnerableMove(battlerAtk, move)) RETURN_SCORE_MINUS(10); if (gBattleStruct->commandingDondozo & (1u << battlerDef)) diff --git a/src/strings.c b/src/strings.c index d01969c45201..0ee63ffaa750 100644 --- a/src/strings.c +++ b/src/strings.c @@ -772,9 +772,9 @@ const u8 gText_RankingHall[] = _("RANKING HALL"); const u8 gText_ExchangeService[] = _("EXCHANGE SERVICE"); const u8 gText_LilycoveCity[] = _("LILYCOVE CITY"); const u8 gText_SlateportCity[] = _("SLATEPORT CITY"); -const u8 gText_CaveOfOrigin[] = _("CAVE OF ORIGIN"); -const u8 gText_MtPyre[] = _("MT. PYRE"); -const u8 gText_SkyPillar[] = _("SKY PILLAR"); +const u8 gText_CaveOfOrigin[] = _("Cave of Origin"); +const u8 gText_MtPyre[] = _("Mt. Pyre"); +const u8 gText_SkyPillar[] = _("Sky Pillar"); const u8 gText_DontRemember[] = _("Don't remember"); const u8 gText_Exit[] = _("Exit"); const u8 gText_YourPartysFull[] = _("Your party's full!{PAUSE_UNTIL_PRESS}");