From 14cb5a3cb097d808e839d677d54a66f176b2e0b7 Mon Sep 17 00:00:00 2001 From: Rangi Date: Tue, 23 Jan 2018 00:30:07 -0500 Subject: =?UTF-8?q?EcruteakHouse=20=E2=86=92=20EcruteakTinTowerEntrance?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- constants/event_flags.asm | 2 +- constants/map_constants.asm | 2 +- data/maps/blocks.asm | 4 +- data/maps/data.asm | 2 +- data/maps/definitions.asm | 2 +- data/maps/scenes.asm | 2 +- data/maps/scripts.asm | 2 +- maps/EcruteakCity.asm | 2 +- maps/EcruteakGym.asm | 2 +- maps/EcruteakHouse.asm | 305 -------------------------------------- maps/EcruteakHouse.blk | 10 -- maps/EcruteakTinTowerEntrance.asm | 305 ++++++++++++++++++++++++++++++++++++++ maps/EcruteakTinTowerEntrance.blk | 10 ++ maps/RadioTower5F.asm | 2 +- maps/WiseTriosRoom.asm | 2 +- wram.asm | 2 +- 16 files changed, 328 insertions(+), 328 deletions(-) delete mode 100644 maps/EcruteakHouse.asm delete mode 100644 maps/EcruteakHouse.blk create mode 100644 maps/EcruteakTinTowerEntrance.asm create mode 100644 maps/EcruteakTinTowerEntrance.blk diff --git a/constants/event_flags.asm b/constants/event_flags.asm index ffe74f1f3..dc1aaafde 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -2043,7 +2043,7 @@ const EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY const EVENT_SAW_SUICUNE_ON_ROUTE_42 const EVENT_SAW_SUICUNE_ON_ROUTE_36 ; 7b0 - const EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE + const EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE const EVENT_TIN_TOWER_1F_SUICUNE const EVENT_TIN_TOWER_1F_ENTEI const EVENT_TIN_TOWER_1F_RAIKOU diff --git a/constants/map_constants.asm b/constants/map_constants.asm index b2f1f5f11..9dbe66a8a 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -145,7 +145,7 @@ ENDM newgroup ; 4 - mapconst ECRUTEAK_HOUSE, 9, 10 ; 1 + mapconst ECRUTEAK_TIN_TOWER_ENTRANCE, 9, 10 ; 1 mapconst WISE_TRIOS_ROOM, 4, 4 ; 2 mapconst ECRUTEAK_POKECENTER_1F, 4, 5 ; 3 mapconst ECRUTEAK_LUGIA_SPEECH_HOUSE, 4, 4 ; 4 diff --git a/data/maps/blocks.asm b/data/maps/blocks.asm index aa5fb9ae9..764ab0a70 100644 --- a/data/maps/blocks.asm +++ b/data/maps/blocks.asm @@ -806,8 +806,8 @@ GoldenrodBikeShop_Blocks: DanceTheatre_Blocks: INCBIN "maps/DanceTheatre.blk" -EcruteakHouse_Blocks: - INCBIN "maps/EcruteakHouse.blk" +EcruteakTinTowerEntrance_Blocks: + INCBIN "maps/EcruteakTinTowerEntrance.blk" GoldenrodGameCorner_Blocks: INCBIN "maps/GoldenrodGameCorner.blk" diff --git a/data/maps/data.asm b/data/maps/data.asm index 6257f4051..b0c7ba02b 100644 --- a/data/maps/data.asm +++ b/data/maps/data.asm @@ -470,7 +470,7 @@ ENDM map_data SafariZoneFuchsiaGateBeta, SAFARI_ZONE_FUCHSIA_GATE_BETA, $00, 0 map_data SafariZoneBeta, SAFARI_ZONE_BETA, $13, 0 map_data VictoryRoad, VICTORY_ROAD, $1d, 0 - map_data EcruteakHouse, ECRUTEAK_HOUSE, $00, 0 + map_data EcruteakTinTowerEntrance, ECRUTEAK_TIN_TOWER_ENTRANCE, $00, 0 map_data WiseTriosRoom, WISE_TRIOS_ROOM, $00, 0 map_data EcruteakPokecenter1F, ECRUTEAK_POKECENTER_1F, $00, 0 map_data EcruteakLugiaSpeechHouse, ECRUTEAK_LUGIA_SPEECH_HOUSE, $00, 0 diff --git a/data/maps/definitions.asm b/data/maps/definitions.asm index 797d2ffee..25b7246bc 100644 --- a/data/maps/definitions.asm +++ b/data/maps/definitions.asm @@ -163,7 +163,7 @@ MapGroup_Dungeons: map_def VictoryRoad, TILESET_CAVE, CAVE, VICTORY_ROAD, MUSIC_VICTORY_ROAD, TRUE, PALETTE_NITE, FISHGROUP_SHORE MapGroup_Ecruteak: - map_def EcruteakHouse, TILESET_TOWER, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map_def EcruteakTinTowerEntrance, TILESET_TOWER, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def WiseTriosRoom, TILESET_TRADITIONAL_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE map_def EcruteakPokecenter1F, TILESET_POKECENTER, INDOOR, ECRUTEAK_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def EcruteakLugiaSpeechHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE diff --git a/data/maps/scenes.asm b/data/maps/scenes.asm index 46358f284..89ec3ad31 100644 --- a/data/maps/scenes.asm +++ b/data/maps/scenes.asm @@ -43,7 +43,7 @@ MapScenes:: ; 4d01e scene_def OLIVINE_CITY, wOlivineCitySceneID scene_def ROUTE_34, wRoute34SceneID scene_def ROUTE_34_ILEX_FOREST_GATE, wRoute34IlexForestGateSceneID - scene_def ECRUTEAK_HOUSE, wEcruteakHouseSceneID + scene_def ECRUTEAK_TIN_TOWER_ENTRANCE, wEcruteakTinTowerEntranceSceneID scene_def WISE_TRIOS_ROOM, wWiseTriosRoomSceneID scene_def ECRUTEAK_POKECENTER_1F, wEcruteakPokecenter1FSceneID scene_def ECRUTEAK_GYM, wEcruteakGymSceneID diff --git a/data/maps/scripts.asm b/data/maps/scripts.asm index 94be9db35..e7631dcaf 100644 --- a/data/maps/scripts.asm +++ b/data/maps/scripts.asm @@ -191,7 +191,7 @@ INCLUDE "maps/Route12SuperRodHouse.asm" SECTION "Map Scripts 11", ROMX -INCLUDE "maps/EcruteakHouse.asm" +INCLUDE "maps/EcruteakTinTowerEntrance.asm" INCLUDE "maps/WiseTriosRoom.asm" INCLUDE "maps/EcruteakPokecenter1F.asm" INCLUDE "maps/EcruteakLugiaSpeechHouse.asm" diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index 5e3dada98..4f8c46c7a 100644 --- a/maps/EcruteakCity.asm +++ b/maps/EcruteakCity.asm @@ -267,7 +267,7 @@ EcruteakCity_MapEvents: db 15 warp_def 35, 26, 1, ROUTE_42_ECRUTEAK_GATE warp_def 35, 27, 2, ROUTE_42_ECRUTEAK_GATE - warp_def 18, 11, 1, ECRUTEAK_HOUSE + warp_def 18, 11, 1, ECRUTEAK_TIN_TOWER_ENTRANCE warp_def 20, 2, 1, WISE_TRIOS_ROOM warp_def 20, 3, 2, WISE_TRIOS_ROOM warp_def 23, 27, 1, ECRUTEAK_POKECENTER_1F diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index 70776d1ee..ea6448ecc 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -43,7 +43,7 @@ MortyScript_0x99d58: setflag ENGINE_FOGBADGE checkcode VAR_BADGES scall EcruteakGymActivateRockets - setmapscene ECRUTEAK_HOUSE, 1 + setmapscene ECRUTEAK_TIN_TOWER_ENTRANCE, 1 setevent EVENT_RANG_CLEAR_BELL_1 setevent EVENT_RANG_CLEAR_BELL_2 .FightDone: diff --git a/maps/EcruteakHouse.asm b/maps/EcruteakHouse.asm deleted file mode 100644 index 436bdd0e3..000000000 --- a/maps/EcruteakHouse.asm +++ /dev/null @@ -1,305 +0,0 @@ -const_value set 2 - const ECRUTEAKHOUSE_SAGE1 - const ECRUTEAKHOUSE_SAGE2 - const ECRUTEAKHOUSE_SAGE3 - const ECRUTEAKHOUSE_GRAMPS - -EcruteakHouse_MapScripts: -.SceneScripts: - db 2 - scene_script .DummyScene0 - scene_script .DummyScene1 - -.MapCallbacks: - db 1 - callback MAPCALLBACK_OBJECTS, .InitializeSages - -.DummyScene0: - end - -.DummyScene1: - end - -.InitializeSages: - checkevent EVENT_FOUGHT_SUICUNE - iftrue .DontBlockTower - checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER - iftrue .DontBlockTower - checkevent EVENT_CLEARED_RADIO_TOWER - iftrue .BlockTower - return - -.BlockTower: - clearevent EVENT_RANG_CLEAR_BELL_1 - setevent EVENT_RANG_CLEAR_BELL_2 - setevent EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE - checkitem CLEAR_BELL - iftrue .NoClearBell - setscene 0 -.NoClearBell: - return - -.DontBlockTower: - clearevent EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE - return - -EcruteakHouse_CoordEvent1: - checkevent EVENT_RANG_CLEAR_BELL_2 - iftrue EcruteakHouse_CoordEvent_DontMove - applymovement ECRUTEAKHOUSE_SAGE2, MovementData_0x980c7 - moveobject ECRUTEAKHOUSE_SAGE1, 4, 6 - appear ECRUTEAKHOUSE_SAGE1 - pause 5 - disappear ECRUTEAKHOUSE_SAGE2 - end - -EcruteakHouse_CoordEvent2: - checkevent EVENT_RANG_CLEAR_BELL_1 - iftrue EcruteakHouse_CoordEvent_DontMove - applymovement ECRUTEAKHOUSE_SAGE1, MovementData_0x980cc - moveobject ECRUTEAKHOUSE_SAGE2, 5, 6 - appear ECRUTEAKHOUSE_SAGE2 - pause 5 - disappear ECRUTEAKHOUSE_SAGE1 - end - -EcruteakHouse_CoordEvent_DontMove: - end - -SageScript_0x98062: - faceplayer - opentext - checkevent EVENT_CLEARED_RADIO_TOWER - iftrue .CheckForClearBell - checkflag ENGINE_FOGBADGE - iftrue .BlockPassage_GotFogBadge - writetext UnknownText_0x980d1 - waitbutton - closetext - end - -.BlockPassage_GotFogBadge: - writetext UnknownText_0x98131 - waitbutton - closetext - end - -.CheckForClearBell: - checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER - iftrue .AllowedThrough - checkevent EVENT_GAVE_KURT_APRICORNS - iftrue .Event000 - checkitem CLEAR_BELL - iftrue .RingClearBell - writetext UnknownText_0x981a4 - waitbutton - closetext - end - -.RingClearBell: - writetext UnknownText_0x98250 - waitbutton - closetext - setscene 1 - setevent EVENT_RANG_CLEAR_BELL_2 - clearevent EVENT_RANG_CLEAR_BELL_1 - setevent EVENT_GAVE_KURT_APRICORNS - end - -.AllowedThrough: - writetext UnknownText_0x9837e - waitbutton - closetext - end - -.Event000: - writetext UnknownText_0x98391 - waitbutton - closetext - end - -SageScript_0x980b0: - faceplayer - opentext - checkevent EVENT_GOT_CLEAR_BELL - iftrue .GotClearBell - writetext UnknownText_0x9840b - waitbutton - closetext - end - -.GotClearBell: - writetext UnknownText_0x9846f - waitbutton - closetext - end - -EcruteakHouseGrampsScript: - jumptextfaceplayer EcruteakHouseGrampsText - -MovementData_0x980c7: - fix_facing - big_step LEFT - remove_fixed_facing - turn_head DOWN - step_end - -MovementData_0x980cc: - fix_facing - big_step RIGHT - remove_fixed_facing - turn_head DOWN - step_end - -UnknownText_0x980d1: - text "TIN TOWER is off" - line "limits to anyone" - - para "without ECRUTEAK" - line "GYM's BADGE." - - para "Sorry, but you'll" - line "have to leave." - done - -UnknownText_0x98131: - text "TIN TOWER is off" - line "limits to anyone" - - para "without ECRUTEAK" - line "GYM's BADGE." - - para "Ah!" - - para "ECRUTEAK's GYM" - line "BADGE! Please, go" - cont "right through." - done - -UnknownText_0x981a4: - text "A momentous event" - line "has occurred." - - para "I beg your pardon," - line "but I must ask you" - cont "to leave." - - para "…What soothes the" - line "soul…" - - para "The WISE TRIO say" - line "things that are so" - - para "very difficult to" - line "understand…" - done - -UnknownText_0x98250: - text "A momentous event" - line "has occurred." - - para "I beg your pardon," - line "but I must ask you" - cont "to leave." - - para "<……><……><……>" - - para "Ah!" - - para "The sound of that" - line "CLEAR BELL!" - - para "It… It's sublime!" - - para "I've never heard" - line "so beautiful a" - cont "sound before!" - - para "That bell's chime" - line "is indicative of" - cont "the bearer's soul." - - para "You…" - - para "You may be able to" - line "make it through" - cont "TIN TOWER." - - para "Please, do go on." - done - -UnknownText_0x9837e: - text "Please, do go on." - done - -UnknownText_0x98391: - text "That bell's chime" - line "is indicative of" - cont "the bearer's soul." - - para "You…" - - para "You may be able to" - line "make it through" - cont "TIN TOWER." - - para "Please, do go on." - done - -UnknownText_0x9840b: - text "The TIN TOWER" - line "ahead is a nine-" - - para "tier tower of" - line "divine beauty." - - para "It soothes the" - line "soul of all who" - cont "see it." - done - -UnknownText_0x9846f: - text "The TIN TOWER" - line "shook! A #MON" - - para "must have returned" - line "to the top!" - done - -EcruteakHouseGrampsText: - text "Two towers…" - line "Two #MON…" - - para "But when one" - line "burned down, both" - - para "#MON flew away," - line "never to return." - done - -EcruteakHouse_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 5 - warp_def 4, 17, 3, ECRUTEAK_CITY - warp_def 5, 17, 3, ECRUTEAK_CITY - warp_def 5, 3, 4, ECRUTEAK_HOUSE - warp_def 17, 15, 3, ECRUTEAK_HOUSE - warp_def 17, 3, 3, WISE_TRIOS_ROOM - -.CoordEvents: - db 2 - coord_event 4, 7, 0, EcruteakHouse_CoordEvent1 - coord_event 5, 7, 0, EcruteakHouse_CoordEvent2 - -.BGEvents: - db 0 - -.ObjectEvents: - db 4 - object_event 4, 6, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_1 - object_event 5, 6, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_2 - object_event 6, 9, SPRITE_SAGE, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SageScript_0x980b0, EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE - object_event 3, 11, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakHouseGrampsScript, EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE diff --git a/maps/EcruteakHouse.blk b/maps/EcruteakHouse.blk deleted file mode 100644 index 8f74a6559..000000000 --- a/maps/EcruteakHouse.blk +++ /dev/null @@ -1,10 +0,0 @@ -!" -  - -     -   -   -  - ! " - -&   \ No newline at end of file diff --git a/maps/EcruteakTinTowerEntrance.asm b/maps/EcruteakTinTowerEntrance.asm new file mode 100644 index 000000000..f94e462e4 --- /dev/null +++ b/maps/EcruteakTinTowerEntrance.asm @@ -0,0 +1,305 @@ +const_value set 2 + const ECRUTEAKTINTOWERENTRANCE_SAGE1 + const ECRUTEAKTINTOWERENTRANCE_SAGE2 + const ECRUTEAKTINTOWERENTRANCE_SAGE3 + const ECRUTEAKTINTOWERENTRANCE_GRAMPS + +EcruteakTinTowerEntrance_MapScripts: +.SceneScripts: + db 2 + scene_script .DummyScene0 + scene_script .DummyScene1 + +.MapCallbacks: + db 1 + callback MAPCALLBACK_OBJECTS, .InitializeSages + +.DummyScene0: + end + +.DummyScene1: + end + +.InitializeSages: + checkevent EVENT_FOUGHT_SUICUNE + iftrue .DontBlockTower + checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER + iftrue .DontBlockTower + checkevent EVENT_CLEARED_RADIO_TOWER + iftrue .BlockTower + return + +.BlockTower: + clearevent EVENT_RANG_CLEAR_BELL_1 + setevent EVENT_RANG_CLEAR_BELL_2 + setevent EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE + checkitem CLEAR_BELL + iftrue .NoClearBell + setscene 0 +.NoClearBell: + return + +.DontBlockTower: + clearevent EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE + return + +EcruteakTinTowerEntrance_CoordEvent1: + checkevent EVENT_RANG_CLEAR_BELL_2 + iftrue EcruteakTinTowerEntrance_CoordEvent_DontMove + applymovement ECRUTEAKTINTOWERENTRANCE_SAGE2, MovementData_0x980c7 + moveobject ECRUTEAKTINTOWERENTRANCE_SAGE1, 4, 6 + appear ECRUTEAKTINTOWERENTRANCE_SAGE1 + pause 5 + disappear ECRUTEAKTINTOWERENTRANCE_SAGE2 + end + +EcruteakTinTowerEntrance_CoordEvent2: + checkevent EVENT_RANG_CLEAR_BELL_1 + iftrue EcruteakTinTowerEntrance_CoordEvent_DontMove + applymovement ECRUTEAKTINTOWERENTRANCE_SAGE1, MovementData_0x980cc + moveobject ECRUTEAKTINTOWERENTRANCE_SAGE2, 5, 6 + appear ECRUTEAKTINTOWERENTRANCE_SAGE2 + pause 5 + disappear ECRUTEAKTINTOWERENTRANCE_SAGE1 + end + +EcruteakTinTowerEntrance_CoordEvent_DontMove: + end + +SageScript_0x98062: + faceplayer + opentext + checkevent EVENT_CLEARED_RADIO_TOWER + iftrue .CheckForClearBell + checkflag ENGINE_FOGBADGE + iftrue .BlockPassage_GotFogBadge + writetext UnknownText_0x980d1 + waitbutton + closetext + end + +.BlockPassage_GotFogBadge: + writetext UnknownText_0x98131 + waitbutton + closetext + end + +.CheckForClearBell: + checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER + iftrue .AllowedThrough + checkevent EVENT_GAVE_KURT_APRICORNS + iftrue .Event000 + checkitem CLEAR_BELL + iftrue .RingClearBell + writetext UnknownText_0x981a4 + waitbutton + closetext + end + +.RingClearBell: + writetext UnknownText_0x98250 + waitbutton + closetext + setscene 1 + setevent EVENT_RANG_CLEAR_BELL_2 + clearevent EVENT_RANG_CLEAR_BELL_1 + setevent EVENT_GAVE_KURT_APRICORNS + end + +.AllowedThrough: + writetext UnknownText_0x9837e + waitbutton + closetext + end + +.Event000: + writetext UnknownText_0x98391 + waitbutton + closetext + end + +SageScript_0x980b0: + faceplayer + opentext + checkevent EVENT_GOT_CLEAR_BELL + iftrue .GotClearBell + writetext UnknownText_0x9840b + waitbutton + closetext + end + +.GotClearBell: + writetext UnknownText_0x9846f + waitbutton + closetext + end + +EcruteakTinTowerEntranceGrampsScript: + jumptextfaceplayer EcruteakTinTowerEntranceGrampsText + +MovementData_0x980c7: + fix_facing + big_step LEFT + remove_fixed_facing + turn_head DOWN + step_end + +MovementData_0x980cc: + fix_facing + big_step RIGHT + remove_fixed_facing + turn_head DOWN + step_end + +UnknownText_0x980d1: + text "TIN TOWER is off" + line "limits to anyone" + + para "without ECRUTEAK" + line "GYM's BADGE." + + para "Sorry, but you'll" + line "have to leave." + done + +UnknownText_0x98131: + text "TIN TOWER is off" + line "limits to anyone" + + para "without ECRUTEAK" + line "GYM's BADGE." + + para "Ah!" + + para "ECRUTEAK's GYM" + line "BADGE! Please, go" + cont "right through." + done + +UnknownText_0x981a4: + text "A momentous event" + line "has occurred." + + para "I beg your pardon," + line "but I must ask you" + cont "to leave." + + para "…What soothes the" + line "soul…" + + para "The WISE TRIO say" + line "things that are so" + + para "very difficult to" + line "understand…" + done + +UnknownText_0x98250: + text "A momentous event" + line "has occurred." + + para "I beg your pardon," + line "but I must ask you" + cont "to leave." + + para "<……><……><……>" + + para "Ah!" + + para "The sound of that" + line "CLEAR BELL!" + + para "It… It's sublime!" + + para "I've never heard" + line "so beautiful a" + cont "sound before!" + + para "That bell's chime" + line "is indicative of" + cont "the bearer's soul." + + para "You…" + + para "You may be able to" + line "make it through" + cont "TIN TOWER." + + para "Please, do go on." + done + +UnknownText_0x9837e: + text "Please, do go on." + done + +UnknownText_0x98391: + text "That bell's chime" + line "is indicative of" + cont "the bearer's soul." + + para "You…" + + para "You may be able to" + line "make it through" + cont "TIN TOWER." + + para "Please, do go on." + done + +UnknownText_0x9840b: + text "The TIN TOWER" + line "ahead is a nine-" + + para "tier tower of" + line "divine beauty." + + para "It soothes the" + line "soul of all who" + cont "see it." + done + +UnknownText_0x9846f: + text "The TIN TOWER" + line "shook! A #MON" + + para "must have returned" + line "to the top!" + done + +EcruteakTinTowerEntranceGrampsText: + text "Two towers…" + line "Two #MON…" + + para "But when one" + line "burned down, both" + + para "#MON flew away," + line "never to return." + done + +EcruteakTinTowerEntrance_MapEvents: + ; filler + db 0, 0 + +.Warps: + db 5 + warp_def 4, 17, 3, ECRUTEAK_CITY + warp_def 5, 17, 3, ECRUTEAK_CITY + warp_def 5, 3, 4, ECRUTEAK_TIN_TOWER_ENTRANCE + warp_def 17, 15, 3, ECRUTEAK_TIN_TOWER_ENTRANCE + warp_def 17, 3, 3, WISE_TRIOS_ROOM + +.CoordEvents: + db 2 + coord_event 4, 7, 0, EcruteakTinTowerEntrance_CoordEvent1 + coord_event 5, 7, 0, EcruteakTinTowerEntrance_CoordEvent2 + +.BGEvents: + db 0 + +.ObjectEvents: + db 4 + object_event 4, 6, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_1 + object_event 5, 6, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_2 + object_event 6, 9, SPRITE_SAGE, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SageScript_0x980b0, EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE + object_event 3, 11, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakTinTowerEntranceGrampsScript, EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE diff --git a/maps/EcruteakTinTowerEntrance.blk b/maps/EcruteakTinTowerEntrance.blk new file mode 100644 index 000000000..8f74a6559 --- /dev/null +++ b/maps/EcruteakTinTowerEntrance.blk @@ -0,0 +1,10 @@ +!" +  + +     +   +   +  + ! " + +&   \ No newline at end of file diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index 009c1e91d..fe9f38792 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -127,7 +127,7 @@ RadioTower5FRocketBossScene: waitbutton closetext setscene 2 - setmapscene ECRUTEAK_HOUSE, 0 + setmapscene ECRUTEAK_TIN_TOWER_ENTRANCE, 0 setevent EVENT_GOT_CLEAR_BELL setevent EVENT_TEAM_ROCKET_DISBANDED jump .UselessJump diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm index ef30655c2..128fa2632 100644 --- a/maps/WiseTriosRoom.asm +++ b/maps/WiseTriosRoom.asm @@ -352,7 +352,7 @@ WiseTriosRoom_MapEvents: db 3 warp_def 7, 4, 4, ECRUTEAK_CITY warp_def 7, 5, 5, ECRUTEAK_CITY - warp_def 1, 4, 5, ECRUTEAK_HOUSE + warp_def 1, 4, 5, ECRUTEAK_TIN_TOWER_ENTRANCE .CoordEvents: db 1 diff --git a/wram.asm b/wram.asm index 7830cef72..c26a6f386 100644 --- a/wram.asm +++ b/wram.asm @@ -2538,7 +2538,7 @@ wGoldenrodPokecenter1FSceneID:: db ; d993 wOlivineCitySceneID:: db ; d994 wRoute34SceneID:: db ; d995 wRoute34IlexForestGateSceneID:: db ; d996 -wEcruteakHouseSceneID:: db ; d997 +wEcruteakTinTowerEntranceSceneID:: db ; d997 wWiseTriosRoomSceneID:: db ; d998 wEcruteakPokecenter1FSceneID:: db ; d999 wEcruteakGymSceneID:: db ; d99a -- cgit v1.2.3