diff options
| author | dannye <33dannye@gmail.com> | 2021-09-26 22:38:47 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2021-09-26 22:43:09 -0500 |
| commit | 501a21fa5dc6f01c0563316c9cd209cccb1eef45 (patch) | |
| tree | c2fe5cc6caa9d8117df3008031d7a26317058acb /data/maps/objects/RedsHouse2F.asm | |
| parent | Switch from Travis CI to GitHub Actions (diff) | |
| parent | Fix typos (#334) (diff) | |
| download | pokeyellow-501a21fa5dc6f01c0563316c9cd209cccb1eef45.tar.gz pokeyellow-501a21fa5dc6f01c0563316c9cd209cccb1eef45.tar.xz pokeyellow-501a21fa5dc6f01c0563316c9cd209cccb1eef45.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'data/maps/objects/RedsHouse2F.asm')
| -rw-r--r-- | data/maps/objects/RedsHouse2F.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/data/maps/objects/RedsHouse2F.asm b/data/maps/objects/RedsHouse2F.asm index 2a254ec1..438104c4 100644 --- a/data/maps/objects/RedsHouse2F.asm +++ b/data/maps/objects/RedsHouse2F.asm @@ -1,17 +1,17 @@ RedsHouse2F_Object: db $a ; border block - def_warps - warp 7, 1, 2, REDS_HOUSE_1F + def_warp_events + warp_event 7, 1, REDS_HOUSE_1F, 2 IF DEF(_DEBUG) - warp 7, 2, 3, MT_MOON_B2F - warp 7, 3, 0, ROCKET_HIDEOUT_ELEVATOR - warp 7, 4, 0, POKEMON_TOWER_7F - warp 7, 5, 3, SILPH_CO_11F + warp_event 7, 2, MT_MOON_B2F, 3 + warp_event 7, 3, ROCKET_HIDEOUT_ELEVATOR, 0 + warp_event 7, 4, POKEMON_TOWER_7F, 0 + warp_event 7, 5, SILPH_CO_11F, 3 ENDC - def_signs + def_bg_events - def_objects + def_object_events def_warps_to REDS_HOUSE_2F |