diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-07-22 13:14:58 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-07-22 13:14:58 +0200 |
| commit | 1e9143e0b22bc72cb77866e10817bc509064842a (patch) | |
| tree | 87b77fdd2c19d34cb7ac10870fdc4c30188e2d70 /data/maps/RustboroCity_PokemonCenter_2F | |
| parent | c9d486a5d3ea6bf7d256c2d7ca7f10339e498427 (diff) | |
| parent | 06b3ce408f774c7192202308e783cc22bb8e7643 (diff) | |
merge union room with master
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 | 10 | ||||
| -rw-r--r-- | data/maps/RustboroCity_PokemonCenter_2F/scripts.inc | 19 |
3 files changed, 38 insertions, 5 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..f1f9fe356 --- /dev/null +++ b/data/maps/RustboroCity_PokemonCenter_2F/events.inc @@ -0,0 +1,14 @@ +RustboroCity_PokemonCenter_2F_EventObjects: @ 8530780 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_27375B, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_273761, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_273767, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_276B03, 702 + +RustboroCity_PokemonCenter_2F_MapWarps: @ 85307E0 + warp_def 1, 6, 4, 2, MAP_RUSTBORO_CITY_POKEMON_CENTER_1F + warp_def 5, 1, 3, 0, MAP_UNION_ROOM + warp_def 9, 1, 3, 0, MAP_TRADE_CENTER + +RustboroCity_PokemonCenter_2F_MapEvents:: @ 85307F8 + 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 0acf68eaa..e7a1999cc 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/header.inc +++ b/data/maps/RustboroCity_PokemonCenter_2F/header.inc @@ -1,15 +1,15 @@ RustboroCity_PokemonCenter_2F: @ 84833EC - .4byte RustboroCity_PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte RustboroCity_PokemonCenter_2F_MapEvents .4byte RustboroCity_PokemonCenter_2F_MapScripts .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc b/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc new file mode 100644 index 000000000..a1bdeba5b --- /dev/null +++ b/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc @@ -0,0 +1,19 @@ +RustboroCity_PokemonCenter_2F_MapScripts:: @ 8214EDE + map_script 2, RustboroCity_PokemonCenter_2F_MapScript2_276C3B + map_script 4, RustboroCity_PokemonCenter_2F_MapScript2_276B6C + map_script 1, RustboroCity_PokemonCenter_2F_MapScript1_276BBE + map_script 3, RustboroCity_PokemonCenter_2F_MapScript1_276ACF + .byte 0 + +RustboroCity_PokemonCenter_2F_EventScript_214EF3:: @ 8214EF3 + call OldaleTown_PokemonCenter_2F_EventScript_276EB7 + end + +RustboroCity_PokemonCenter_2F_EventScript_214EF9:: @ 8214EF9 + call OldaleTown_PokemonCenter_2F_EventScript_2770B2 + end + +RustboroCity_PokemonCenter_2F_EventScript_214EFF:: @ 8214EFF + call OldaleTown_PokemonCenter_2F_EventScript_2771DB + end + |