--- compare_ruby.s 2016-06-18 17:54:44.438508600 -0400 +++ compare_sapphire.s 2016-06-18 17:55:38.360955000 -0400 @@ -431,8 +431,8 @@ .byte 0 SlateportCity_MapScript1_1:: - setvar 0x4010, 120 - setvar 0x4011, 119 + setvar 0x4010, 118 + setvar 0x4011, 117 setvar 0x40aa, 0 call SlateportCity_EventScript_61 compare 0x4058, 1 @@ -906,7 +906,7 @@ move 11, SlateportCity_Movement_8 waitmove 0 msgbox SlateportCity_Text_22, 4 - playmusic 441, 0 + playmusic 419, 0 msgbox SlateportCity_Text_23, 4 move 6, SlateportCity_Movement_9 move 1, SlateportCity_Movement_10 @@ -1982,18 +1982,6 @@ end LilycoveCity_MapScript1_2:: - setmaptile 69, 4, 169, 1 - setmaptile 70, 4, 680, 1 - setmaptile 71, 4, 681, 1 - setmaptile 72, 4, 682, 1 - setmaptile 69, 5, 145, 1 - setmaptile 70, 5, 688, 1 - setmaptile 71, 5, 689, 0 - setmaptile 72, 5, 690, 1 - setmaptile 69, 6, 446, 0 - setmaptile 70, 6, 447, 0 - setmaptile 71, 6, 368, 0 - setmaptile 72, 6, 445, 0 checkflag 112 callif 0, LilycoveCity_EventScript_71 checkflag 2061 @@ -8283,7 +8271,7 @@ end Route115_EventScript_12:: - trainerbattle 0, 514, 0, Route115_Text_23, Route115_Text_24 + trainerbattle 0, 513, 0, Route115_Text_23, Route115_Text_24 msgbox Route115_Text_25, 6 end @@ -10103,8 +10091,6 @@ Route128_EventScript_10:: lockall pause 20 - special 317 - waitstate move 4, Route128_Movement_1 waitmove 0 msgbox Route128_Text_22, 4 @@ -15540,8 +15526,8 @@ .byte 0 SlateportCity_OceanicMuseum_1F_MapScript1_1:: - setvar 0x4010, 120 - setvar 0x4011, 119 + setvar 0x4010, 118 + setvar 0x4011, 117 end SlateportCity_OceanicMuseum_1F_EventScript_1:: @@ -15769,7 +15755,7 @@ faceplayer msgbox SlateportCity_OceanicMuseum_2F_Text_1, 4 closebutton - playmusic 441, 1 + playmusic 419, 1 reappear 3 move 3, SlateportCity_OceanicMuseum_2F_Movement_1 waitmove 0 @@ -15795,7 +15781,7 @@ callif 1, SlateportCity_OceanicMuseum_2F_EventScript_5 compare FACING, 3 callif 1, SlateportCity_OceanicMuseum_2F_EventScript_6 - trainerbattle 3, 585, 0, SlateportCity_OceanicMuseum_2F_Text_5 + trainerbattle 3, 20, 0, SlateportCity_OceanicMuseum_2F_Text_5 msgbox SlateportCity_OceanicMuseum_2F_Text_6, 4 closebutton move 4, SlateportCity_OceanicMuseum_2F_Movement_10 @@ -15804,7 +15790,7 @@ waitmove 0 msgbox SlateportCity_OceanicMuseum_2F_Text_7, 4 playmusicbattle 0 - trainerbattle 3, 586, 0, SlateportCity_OceanicMuseum_2F_Text_8 + trainerbattle 3, 21, 0, SlateportCity_OceanicMuseum_2F_Text_8 move 3, SlateportCity_OceanicMuseum_2F_Movement_12 waitmove 0 move 3, SlateportCity_OceanicMuseum_2F_Movement_13 @@ -16057,7 +16043,7 @@ return SlateportCity_Harbor_EventScript_51:: - playmusicbattle 441 + playmusicbattle 419 movespriteperm 4, 12, 13 spritebehave 4, 9 setflag 905 @@ -25588,7 +25574,7 @@ jumpeq Route114_LanettesHouse_EventScript_2 setflag 2123 msgbox Route114_LanettesHouse_Text_2, 4 - givedecoration 100 + givedecoration 99 compare RESULT, 0 jumpeq Route114_LanettesHouse_EventScript_3 setflag 131 @@ -26381,9 +26367,9 @@ RusturfTunnel_EventScript_6:: lock faceplayer - playmusic 441, 0 + playmusic 419, 0 msgbox RusturfTunnel_Text_3, 4 - trainerbattle 3, 581, 0, RusturfTunnel_Text_4 + trainerbattle 3, 16, 0, RusturfTunnel_Text_4 msgbox RusturfTunnel_Text_5, 4 giveitem ITEM_DEVON_GOODS closebutton @@ -26687,7 +26673,7 @@ waitmove 0 msgbox PetalburgWoods_Text_15, 4 closebutton - playmusic 441, 0 + playmusic 419, 0 move 3, PetalburgWoods_Movement_3 waitmove 0 msgbox PetalburgWoods_Text_16, 4 @@ -26704,7 +26690,7 @@ move 3, PetalburgWoods_Movement_7 waitmove 0 msgbox PetalburgWoods_Text_19, 4 - trainerbattle 3, 575, 0, PetalburgWoods_Text_20 + trainerbattle 3, 10, 0, PetalburgWoods_Text_20 move 3, PetalburgWoods_Movement_8 waitmove 0 call PetalburgWoods_EventScript_17 @@ -26722,7 +26708,7 @@ waitmove 0 msgbox PetalburgWoods_Text_26, 4 closebutton - playmusic 441, 0 + playmusic 419, 0 move 3, PetalburgWoods_Movement_15 waitmove 0 msgbox PetalburgWoods_Text_27, 4 @@ -26739,7 +26725,7 @@ move 255, PetalburgWoods_Movement_19 waitmove 0 msgbox PetalburgWoods_Text_30, 4 - trainerbattle 3, 575, 0, PetalburgWoods_Text_31 + trainerbattle 3, 10, 0, PetalburgWoods_Text_31 move 3, PetalburgWoods_Movement_20 waitmove 0 call PetalburgWoods_EventScript_24 @@ -27080,12 +27066,12 @@ end MtChimney_EventScript_9:: - trainerbattle 0, 597, 0, MtChimney_Text_8, MtChimney_Text_9 + trainerbattle 0, 31, 0, MtChimney_Text_8, MtChimney_Text_9 msgbox MtChimney_Text_10, 6 end MtChimney_EventScript_32:: - trainerbattle 0, 579, 0, MtChimney_Text_25, MtChimney_Text_26 + trainerbattle 0, 14, 0, MtChimney_Text_25, MtChimney_Text_26 msgbox MtChimney_Text_27, 6 end @@ -27443,7 +27429,7 @@ compare 0x8008, 2 callif 1, MtPyre_Summit_EventScript_24 msgbox MtPyre_Summit_Text_20, 4 - giveitem ITEM_RED_ORB + giveitem ITEM_BLUE_ORB setflag 212 releaseall end @@ -27557,7 +27543,7 @@ MtPyre_Summit_EventScript_10:: MtPyre_Summit_EventScript_7:: - setvar 0x8004, 276 + setvar 0x8004, 277 call MtPyre_Summit_EventScript_8 closebutton move LAST_TALKED, MtPyre_Summit_Movement_1 @@ -27751,7 +27737,7 @@ AquaHideout_1F_EventScript_5:: MagmaHideout_1F_EventScript_3:: - trainerbattle 2, 567, 0, AquaHideout_1F_Text_5, AquaHideout_1F_Text_6, AquaHideout_1F_EventScript_6 + trainerbattle 2, 2, 0, AquaHideout_1F_Text_5, AquaHideout_1F_Text_6, AquaHideout_1F_EventScript_6 msgbox AquaHideout_1F_Text_8, 6 end @@ -27780,7 +27766,7 @@ AquaHideout_B1F_EventScript_1:: MagmaHideout_B1F_EventScript_1:: - trainerbattle 2, 568, 0, AquaHideout_B1F_Text_1, AquaHideout_B1F_Text_2, AquaHideout_B1F_EventScript_2 + trainerbattle 2, 3, 0, AquaHideout_B1F_Text_1, AquaHideout_B1F_Text_2, AquaHideout_B1F_EventScript_2 msgbox AquaHideout_B1F_Text_4, 6 end @@ -27791,7 +27777,7 @@ AquaHideout_B1F_EventScript_3:: MagmaHideout_B1F_EventScript_2:: - trainerbattle 2, 569, 0, AquaHideout_B1F_Text_5, AquaHideout_B1F_Text_6, AquaHideout_B1F_EventScript_4 + trainerbattle 2, 4, 0, AquaHideout_B1F_Text_5, AquaHideout_B1F_Text_6, AquaHideout_B1F_EventScript_4 msgbox AquaHideout_B1F_Text_8, 6 end @@ -27802,7 +27788,7 @@ AquaHideout_B1F_EventScript_6:: MagmaHideout_B1F_EventScript_3:: - trainerbattle 0, 592, 0, AquaHideout_B1F_Text_9, AquaHideout_B1F_Text_10 + trainerbattle 0, 27, 0, AquaHideout_B1F_Text_9, AquaHideout_B1F_Text_10 msgbox AquaHideout_B1F_Text_11, 6 end @@ -27833,14 +27819,14 @@ AquaHideout_B2F_EventScript_1:: MagmaHideout_B2F_EventScript_1:: - trainerbattle 2, 596, 0, AquaHideout_B2F_Text_1, AquaHideout_B2F_Text_2, AquaHideout_B2F_EventScript_2 + trainerbattle 2, 30, 0, AquaHideout_B2F_Text_1, AquaHideout_B2F_Text_2, AquaHideout_B2F_EventScript_2 msgbox AquaHideout_B2F_Text_5, 4 release end AquaHideout_B2F_EventScript_2:: setvar 0x8008, 1 - setvar 0x8009, 3 + setvar 0x8009, 4 move 0x8008, AquaHideout_B2F_Movement_1 waitmove 0 pause 20 @@ -27861,18 +27847,18 @@ release end - baserom 0x5 - AquaHideout_B2F_Movement_4:: - step_right - step_right - step_right - step_right + step_left + step_left + step_left + step_left step_end + baserom 0x5 + AquaHideout_B2F_EventScript_3:: MagmaHideout_B2F_EventScript_2:: - trainerbattle 2, 570, 0, AquaHideout_B2F_Text_6, AquaHideout_B2F_Text_7, AquaHideout_B2F_EventScript_4 + trainerbattle 2, 5, 0, AquaHideout_B2F_Text_6, AquaHideout_B2F_Text_7, AquaHideout_B2F_EventScript_4 msgbox AquaHideout_B2F_Text_9, 6 end @@ -27883,7 +27869,7 @@ AquaHideout_B2F_EventScript_6:: MagmaHideout_B2F_EventScript_3:: - trainerbattle 0, 593, 0, AquaHideout_B2F_Text_10, AquaHideout_B2F_Text_11 + trainerbattle 0, 28, 0, AquaHideout_B2F_Text_10, AquaHideout_B2F_Text_11 msgbox AquaHideout_B2F_Text_12, 6 end @@ -27954,12 +27940,12 @@ end SeafloorCavern_Room1_EventScript_4:: - trainerbattle 0, 571, 0, SeafloorCavern_Room1_Text_1, SeafloorCavern_Room1_Text_2 + trainerbattle 0, 6, 0, SeafloorCavern_Room1_Text_1, SeafloorCavern_Room1_Text_2 msgbox SeafloorCavern_Room1_Text_3, 6 end SeafloorCavern_Room1_EventScript_5:: - trainerbattle 0, 572, 0, SeafloorCavern_Room1_Text_4, SeafloorCavern_Room1_Text_5 + trainerbattle 0, 7, 0, SeafloorCavern_Room1_Text_4, SeafloorCavern_Room1_Text_5 msgbox SeafloorCavern_Room1_Text_6, 6 end @@ -27975,7 +27961,7 @@ end SeafloorCavern_Room3_EventScript_10:: - trainerbattle 0, 600, 0, SeafloorCavern_Room3_Text_1, SeafloorCavern_Room3_Text_2 + trainerbattle 0, 33, 0, SeafloorCavern_Room3_Text_1, SeafloorCavern_Room3_Text_2 msgbox SeafloorCavern_Room3_Text_3, 6 end @@ -27988,7 +27974,7 @@ end SeafloorCavern_Room4_EventScript_1:: - trainerbattle 0, 573, 0, SeafloorCavern_Room4_Text_1, SeafloorCavern_Room4_Text_2 + trainerbattle 0, 8, 0, SeafloorCavern_Room4_Text_1, SeafloorCavern_Room4_Text_2 msgbox SeafloorCavern_Room4_Text_3, 6 end @@ -28011,7 +27997,7 @@ SeafloorCavern_Room9_MapScript1_1:: call SeafloorCavern_Room9_EventScript_3 call SeafloorCavern_Room9_EventScript_4 - setmapfooter 327 + setmapfooter 157 end SeafloorCavern_Room9_EventScript_2:: @@ -28038,7 +28024,7 @@ move 0x8004, SeafloorCavern_Room9_Movement_6 waitmove 0 msgbox SeafloorCavern_Room9_Text_4, 4 - trainerbattle 3, 601, 0, SeafloorCavern_Room9_Text_5 + trainerbattle 3, 34, 0, SeafloorCavern_Room9_Text_5 msgbox SeafloorCavern_Room9_Text_6, 4 setweather 0 doweather @@ -28047,14 +28033,14 @@ msgbox SeafloorCavern_Room9_Text_7, 4 special 284 waitstate - setvar RESULT, 0 + setvar RESULT, 1 playsfx 209 setanimation 0, 16 setanimation 1, 42 setanimation 2, 0 doanimation 54 checkanimation 54 - setvar RESULT, 1 + setvar RESULT, 0 fanfare 388 playsfx 107 special 281 @@ -28274,7 +28260,7 @@ return CaveOfOrigin_B4F_MapScript1_2:: - setmapfooter 313 + setmapfooter 163 call CaveOfOrigin_B4F_EventScript_6 checkflag 113 callif 1, CaveOfOrigin_B4F_EventScript_7 @@ -28296,7 +28282,7 @@ setanimation 2, 0 doanimation 54 checkanimation 54 - setvar RESULT, 2 + setvar RESULT, 3 playsfx 107 special 281 waitstate @@ -28305,9 +28291,9 @@ move 1, CaveOfOrigin_B4F_Movement_2 waitmove 0 pause 60 - setwildbattle SPECIES_GROUDON, 45, ITEM_NONE + setwildbattle SPECIES_KYOGRE, 45, ITEM_NONE checksound - pokecry SPECIES_GROUDON, 2 + pokecry SPECIES_KYOGRE, 2 pause 40 waitpokecry setflag 2145 @@ -32358,7 +32344,7 @@ return SouthernIsland_Interior_MapScript1_2:: - setvar 0x4011, 187 + setvar 0x4011, 188 call SouthernIsland_Interior_EventScript_6 end @@ -32395,7 +32381,7 @@ waitmove 0 pause 50 checksound - pokecry SPECIES_LATIAS, 0 + pokecry SPECIES_LATIOS, 0 pause 30 waitpokecry reappear 2 @@ -32405,7 +32391,7 @@ waitmove 0 pause 50 special 276 - setwildbattle SPECIES_LATIAS, 50, ITEM_SOUL_DEW + setwildbattle SPECIES_LATIOS, 50, ITEM_SOUL_DEW setflag 911 setflag 2145 special 323 @@ -33184,7 +33170,7 @@ move 1, Route110_TrickHouseEntrance_Movement_9 waitmove 0 msgbox Route110_TrickHouseEntrance_Text_19, 4 - givedecoration 31 + givedecoration 32 compare RESULT, 1 jumpeq Route110_TrickHouseEntrance_EventScript_35 compare RESULT, 0 @@ -33566,7 +33552,7 @@ pause 30 msgbox Route110_TrickHouseEnd_Text_26, 4 setvar 0x40c1, 0 - givedecoration 31 + givedecoration 32 compare RESULT, 0 callif 1, Route110_TrickHouseEnd_EventScript_29 msgbox Route110_TrickHouseEnd_Text_28, 4 @@ -36052,12 +36038,12 @@ end Route119_WeatherInstitute_1F_EventScript_1:: - trainerbattle 0, 582, 0, Route119_WeatherInstitute_1F_Text_1, Route119_WeatherInstitute_1F_Text_2 + trainerbattle 0, 17, 0, Route119_WeatherInstitute_1F_Text_1, Route119_WeatherInstitute_1F_Text_2 msgbox Route119_WeatherInstitute_1F_Text_3, 6 end Route119_WeatherInstitute_1F_EventScript_2:: - trainerbattle 0, 591, 0, Route119_WeatherInstitute_1F_Text_4, Route119_WeatherInstitute_1F_Text_5 + trainerbattle 0, 26, 0, Route119_WeatherInstitute_1F_Text_4, Route119_WeatherInstitute_1F_Text_5 msgbox Route119_WeatherInstitute_1F_Text_6, 6 end @@ -36084,17 +36070,17 @@ return Route119_WeatherInstitute_2F_EventScript_1:: - trainerbattle 0, 583, 0, Route119_WeatherInstitute_2F_Text_1, Route119_WeatherInstitute_2F_Text_2 + trainerbattle 0, 18, 0, Route119_WeatherInstitute_2F_Text_1, Route119_WeatherInstitute_2F_Text_2 msgbox Route119_WeatherInstitute_2F_Text_3, 6 end Route119_WeatherInstitute_2F_EventScript_2:: - trainerbattle 0, 584, 0, Route119_WeatherInstitute_2F_Text_4, Route119_WeatherInstitute_2F_Text_5 + trainerbattle 0, 19, 0, Route119_WeatherInstitute_2F_Text_4, Route119_WeatherInstitute_2F_Text_5 msgbox Route119_WeatherInstitute_2F_Text_6, 6 end Route119_WeatherInstitute_2F_EventScript_3:: - trainerbattle 2, 599, 0, Route119_WeatherInstitute_2F_Text_7, Route119_WeatherInstitute_2F_Text_8, Route119_WeatherInstitute_2F_EventScript_4 + trainerbattle 2, 32, 0, Route119_WeatherInstitute_2F_Text_7, Route119_WeatherInstitute_2F_Text_8, Route119_WeatherInstitute_2F_EventScript_4 msgbox Route119_WeatherInstitute_2F_Text_14, 6 end @@ -37754,11 +37740,9 @@ .string "But that’s what makes the sky above\n" .string "SOOTOPOLIS the most beautiful.$" - baserom 0x487 - SootopolisCity_Text_24:: .string "STEVEN: {PLAYER}{KUN}, you came, too?\n" - .string "Under this scorching sun, yet...\p" + .string "In this terrible rainstorm, yet...\p" .string "Oh, yes, can you hear out what my\n" .string "friend has to say?$" @@ -37767,44 +37751,43 @@ .string "I’m this town’s GYM LEADER.\p" .string "I’ve also been entrusted with the\n" .string "protection of the CAVE OF ORIGIN.\p" - .string "This sunshine is caused by a power\n" + .string "This downpour is caused by a power\n" .string "emanating from the CAVE OF ORIGIN.$" SootopolisCity_Text_26:: - .string "That... That is the RED ORB.\p" + .string "That... That is the BLUE ORB.\p" .string "I see.\n" .string "Follow me.$" SootopolisCity_Text_27:: - .string "STEVEN: This sunlight...\p" - .string "People and POKéMON need sunlight\n" - .string "to live...\p" - .string "But why does this sunlight fill us\n" - .string "with so much dread?\p" - .string "The blazing sun over SOOTOPOLIS is\n" - .string "intensifying... Soon, all of HOENN\l" - .string "will be under its withering glare...\p" + .string "STEVEN: This rain...\p" + .string "People and POKéMON need water to live...\p" + .string "But why does this rain fill us with\n" + .string "so much dread?\p" + .string "The rain clouds over SOOTOPOLIS will\n" + .string "keep building and soon extend all\l" + .string "over HOENN...\p" .string "If that were to happen...$" SootopolisCity_Text_28:: .string "WALLACE: The CAVE OF ORIGIN is ahead.\p" .string "No one from SOOTOPOLIS is permitted\n" .string "to enter the CAVE OF ORIGIN.\p" - .string "But you must go. \n" - .string "Together with your RED ORB.\p" + .string "But you must go.\n" + .string "Together with your BLUE ORB.\p" .string "You must go regardless of what awaits\n" .string "you inside the CAVE...$" SootopolisCity_Text_29:: .string "STEVEN: {PLAYER}{KUN}, I never expected you\n" - .string "to be holding the RED ORB.\p" + .string "to be holding the BLUE ORB.\p" .string "You’ll be okay. With your POKéMON,\n" .string "you’ll get things done no matter what.\p" .string "I’m convinced of it!$" SootopolisCity_Text_7:: .string "WALLACE: You must go together with\n" - .string "your RED ORB.\p" + .string "your BLUE ORB.\p" .string "You must go regardless of what awaits\n" .string "you inside the CAVE...$" @@ -37814,6 +37797,8 @@ .string "whatever happens.\p" .string "I’m convinced of it!$" + baserom 0x4a3 + SootopolisCity_Text_1:: .string "The legend told by the old man on\n" .string "MT. PYRE... It wasn’t a made-up story.$" @@ -39700,18 +39685,18 @@ .string "STEVEN: {PLAYER}{KUN}!\n" .string "What is happening?$" - baserom 0xff - Route128_Text_28:: .string "This is terrible...\p" - .string "If this doesn’t stop, all of HOENN...\n" - .string "No, the whole world will be parched.\p" - .string "The cause of this calamity, the blazing\n" - .string "sun, is in the sky above SOOTOPOLIS...\p" + .string "If this doesn’t stop, all HOENN...\n" + .string "No, the whole world will drown.\p" + .string "This huge rain cloud is spreading\n" + .string "from above SOOTOPOLIS?\p" .string "What in the world is taking place there?\p" .string "There’s no point arguing here...\n" .string "SOOTOPOLIS should provide answers...$" + baserom 0x11d + Route128_Text_29:: .string "{PLAYER}{KUN}...\n" .string "I don’t know what you intend to do,\l" @@ -42505,26 +42490,27 @@ .string "long to snatch some parts, and you\l" .string "simps are held up by a mere child?$" - baserom 0x1b5 - SlateportCity_OceanicMuseum_2F_Text_11:: - .string "I am TEAM MAGMA’s MAXIE.\p" - .string "Why on earth do you feel compelled\n" - .string "to mess up TEAM MAGMA’s plans?\p" - .string "POKéMON, people, all life exists on land...\p" - .string "That’s why TEAM MAGMA is trying to\n" - .string "expand the world’s landmass.\p" + .string "I am TEAM AQUA’s ARCHIE.\p" + .string "Tell me, why do you meddle in the\n" + .string "noble affairs of TEAM AQUA?\p" + .string "POKéMON, people, all life depends on\n" + .string "the sea.\p" + .string "So, TEAM AQUA is dedicated to the\n" + .string "expansion of the sea.\p" .string "Don’t you agree? What we are doing\n" .string "is a magnificent undertaking.\p" - .string "Well, no matter...\n" - .string "You’re young.\p" - .string "Your inability to understand our\n" - .string "noble cause can’t be helped...\p" - .string "But, if you were to impede us ever\n" - .string "again, you’ll see no mercy from us!\p" - .string "Keep that firmly in mind!\n" + .string "Ah, fine...\n" + .string "You’re still too young.\p" + .string "It can’t be helped that you do not\n" + .string "understand our ideals.\p" + .string "But, if you ever oppose us again,\n" + .string "there will be consequences!\p" + .string "Heed my warning!\n" .string "Farewell!$" + baserom 0x1d4 + SlateportCity_OceanicMuseum_2F_Text_12:: .string "CAPT. STERN: You’re...\n" .string "Ah, okay, you’re {PLAYER}{KUN}...\p" @@ -47020,22 +47006,22 @@ .string "Hehehe! Be seeing you, you TEAM\n" .string "{GOOD_TEAM} dingbats!$" - baserom 0x198 - MeteorFalls_1F_1R_Text_7:: - .string "Who might you be?\p" + .string "And you are?\p" .string "... ... ... ... ... ... ... ...\n" .string "... ... ... ... ... ... ... ...\p" - .string "Ah, so you are {PLAYER}{KUN}.\p" - .string "I am ARCHIE. As the head of TEAM AQUA,\n" + .string "Fine, so you are {PLAYER}{KUN}.\p" + .string "I am MAXIE. As the head of TEAM MAGMA,\n" .string "I have dedicated myself to thwarting\l" - .string "the dangerous plans of TEAM MAGMA.\p" - .string "Why? Because TEAM MAGMA is a grave\n" + .string "the dangerous plans of TEAM AQUA.\p" + .string "Why? Because TEAM AQUA is a grave\n" .string "threat to us all.\p" .string "They have committed many destructive\n" - .string "acts in their bid to expand the land.\p" - .string "We, TEAM AQUA, love the sea above\n" - .string "all! TEAM MAGMA is our sworn enemy!$" + .string "acts in their bid to enlarge the sea.\p" + .string "We, TEAM MAGMA, love dry land above\n" + .string "all! TEAM AQUA is our sworn enemy!$" + + baserom 0x19c MeteorFalls_1F_1R_Text_8:: .string "{GOOD_LEADER}, we should give chase to\n" @@ -50476,18 +50462,18 @@ SeafloorCavern_Room4_EventScript_2:: SeafloorCavern_Room9_EventScript_3:: SlateportCity_OceanicMuseum_2F_EventScript_32:: - setvar 0x4011, 119 - setvar 0x4012, 120 - setvar 0x4014, 117 - setvar 0x4015, 118 - setvar 0x4016, 196 - setvar 0x4017, 195 + setvar 0x4011, 117 + setvar 0x4012, 118 + setvar 0x4014, 119 + setvar 0x4015, 120 + setvar 0x4016, 195 + setvar 0x4017, 196 return CaveOfOrigin_B4F_EventScript_6:: SeafloorCavern_Room9_EventScript_4:: - setvar 0x4018, 198 - setvar 0x4019, 206 + setvar 0x4018, 197 + setvar 0x4019, 205 return DewfordTown_Gym_EventScript_19:: @@ -50678,7 +50664,7 @@ Route127_EventScript_10:: Route128_EventScript_8:: SootopolisCity_EventScript_37:: - setweather 12 + setweather 13 return DewfordTown_Gym_EventScript_17:: @@ -50876,7 +50862,7 @@ CaveOfOrigin_B4F_EventScript_4:: lockall checksound - pokecry SPECIES_GROUDON, 2 + pokecry SPECIES_KYOGRE, 2 waitpokecry setvar 0x4005, 1 releaseall @@ -51317,6 +51303,7 @@ AquaHideout_B2F_Movement_2:: AquaHideout_B2F_Movement_5:: +AquaHideout_B2F_Movement_7:: EverGrandeCity_PokemonLeague_Movement_1:: FallarborTown_House2_Movement_1:: FortreeCity_House4_Movement_1:: @@ -51469,6 +51456,8 @@ step_4e step_end +AquaHideout_B2F_Movement_1:: +AquaHideout_B2F_Movement_3:: DewfordTown_Hall_Movement_8:: EverGrandeCity_ChampionsRoom_Movement_4:: EverGrandeCity_HallOfFame_Movement_4:: @@ -51528,7 +51517,6 @@ step_27 step_end -AquaHideout_B2F_Movement_7:: CaveOfOrigin_B4F_Movement_1:: DewfordTown_Hall_Movement_1:: DewfordTown_Hall_Movement_2:: @@ -51595,8 +51583,6 @@ step_26 step_end -AquaHideout_B2F_Movement_1:: -AquaHideout_B2F_Movement_3:: DewfordTown_Hall_Movement_4:: EverGrandeCity_ChampionsRoom_Movement_9:: EverGrandeCity_HallOfFame_Movement_3:: @@ -59156,7 +59142,7 @@ move 2, MtChimney_Movement_4 waitmove 0 msgbox MtChimney_Text_4, 4 - trainerbattle 3, 602, 0, MtChimney_Text_5 + trainerbattle 3, 35, 0, MtChimney_Text_5 msgbox MtChimney_Text_6, 4 closebutton pause 30 @@ -59209,59 +59195,58 @@ return MtPyre_Summit_EventScript_13:: - trainerbattle 0, 588, 0, MtPyre_Summit_Text_10, MtPyre_Summit_Text_11 + trainerbattle 0, 23, 0, MtPyre_Summit_Text_10, MtPyre_Summit_Text_11 msgbox MtPyre_Summit_Text_12, 6 end MtPyre_Summit_EventScript_14:: - trainerbattle 0, 589, 0, MtPyre_Summit_Text_13, MtPyre_Summit_Text_14 + trainerbattle 0, 24, 0, MtPyre_Summit_Text_13, MtPyre_Summit_Text_14 msgbox MtPyre_Summit_Text_15, 6 end MtPyre_Summit_EventScript_15:: - trainerbattle 0, 590, 0, MtPyre_Summit_Text_16, MtPyre_Summit_Text_17 + trainerbattle 0, 25, 0, MtPyre_Summit_Text_16, MtPyre_Summit_Text_17 msgbox MtPyre_Summit_Text_18, 6 end - baserom 0x9cd - MtChimney_Text_3:: - .string "The power contained in the METEORITE...\p" + .string "The power contained in the\n" + .string "METEORITE...\p" .string "By amplifying its power with this\n" .string "machine, MT. CHIMNEY’s volcanic activity\l" - .string "will instantly intensify...\p" - .string "Fufufu... The volcano will erupt, spewing\n" - .string "lava that will cool and harden.\l" - .string "It will expand the landmass...$" + .string "will stop.\p" + .string "Fufufu... Eventually, the cooled-down\n" + .string "crater will fill with rainwater, giving\l" + .string "WATER POKéMON a place to live.$" MtChimney_Text_4:: - .string "MAXIE: You again...\p" + .string "ARCHIE: You again...\p" .string "Now listen.\n" - .string "We humans have grown on dry land.\p" - .string "The land is everything!\n" + .string "All life depends on the sea.\p" + .string "The sea is everything!\n" .string "Its importance is paramount!\p" - .string "That is why we of TEAM MAGMA are\n" - .string "committed to expanding the landmass.\p" - .string "It will create space for new species\n" - .string "of POKéMON to evolve.\p" - .string "It will give us humans more space to\n" - .string "advance.\p" - .string "That is TEAM MAGMA’s vision!\p" + .string "That is why we of TEAM AQUA are\n" + .string "committed to expanding the sea.\p" + .string "Doing so will result in the emergence\n" + .string "of new POKéMON species.\p" + .string "We will return the world back to\n" + .string "nature for the good of POKéMON.\p" + .string "That is TEAM AQUA’s vision!\p" .string "I can’t allow an ignorant child like\n" .string "you to get in our way.\p" - .string "I, MAXIE, will show you the\n" + .string "I, ARCHIE, will show you the\n" .string "consequences of meddling!$" MtChimney_Text_5:: .string "What?!\p" - .string "I, MAXIE, was caught off guard?!$" + .string "I, ARCHIE, was caught off guard?!$" MtChimney_Text_6:: - .string "MAXIE: Ah, whatever.\n" - .string "I will give up our plans for MT. CHIMNEY\l" - .string "for the time being...\p" + .string "ARCHIE: Ah, whatever.\n" + .string "I will give up our plans for MT.\l" + .string "CHIMNEY for the time being...\p" .string "But no one can ever stop us!\n" - .string "TEAM MAGMA will prevail!\p" + .string "TEAM AQUA will prevail!\p" .string "Don’t you ever forget that!$" MtChimney_Text_8:: @@ -59285,11 +59270,11 @@ .string "face a sound whipping!$" MtChimney_Text_25:: - .string "We of TEAM MAGMA are working hard for\n" + .string "We of TEAM AQUA are working hard for\n" .string "everyone’s sake.\p" - .string "Like, if there’s more land, there’d be\n" - .string "more places to live.\l" - .string "Everyone’d be happy!$" + .string "Like, if there’s more water around,\n" + .string "WATER POKéMON will be happy, and it’ll\l" + .string "give people more fun places to swim!$" MtChimney_Text_26:: .string "Hunh?\n" @@ -59302,89 +59287,87 @@ .string "in our way?$" MtChimney_Text_23:: - .string "That annoying TEAM AQUA...\n" + .string "That annoying TEAM MAGMA...\n" .string "They always mess with our plans!$" baserom 0x1f MtChimney_Text_24:: - .string "Go! Stomp TEAM AQUA!\n" - .string "And expand the land!$" + .string "Go! Stomp TEAM MAGMA!\n" + .string "And expand the sea!$" MtChimney_Text_12:: .string "Stay out of our way, okay?\p" - .string "We’re trying to enlarge the landmass\n" - .string "for the good of everybody!$" + .string "We’re trying to enlarge the sea for\n" + .string "the good of everybody!$" MtChimney_Text_11:: .string "Yeah!\n" - .string "Douse them in fire!$" + .string "Hose them down!$" - baserom 0x26 + baserom 0x27 MtChimney_Text_22:: - .string "Bufoh!$" + .string "Bushaa!$" MtChimney_Text_1:: - .string "ARCHIE: Oh, {PLAYER}{KUN}!\p" - .string "Please, you must stop TEAM MAGMA\n" + .string "MAXIE: Oh, {PLAYER}{KUN}!\p" + .string "Please, you must stop TEAM AQUA\n" .string "for me!\p" .string "They’re trying to make this volcano\n" - .string "erupt by using the stolen METEORITE’s\l" - .string "power!\p" - .string "It’s all a part of their plans to\n" - .string "expand the world’s landmass!$" + .string "inactive by using the stolen\l" + .string "METEORITE’s power!$" MtChimney_Text_2:: - .string "ARCHIE: {PLAYER}{KUN}!\p" - .string "Please, you’ve got to stop TEAM MAGMA\n" + .string "MAXIE: {PLAYER}{KUN}!\p" + .string "Please, you’ve got to stop TEAM AQUA\n" .string "for me!\p" .string "Dealing with these three thugs is\n" .string "a lot, even for me!$" MtChimney_Text_7:: - .string "ARCHIE: {PLAYER}{KUN}! Thank you!\p" + .string "MAXIE: {PLAYER}{KUN}! Thank you!\p" .string "With your help, we thwarted TEAM\n" - .string "MAGMA’s destructive plan!\p" + .string "AQUA’s destructive plan!\p" .string "But... This victory doesn’t mean the\n" .string "end of their evil plans.\p" .string "We will remain vigilant and keep up\n" - .string "our pursuit of TEAM MAGMA.\p" + .string "our pursuit of TEAM AQUA.\p" .string "{PLAYER}{KUN}, we shall meet again!$" MtChimney_Text_14:: - .string "Darn... TEAM MAGMA outnumbers us!\n" + .string "Darn... TEAM AQUA outnumbers us!\n" .string "We can’t keep up with them!$" MtChimney_Text_13:: - .string "If they expand the land, there’ll be\n" - .string "less habitats for WATER POKéMON!$" + .string "If they expand the sea, there’ll be less\n" + .string "habitats for POKéMON and people!$" MtChimney_Text_15:: - .string "TEAM MAGMA wants to expand the\n" - .string "landmass... How’s that for insane?$" + .string "TEAM AQUA wants to expand the sea...\n" + .string "How’s that for insane?$" MtChimney_Text_21:: - .string "Bushaa!$" + .string "Bufoh!$" - baserom 0x698 + baserom 0x9fd SeafloorCavern_Room9_Text_1:: - .string "MAXIE: Hold it right there.$" + .string "ARCHIE: Hold it right there.$" SeafloorCavern_Room9_Text_2:: - .string "MAXIE: Fufufu...\n" + .string "ARCHIE: Fufufu...\n" .string "So it was you, after all.$" SeafloorCavern_Room9_Text_3:: - .string "MAXIE: Behold!\p" + .string "ARCHIE: Behold!\p" .string "See how beautiful it is, the sleeping\n" - .string "form of the ancient POKéMON GROUDON!\p" + .string "form of the ancient POKéMON KYOGRE!\p" .string "I have waited so long for this day to\n" .string "come...$" SeafloorCavern_Room9_Text_4:: - .string "MAXIE: It surprises me, how you’ve\n" + .string "ARCHIE: It surprises me, how you’ve\n" .string "managed to chase me here.\p" .string "But that’s all over now.\p" .string "For the realization of my dream,\n" @@ -59395,97 +59378,96 @@ .string "I lost again?$" SeafloorCavern_Room9_Text_6:: - .string "MAXIE: Fufufu...\p" + .string "ARCHIE: Fufufu...\p" .string "I commend you. I must recognize that\n" .string "you are truly gifted.\p" .string "But!\n" .string "I have this in my possession!\p" - .string "With this BLUE ORB, I can make\n" - .string "GROUDON...$" + .string "With this RED ORB, I can make KYOGRE...$" SeafloorCavern_Room9_Text_7:: - .string "The BLUE ORB suddenly began shining\n" + .string "The RED ORB suddenly began shining\n" .string "by itself!$" SeafloorCavern_Room9_Text_8:: - .string "MAXIE: What?!\p" + .string "ARCHIE: What?!\p" .string "I didn’t do anything.\n" - .string "Why did the BLUE ORB...\p" - .string "Where did GROUDON go?$" + .string "Why did the RED ORB...\p" + .string "Where did KYOGRE go?$" SeafloorCavern_Room9_Text_9:: - .string "MAXIE: Hm? It’s a message from our\n" + .string "ARCHIE: Hm? It’s a message from our\n" .string "members outside...$" SeafloorCavern_Room9_Text_10:: - .string "MAXIE: Yes, what is it?\p" + .string "ARCHIE: Yes, what is it?\p" .string "Hm...\n" - .string "The sun is burning brightly?\p" + .string "It’s raining heavily?\p" .string "Good... That should have happened.\n" - .string "That is why we awakened GROUDON,\l" - .string "to realize TEAM MAGMA’s vision of\l" - .string "expanding the world’s landmass.\p" + .string "That is why we awakened KYOGRE,\l" + .string "to realize TEAM AQUA’s vision of\l" + .string "expanding the sea.\p" .string "What?!\p" - .string "It’s far hotter than we envisioned?\n" - .string "It’s so hot that it’s dangerous?\p" + .string "It’s raining far harder than we\n" + .string "envisioned? You’re in danger?\p" .string "That can’t be...\n" .string "That’s just not possible...\p" .string "Hold your position and monitor the\n" .string "situation!$" SeafloorCavern_Room9_Text_11:: - .string "MAXIE: There’s something wrong...\p" - .string "The BLUE ORB is supposed to awaken\n" - .string "and control GROUDON...\p" + .string "ARCHIE: There’s something wrong...\p" + .string "The RED ORB is supposed to awaken\n" + .string "and control KYOGRE...\p" .string "But... Why?\n" - .string "Why did GROUDON disappear?\p" + .string "Why did KYOGRE disappear?\p" .string "Why?!$" SeafloorCavern_Room9_Text_12:: - .string "ARCHIE: What have you wrought?\p" - .string "MAXIE... You’ve finally awoken GROUDON,\n" + .string "MAXIE: What have you wrought?\p" + .string "ARCHIE... You’ve finally awoken KYOGRE,\n" .string "haven’t you?\p" .string "What will happen to the world if this\n" - .string "sunshine continues for all eternity?\p" - .string "The world’s seas will all dry up and\n" - .string "disappear...$" + .string "downpour continues for all eternity?\p" + .string "The world’s landmass will drown in\n" + .string "the deepening sea...$" SeafloorCavern_Room9_Text_13:: - .string "MAXIE: What are you saying?\p" - .string "The BLUE ORB should let me control\n" - .string "GROUDON...\l" + .string "ARCHIE: What are you saying?\p" + .string "The RED ORB should let me control\n" + .string "KYOGRE...\l" .string "That can’t be possible...$" SeafloorCavern_Room9_Text_14:: - .string "ARCHIE: We don’t have the time to\n" + .string "MAXIE: We don’t have the time to\n" .string "argue about it here!\p" .string "Get outside and see for yourself!\p" .string "See if what you’ve wrought is the\n" .string "world that you desired!$" SeafloorCavern_Room9_Text_15:: - .string "ARCHIE: {PLAYER}{KUN}, come on, you have\n" + .string "MAXIE: {PLAYER}{KUN}, come on, you have\n" .string "to get out of here, too!$" - baserom 0xe1 + baserom 0x6b3 CaveOfOrigin_B4F_Text_1:: - .string "{PLAYER}’s RED ORB suddenly began\n" + .string "{PLAYER}’s BLUE ORB suddenly began\n" .string "glowing!$" CaveOfOrigin_B4F_Text_2:: - .string "GROUDON appears to have settled\n" + .string "KYOGRE appears to have settled\n" .string "into sleep again...$" - baserom 0xcc0 + baserom 0x167 MtPyre_Summit_Text_10:: .string "I’ll show you exactly how scary\n" - .string "TEAM MAGMA can be!$" + .string "TEAM AQUA can be!$" MtPyre_Summit_Text_11:: .string "So you think you can stand up alone\n" - .string "to TEAM MAGMA’s might...$" + .string "to TEAM AQUA’s might...$" MtPyre_Summit_Text_12:: .string "Yeah, so you are strong...\n" @@ -59518,12 +59500,12 @@ .string "he was after!$" MtPyre_Summit_Text_19:: - .string "MAXIE: Not you again...\p" + .string "ARCHIE: Not you again...\p" .string "You’ve impeded our plans repeatedly,\n" .string "but this time you’re too late.\p" - .string "The BLUE ORB that rested atop\n" + .string "The RED ORB that rested atop\n" .string "MT. PYRE...\l" - .string "I, MAXIE, claim it as mine!\p" + .string "I, ARCHIE, claim it as mine!\p" .string "Fufufu... Finally, I can realize my\n" .string "grand design...\p" .string "Come on, crew!\n" @@ -59532,46 +59514,46 @@ MtPyre_Summit_Text_20:: .string "Oh, no...\n" .string "This cannot happen...\p" - .string "How could they take the BLUE ORB?\p" + .string "How could they take the RED ORB?\p" .string "The BLUE ORB and RED ORB must never\n" .string "be separated. They belong together.\p" .string "... ... ... ... ... ... ... ...\n" .string "Hmm...\p" .string "Fine!\n" - .string "You take the remaining RED ORB.\p" + .string "You take the remaining BLUE ORB.\p" .string "Please take after that foul man and\n" .string "get the other ORB back!$" MtPyre_Summit_Text_9:: - .string "The RED ORB you have been entrusted\n" - .string "with and the stolen BLUE ORB...\p" + .string "The BLUE ORB you have been entrusted\n" + .string "with and the stolen RED ORB...\p" .string "They must never be apart...\n" .string "Something terrible will happen...$" MtPyre_Summit_Text_8:: .string "So...\n" - .string "GROUDON has awoken...\p" + .string "KYOGRE has awoken...\p" .string "The wondrous ORB that is said to have\n" - .string "becalmed the raging GROUDON...\l" - .string "It is the RED ORB you bear.\p" - .string "That RED ORB was found buried inside\n" + .string "becalmed the raging KYOGRE...\l" + .string "It is the BLUE ORB you bear.\p" + .string "That BLUE ORB was found buried inside\n" .string "the CAVE OF ORIGIN in SOOTOPOLIS...\p" .string "There is perhaps a link between\n" - .string "GROUDON and the CAVE OF ORIGIN...$" + .string "KYOGRE and the CAVE OF ORIGIN...$" MtPyre_Summit_Text_5:: - .string "That man, he returned the BLUE ORB.\p" - .string "Are you going to return the RED ORB\n" + .string "That man, he returned the RED ORB.\p" + .string "Are you going to return the BLUE ORB\n" .string "to its rightful place, too?$" MtPyre_Summit_Text_7:: .string "What’s that?!\p" .string "If the balance is not restored, there\n" .string "is no telling what could happen.\p" - .string "You will return the RED ORB to its\n" + .string "You will return the BLUE ORB to its\n" .string "rightful place, yes?$" - baserom 0x28 + baserom 0x29 MtPyre_Summit_Text_6:: .string "Yes...\n" @@ -59580,12 +59562,12 @@ .string "of all HOENN...$" MtPyre_Summit_Text_4:: - .string "The spirit of the land...\p" - .string "That is what GROUDON is said to be in\n" + .string "The spirit of the sea...\p" + .string "That is what KYOGRE is said to be in\n" .string "POKéMON form...\p" .string "In the same manner that we and POKéMON\n" - .string "have life, this very land is alive...\p" - .string "GROUDON has taught us that...$" + .string "have life, the sea is alive...\p" + .string "KYOGRE has taught us that...$" MtPyre_Summit_Text_1:: .string "MT. PYRE is where we calm the spirits\n" @@ -59601,40 +59583,40 @@ MtPyre_Summit_Text_2:: .string "It happened long, long ago...\p" .string "The world was wracked by a ferocious\n" - .string "clash between the POKéMON of the land\l" - .string "and the POKéMON of the sea...\p" - .string "The POKéMON of the land raised\n" - .string "mountains and created continents...\p" + .string "clash between the POKéMON of the sea\l" + .string "and the POKéMON of the land...\p" .string "The POKéMON of the sea raised huge\n" .string "waves and carved out oceans...\p" + .string "The POKéMON of the land raised\n" + .string "mountains and created continents...\p" .string "Their fierce duel raged without end.\p" - .string "The world was engulfed in vicious\n" - .string "storms and massive infernos.\p" - .string "The RED ORB and the BLUE ORB brought\n" + .string "The world was engulfed in massive\n" + .string "infernos and vicious storms.\p" + .string "The BLUE ORB and the RED ORB brought\n" .string "an end to the calamity.\p" .string "Light poured from the two ORBS and\n" .string "becalmed the enraged adversaries.\p" - .string "The pair, made docile, burrowed deep\n" - .string "under the ground where eventually\l" - .string "they disappeared...$" + .string "The pair, made docile, dove deep into\n" + .string "the sea where eventually they\l" + .string "disappeared...$" MtPyre_Summit_Text_3:: .string "I see...\n" .string "Well, that, too, is fine...$" MtPyre_Summit_Text_21:: - .string "MAXIE: You...\n" - .string "So you stopped GROUDON...\p" + .string "ARCHIE: You...\n" + .string "So you stopped KYOGRE...\p" .string "I shouldn’t be surprised...\p" .string "I understand now that humans cannot\n" .string "freely control the balance between\l" .string "the land and the sea...\p" .string "So I have come to return the\n" - .string "BLUE ORB...\p" + .string "RED ORB...\p" .string "I doubt that we will cross paths again...\n" .string "Farewell...$" - baserom 0x6 + baserom 0xc53 LittlerootTown_BrendansHouse_2F_EventScript_27:: LittlerootTown_MaysHouse_2F_EventScript_10:: @@ -62163,8 +62145,6 @@ .string "enjoyment out of it.\l" .string "It must be that I love POKéMON.$" - baserom 0x99 - Route115_Text_23:: .string "I have a rare POKéMON!\n" .string "Would you like me to show you?$" @@ -62177,6 +62157,8 @@ .string "I have this rare POKéMON.\n" .string "It’s enough to keep me satisfied.$" + baserom 0x99 + Route116_Text_8:: .string "If the tunnel doesn’t go through, then\n" .string "I’ll just go over the top.$"