diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-06-20 19:54:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-20 19:54:16 -0500 |
| commit | 7b7f4bb7d6f5d29b40e15aa4c6285c6885359e0d (patch) | |
| tree | 8da3f8fae8c1c165e3435ee079f48631479b7611 /data/maps/RustboroCity_PokemonCenter_2F | |
| parent | c6207577802db057298917089e427a6ab9e6edf9 (diff) | |
| parent | 8bf4b1a917786c683ac30278108f74d31961274d (diff) | |
Merge pull request #636 from huderlem/assets
Map organization
Diffstat (limited to 'data/maps/RustboroCity_PokemonCenter_2F')
| -rw-r--r-- | data/maps/RustboroCity_PokemonCenter_2F/events.inc | 14 | ||||
| -rw-r--r-- | data/maps/RustboroCity_PokemonCenter_2F/header.inc | 4 | ||||
| -rw-r--r-- | data/maps/RustboroCity_PokemonCenter_2F/scripts.inc | 17 |
3 files changed, 33 insertions, 2 deletions
diff --git a/data/maps/RustboroCity_PokemonCenter_2F/events.inc b/data/maps/RustboroCity_PokemonCenter_2F/events.inc new file mode 100644 index 000000000..bf5737d14 --- /dev/null +++ b/data/maps/RustboroCity_PokemonCenter_2F/events.inc @@ -0,0 +1,14 @@ +RustboroCity_PokemonCenter_2F_EventObjects:: @ 8388BB0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_157BC1, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_157BC7, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_157BCD, 0 + +RustboroCity_PokemonCenter_2F_MapWarps:: @ 8388BF8 + warp_def 1, 5, 4, 2, MAP_RUSTBORO_CITY_POKEMON_CENTER_1F + warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 0, 0, MAP_TRADE_CENTER + warp_def 11, 1, 0, 0, MAP_RECORD_CORNER + warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM + +RustboroCity_PokemonCenter_2F_MapEvents:: @ 8388C20 + map_events RustboroCity_PokemonCenter_2F_EventObjects, RustboroCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/RustboroCity_PokemonCenter_2F/header.inc b/data/maps/RustboroCity_PokemonCenter_2F/header.inc index 838a5e5a9..ff85dfc1d 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/header.inc +++ b/data/maps/RustboroCity_PokemonCenter_2F/header.inc @@ -1,9 +1,9 @@ RustboroCity_PokemonCenter_2F:: @ 83062D4 - .4byte PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte RustboroCity_PokemonCenter_2F_MapEvents .4byte RustboroCity_PokemonCenter_2F_MapScripts .4byte 0x0 - .2byte BGM_POKECEN + .2byte MUS_POKECEN .2byte 62 .byte 10 .byte 0 diff --git a/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc b/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc new file mode 100644 index 000000000..d0ffc5435 --- /dev/null +++ b/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc @@ -0,0 +1,17 @@ +RustboroCity_PokemonCenter_2F_MapScripts:: @ 8157BB1 + map_script 2, RustboroCity_PokemonCenter_2F_MapScript2_1A3D88 + map_script 4, RustboroCity_PokemonCenter_2F_MapScript2_1A3D03 + map_script 1, RustboroCity_PokemonCenter_2F_MapScript1_1A3D32 + .byte 0 + +RustboroCity_PokemonCenter_2F_EventScript_157BC1:: @ 8157BC1 + call RustboroCity_PokemonCenter_2F_EventScript_1A3EA6 + end + +RustboroCity_PokemonCenter_2F_EventScript_157BC7:: @ 8157BC7 + call RustboroCity_PokemonCenter_2F_EventScript_1A40CC + end + +RustboroCity_PokemonCenter_2F_EventScript_157BCD:: @ 8157BCD + call RustboroCity_PokemonCenter_2F_EventScript_1A41FB + end |