diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-07-13 18:53:14 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-13 18:53:14 -0700 |
| commit | 68cf5eb3cbff3b0eac6cd348c7e6c594c287d67b (patch) | |
| tree | 6cbdbe8e87708ffca6a49d6b507ed6341b26f4e2 /data/maps/FallarborTown_PokemonCenter_2F | |
| parent | 9238533346fd97c67e48fee33a204d1e8e2dd0a7 (diff) | |
| parent | 7dffb108b834afdee807998af24e1ddc4c85d4f9 (diff) | |
Merge pull request #654 from huderlem/movement_constants
Move and use movement constants
Diffstat (limited to 'data/maps/FallarborTown_PokemonCenter_2F')
| -rw-r--r-- | data/maps/FallarborTown_PokemonCenter_2F/events.inc | 6 | ||||
| -rw-r--r-- | data/maps/FallarborTown_PokemonCenter_2F/header.inc | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/data/maps/FallarborTown_PokemonCenter_2F/events.inc b/data/maps/FallarborTown_PokemonCenter_2F/events.inc index 381051d01..df52f9505 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/events.inc +++ b/data/maps/FallarborTown_PokemonCenter_2F/events.inc @@ -1,7 +1,7 @@ FallarborTown_PokemonCenter_2F_EventObjects:: @ 83868EC - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_153BA8, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_153B9C, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_153BA2, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_153BA8, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_153B9C, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_153BA2, 0 FallarborTown_PokemonCenter_2F_MapWarps:: @ 8386934 warp_def 1, 5, 4, 2, MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F diff --git a/data/maps/FallarborTown_PokemonCenter_2F/header.inc b/data/maps/FallarborTown_PokemonCenter_2F/header.inc index 91613d680..14c591d65 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/header.inc +++ b/data/maps/FallarborTown_PokemonCenter_2F/header.inc @@ -5,10 +5,10 @@ FallarborTown_PokemonCenter_2F:: @ 8305D24 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 4 + .byte MAPSEC_FALLARBOR_TOWN .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL |