pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

EcruteakHouse → EcruteakTinTowerEntrance

Browse Source
This commit is contained in:
Rangi 2018-01-23 00:30:07 -05:00
parent 689de5e379
commit 14cb5a3cb0
14 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
constants/event_flags.asm
View File

@ -2043,7 +2043,7 @@
const EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY const EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
const EVENT_SAW_SUICUNE_ON_ROUTE_42 const EVENT_SAW_SUICUNE_ON_ROUTE_42
const EVENT_SAW_SUICUNE_ON_ROUTE_36 ; 7b0 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_SUICUNE
const EVENT_TIN_TOWER_1F_ENTEI const EVENT_TIN_TOWER_1F_ENTEI
const EVENT_TIN_TOWER_1F_RAIKOU const EVENT_TIN_TOWER_1F_RAIKOU

2
constants/map_constants.asm
View File

@ -145,7 +145,7 @@ ENDM
newgroup ; 4 newgroup ; 4
mapconst ECRUTEAK_HOUSE, 9, 10 ; 1 mapconst ECRUTEAK_TIN_TOWER_ENTRANCE, 9, 10 ; 1
mapconst WISE_TRIOS_ROOM, 4, 4 ; 2 mapconst WISE_TRIOS_ROOM, 4, 4 ; 2
mapconst ECRUTEAK_POKECENTER_1F, 4, 5 ; 3 mapconst ECRUTEAK_POKECENTER_1F, 4, 5 ; 3
mapconst ECRUTEAK_LUGIA_SPEECH_HOUSE, 4, 4 ; 4 mapconst ECRUTEAK_LUGIA_SPEECH_HOUSE, 4, 4 ; 4

4
data/maps/blocks.asm
View File

@ -806,8 +806,8 @@ GoldenrodBikeShop_Blocks:
DanceTheatre_Blocks: DanceTheatre_Blocks:
INCBIN "maps/DanceTheatre.blk" INCBIN "maps/DanceTheatre.blk"
EcruteakHouse_Blocks: EcruteakTinTowerEntrance_Blocks:
INCBIN "maps/EcruteakHouse.blk" INCBIN "maps/EcruteakTinTowerEntrance.blk"
GoldenrodGameCorner_Blocks: GoldenrodGameCorner_Blocks:
INCBIN "maps/GoldenrodGameCorner.blk" INCBIN "maps/GoldenrodGameCorner.blk"

2
data/maps/data.asm
View File

@ -470,7 +470,7 @@ ENDM
map_data SafariZoneFuchsiaGateBeta, SAFARI_ZONE_FUCHSIA_GATE_BETA, $00, 0 map_data SafariZoneFuchsiaGateBeta, SAFARI_ZONE_FUCHSIA_GATE_BETA, $00, 0
map_data SafariZoneBeta, SAFARI_ZONE_BETA, $13, 0 map_data SafariZoneBeta, SAFARI_ZONE_BETA, $13, 0
map_data VictoryRoad, VICTORY_ROAD, $1d, 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 WiseTriosRoom, WISE_TRIOS_ROOM, $00, 0
map_data EcruteakPokecenter1F, ECRUTEAK_POKECENTER_1F, $00, 0 map_data EcruteakPokecenter1F, ECRUTEAK_POKECENTER_1F, $00, 0
map_data EcruteakLugiaSpeechHouse, ECRUTEAK_LUGIA_SPEECH_HOUSE, $00, 0 map_data EcruteakLugiaSpeechHouse, ECRUTEAK_LUGIA_SPEECH_HOUSE, $00, 0

2
data/maps/definitions.asm
View File

@ -163,7 +163,7 @@ MapGroup_Dungeons:
map_def VictoryRoad, TILESET_CAVE, CAVE, VICTORY_ROAD, MUSIC_VICTORY_ROAD, TRUE, PALETTE_NITE, FISHGROUP_SHORE map_def VictoryRoad, TILESET_CAVE, CAVE, VICTORY_ROAD, MUSIC_VICTORY_ROAD, TRUE, PALETTE_NITE, FISHGROUP_SHORE
MapGroup_Ecruteak: 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 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 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 map_def EcruteakLugiaSpeechHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

2
data/maps/scenes.asm
View File

@ -43,7 +43,7 @@ MapScenes:: ; 4d01e
scene_def OLIVINE_CITY, wOlivineCitySceneID scene_def OLIVINE_CITY, wOlivineCitySceneID
scene_def ROUTE_34, wRoute34SceneID scene_def ROUTE_34, wRoute34SceneID
scene_def ROUTE_34_ILEX_FOREST_GATE, wRoute34IlexForestGateSceneID 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 WISE_TRIOS_ROOM, wWiseTriosRoomSceneID
scene_def ECRUTEAK_POKECENTER_1F, wEcruteakPokecenter1FSceneID scene_def ECRUTEAK_POKECENTER_1F, wEcruteakPokecenter1FSceneID
scene_def ECRUTEAK_GYM, wEcruteakGymSceneID scene_def ECRUTEAK_GYM, wEcruteakGymSceneID

2
data/maps/scripts.asm
View File

@ -191,7 +191,7 @@ INCLUDE "maps/Route12SuperRodHouse.asm"
SECTION "Map Scripts 11", ROMX SECTION "Map Scripts 11", ROMX
INCLUDE "maps/EcruteakHouse.asm" INCLUDE "maps/EcruteakTinTowerEntrance.asm"
INCLUDE "maps/WiseTriosRoom.asm" INCLUDE "maps/WiseTriosRoom.asm"
INCLUDE "maps/EcruteakPokecenter1F.asm" INCLUDE "maps/EcruteakPokecenter1F.asm"
INCLUDE "maps/EcruteakLugiaSpeechHouse.asm" INCLUDE "maps/EcruteakLugiaSpeechHouse.asm"

2
maps/EcruteakCity.asm
View File

@ -267,7 +267,7 @@ EcruteakCity_MapEvents:
db 15 db 15
warp_def 35, 26, 1, ROUTE_42_ECRUTEAK_GATE warp_def 35, 26, 1, ROUTE_42_ECRUTEAK_GATE
warp_def 35, 27, 2, 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, 2, 1, WISE_TRIOS_ROOM
warp_def 20, 3, 2, WISE_TRIOS_ROOM warp_def 20, 3, 2, WISE_TRIOS_ROOM
warp_def 23, 27, 1, ECRUTEAK_POKECENTER_1F warp_def 23, 27, 1, ECRUTEAK_POKECENTER_1F

2
maps/EcruteakGym.asm
View File

@ -43,7 +43,7 @@ MortyScript_0x99d58:
setflag ENGINE_FOGBADGE setflag ENGINE_FOGBADGE
checkcode VAR_BADGES checkcode VAR_BADGES
scall EcruteakGymActivateRockets scall EcruteakGymActivateRockets
setmapscene ECRUTEAK_HOUSE, 1 setmapscene ECRUTEAK_TIN_TOWER_ENTRANCE, 1
setevent EVENT_RANG_CLEAR_BELL_1 setevent EVENT_RANG_CLEAR_BELL_1
setevent EVENT_RANG_CLEAR_BELL_2 setevent EVENT_RANG_CLEAR_BELL_2
.FightDone: .FightDone:

60
maps/EcruteakHouse.asm → maps/EcruteakTinTowerEntrance.asm
View File

@ -1,10 +1,10 @@
const_value set 2 const_value set 2
const ECRUTEAKHOUSE_SAGE1 const ECRUTEAKTINTOWERENTRANCE_SAGE1
const ECRUTEAKHOUSE_SAGE2 const ECRUTEAKTINTOWERENTRANCE_SAGE2
const ECRUTEAKHOUSE_SAGE3 const ECRUTEAKTINTOWERENTRANCE_SAGE3
const ECRUTEAKHOUSE_GRAMPS const ECRUTEAKTINTOWERENTRANCE_GRAMPS
EcruteakHouse_MapScripts: EcruteakTinTowerEntrance_MapScripts:
.SceneScripts: .SceneScripts:
db 2 db 2
scene_script .DummyScene0 scene_script .DummyScene0
@ -32,7 +32,7 @@ EcruteakHouse_MapScripts:
.BlockTower: .BlockTower:
clearevent EVENT_RANG_CLEAR_BELL_1 clearevent EVENT_RANG_CLEAR_BELL_1
setevent EVENT_RANG_CLEAR_BELL_2 setevent EVENT_RANG_CLEAR_BELL_2
setevent EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE setevent EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE
checkitem CLEAR_BELL checkitem CLEAR_BELL
iftrue .NoClearBell iftrue .NoClearBell
setscene 0 setscene 0
@ -40,30 +40,30 @@ EcruteakHouse_MapScripts:
return return
.DontBlockTower: .DontBlockTower:
clearevent EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE clearevent EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE
return return
EcruteakHouse_CoordEvent1: EcruteakTinTowerEntrance_CoordEvent1:
checkevent EVENT_RANG_CLEAR_BELL_2 checkevent EVENT_RANG_CLEAR_BELL_2
iftrue EcruteakHouse_CoordEvent_DontMove iftrue EcruteakTinTowerEntrance_CoordEvent_DontMove
applymovement ECRUTEAKHOUSE_SAGE2, MovementData_0x980c7 applymovement ECRUTEAKTINTOWERENTRANCE_SAGE2, MovementData_0x980c7
moveobject ECRUTEAKHOUSE_SAGE1, 4, 6 moveobject ECRUTEAKTINTOWERENTRANCE_SAGE1, 4, 6
appear ECRUTEAKHOUSE_SAGE1 appear ECRUTEAKTINTOWERENTRANCE_SAGE1
pause 5 pause 5
disappear ECRUTEAKHOUSE_SAGE2 disappear ECRUTEAKTINTOWERENTRANCE_SAGE2
end end
EcruteakHouse_CoordEvent2: EcruteakTinTowerEntrance_CoordEvent2:
checkevent EVENT_RANG_CLEAR_BELL_1 checkevent EVENT_RANG_CLEAR_BELL_1
iftrue EcruteakHouse_CoordEvent_DontMove iftrue EcruteakTinTowerEntrance_CoordEvent_DontMove
applymovement ECRUTEAKHOUSE_SAGE1, MovementData_0x980cc applymovement ECRUTEAKTINTOWERENTRANCE_SAGE1, MovementData_0x980cc
moveobject ECRUTEAKHOUSE_SAGE2, 5, 6 moveobject ECRUTEAKTINTOWERENTRANCE_SAGE2, 5, 6
appear ECRUTEAKHOUSE_SAGE2 appear ECRUTEAKTINTOWERENTRANCE_SAGE2
pause 5 pause 5
disappear ECRUTEAKHOUSE_SAGE1 disappear ECRUTEAKTINTOWERENTRANCE_SAGE1
end end
EcruteakHouse_CoordEvent_DontMove: EcruteakTinTowerEntrance_CoordEvent_DontMove:
end end
SageScript_0x98062: SageScript_0x98062:
@ -134,8 +134,8 @@ SageScript_0x980b0:
closetext closetext
end end
EcruteakHouseGrampsScript: EcruteakTinTowerEntranceGrampsScript:
jumptextfaceplayer EcruteakHouseGrampsText jumptextfaceplayer EcruteakTinTowerEntranceGrampsText
MovementData_0x980c7: MovementData_0x980c7:
fix_facing fix_facing
@ -266,7 +266,7 @@ UnknownText_0x9846f:
line "to the top!" line "to the top!"
done done
EcruteakHouseGrampsText: EcruteakTinTowerEntranceGrampsText:
text "Two towers…" text "Two towers…"
line "Two #MON…" line "Two #MON…"
@ -277,7 +277,7 @@ EcruteakHouseGrampsText:
line "never to return." line "never to return."
done done
EcruteakHouse_MapEvents: EcruteakTinTowerEntrance_MapEvents:
; filler ; filler
db 0, 0 db 0, 0
@ -285,14 +285,14 @@ EcruteakHouse_MapEvents:
db 5 db 5
warp_def 4, 17, 3, ECRUTEAK_CITY warp_def 4, 17, 3, ECRUTEAK_CITY
warp_def 5, 17, 3, ECRUTEAK_CITY warp_def 5, 17, 3, ECRUTEAK_CITY
warp_def 5, 3, 4, ECRUTEAK_HOUSE warp_def 5, 3, 4, ECRUTEAK_TIN_TOWER_ENTRANCE
warp_def 17, 15, 3, ECRUTEAK_HOUSE warp_def 17, 15, 3, ECRUTEAK_TIN_TOWER_ENTRANCE
warp_def 17, 3, 3, WISE_TRIOS_ROOM warp_def 17, 3, 3, WISE_TRIOS_ROOM
.CoordEvents: .CoordEvents:
db 2 db 2
coord_event 4, 7, 0, EcruteakHouse_CoordEvent1 coord_event 4, 7, 0, EcruteakTinTowerEntrance_CoordEvent1
coord_event 5, 7, 0, EcruteakHouse_CoordEvent2 coord_event 5, 7, 0, EcruteakTinTowerEntrance_CoordEvent2
.BGEvents: .BGEvents:
db 0 db 0
@ -301,5 +301,5 @@ EcruteakHouse_MapEvents:
db 4 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 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 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 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, EcruteakHouseGrampsScript, EVENT_ECRUTEAK_HOUSE_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

0
maps/EcruteakHouse.blk → maps/EcruteakTinTowerEntrance.blk
View File

2
maps/RadioTower5F.asm
View File

@ -127,7 +127,7 @@ RadioTower5FRocketBossScene:
waitbutton waitbutton
closetext closetext
setscene 2 setscene 2
setmapscene ECRUTEAK_HOUSE, 0 setmapscene ECRUTEAK_TIN_TOWER_ENTRANCE, 0
setevent EVENT_GOT_CLEAR_BELL setevent EVENT_GOT_CLEAR_BELL
setevent EVENT_TEAM_ROCKET_DISBANDED setevent EVENT_TEAM_ROCKET_DISBANDED
jump .UselessJump jump .UselessJump

2
maps/WiseTriosRoom.asm
View File

@ -352,7 +352,7 @@ WiseTriosRoom_MapEvents:
db 3 db 3
warp_def 7, 4, 4, ECRUTEAK_CITY warp_def 7, 4, 4, ECRUTEAK_CITY
warp_def 7, 5, 5, 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: .CoordEvents:
db 1 db 1

2
wram.asm
View File

@ -2538,7 +2538,7 @@ wGoldenrodPokecenter1FSceneID:: db ; d993
wOlivineCitySceneID:: db ; d994 wOlivineCitySceneID:: db ; d994
wRoute34SceneID:: db ; d995 wRoute34SceneID:: db ; d995
wRoute34IlexForestGateSceneID:: db ; d996 wRoute34IlexForestGateSceneID:: db ; d996
wEcruteakHouseSceneID:: db ; d997 wEcruteakTinTowerEntranceSceneID:: db ; d997
wWiseTriosRoomSceneID:: db ; d998 wWiseTriosRoomSceneID:: db ; d998
wEcruteakPokecenter1FSceneID:: db ; d999 wEcruteakPokecenter1FSceneID:: db ; d999
wEcruteakGymSceneID:: db ; d99a wEcruteakGymSceneID:: db ; d99a