From 14cb5a3cb097d808e839d677d54a66f176b2e0b7 Mon Sep 17 00:00:00 2001 From: Rangi Date: Tue, 23 Jan 2018 00:30:07 -0500 Subject: [PATCH] =?UTF-8?q?EcruteakHouse=20=E2=86=92=20EcruteakTinTowerEnt?= =?UTF-8?q?rance?= 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 +- ...House.asm => EcruteakTinTowerEntrance.asm} | 60 +++++++++---------- ...House.blk => EcruteakTinTowerEntrance.blk} | 0 maps/RadioTower5F.asm | 2 +- maps/WiseTriosRoom.asm | 2 +- wram.asm | 2 +- 14 files changed, 43 insertions(+), 43 deletions(-) rename maps/{EcruteakHouse.asm => EcruteakTinTowerEntrance.asm} (76%) rename maps/{EcruteakHouse.blk => EcruteakTinTowerEntrance.blk} (100%) 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/EcruteakTinTowerEntrance.asm similarity index 76% rename from maps/EcruteakHouse.asm rename to maps/EcruteakTinTowerEntrance.asm index 436bdd0e3..f94e462e4 100644 --- a/maps/EcruteakHouse.asm +++ b/maps/EcruteakTinTowerEntrance.asm @@ -1,10 +1,10 @@ const_value set 2 - const ECRUTEAKHOUSE_SAGE1 - const ECRUTEAKHOUSE_SAGE2 - const ECRUTEAKHOUSE_SAGE3 - const ECRUTEAKHOUSE_GRAMPS + const ECRUTEAKTINTOWERENTRANCE_SAGE1 + const ECRUTEAKTINTOWERENTRANCE_SAGE2 + const ECRUTEAKTINTOWERENTRANCE_SAGE3 + const ECRUTEAKTINTOWERENTRANCE_GRAMPS -EcruteakHouse_MapScripts: +EcruteakTinTowerEntrance_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -32,7 +32,7 @@ EcruteakHouse_MapScripts: .BlockTower: clearevent EVENT_RANG_CLEAR_BELL_1 setevent EVENT_RANG_CLEAR_BELL_2 - setevent EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE + setevent EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE checkitem CLEAR_BELL iftrue .NoClearBell setscene 0 @@ -40,30 +40,30 @@ EcruteakHouse_MapScripts: return .DontBlockTower: - clearevent EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE + clearevent EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE return -EcruteakHouse_CoordEvent1: +EcruteakTinTowerEntrance_CoordEvent1: checkevent EVENT_RANG_CLEAR_BELL_2 - iftrue EcruteakHouse_CoordEvent_DontMove - applymovement ECRUTEAKHOUSE_SAGE2, MovementData_0x980c7 - moveobject ECRUTEAKHOUSE_SAGE1, 4, 6 - appear ECRUTEAKHOUSE_SAGE1 + iftrue EcruteakTinTowerEntrance_CoordEvent_DontMove + applymovement ECRUTEAKTINTOWERENTRANCE_SAGE2, MovementData_0x980c7 + moveobject ECRUTEAKTINTOWERENTRANCE_SAGE1, 4, 6 + appear ECRUTEAKTINTOWERENTRANCE_SAGE1 pause 5 - disappear ECRUTEAKHOUSE_SAGE2 + disappear ECRUTEAKTINTOWERENTRANCE_SAGE2 end -EcruteakHouse_CoordEvent2: +EcruteakTinTowerEntrance_CoordEvent2: checkevent EVENT_RANG_CLEAR_BELL_1 - iftrue EcruteakHouse_CoordEvent_DontMove - applymovement ECRUTEAKHOUSE_SAGE1, MovementData_0x980cc - moveobject ECRUTEAKHOUSE_SAGE2, 5, 6 - appear ECRUTEAKHOUSE_SAGE2 + iftrue EcruteakTinTowerEntrance_CoordEvent_DontMove + applymovement ECRUTEAKTINTOWERENTRANCE_SAGE1, MovementData_0x980cc + moveobject ECRUTEAKTINTOWERENTRANCE_SAGE2, 5, 6 + appear ECRUTEAKTINTOWERENTRANCE_SAGE2 pause 5 - disappear ECRUTEAKHOUSE_SAGE1 + disappear ECRUTEAKTINTOWERENTRANCE_SAGE1 end -EcruteakHouse_CoordEvent_DontMove: +EcruteakTinTowerEntrance_CoordEvent_DontMove: end SageScript_0x98062: @@ -134,8 +134,8 @@ SageScript_0x980b0: closetext end -EcruteakHouseGrampsScript: - jumptextfaceplayer EcruteakHouseGrampsText +EcruteakTinTowerEntranceGrampsScript: + jumptextfaceplayer EcruteakTinTowerEntranceGrampsText MovementData_0x980c7: fix_facing @@ -266,7 +266,7 @@ UnknownText_0x9846f: line "to the top!" done -EcruteakHouseGrampsText: +EcruteakTinTowerEntranceGrampsText: text "Two towers…" line "Two #MON…" @@ -277,7 +277,7 @@ EcruteakHouseGrampsText: line "never to return." done -EcruteakHouse_MapEvents: +EcruteakTinTowerEntrance_MapEvents: ; filler db 0, 0 @@ -285,14 +285,14 @@ EcruteakHouse_MapEvents: 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 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, EcruteakHouse_CoordEvent1 - coord_event 5, 7, 0, EcruteakHouse_CoordEvent2 + coord_event 4, 7, 0, EcruteakTinTowerEntrance_CoordEvent1 + coord_event 5, 7, 0, EcruteakTinTowerEntrance_CoordEvent2 .BGEvents: db 0 @@ -301,5 +301,5 @@ EcruteakHouse_MapEvents: 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 + 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/EcruteakHouse.blk b/maps/EcruteakTinTowerEntrance.blk similarity index 100% rename from maps/EcruteakHouse.blk rename to maps/EcruteakTinTowerEntrance.blk 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