diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-08-20 19:07:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-20 19:07:42 -0400 |
| commit | 7e9ccbb5b254f794a79c4d0f9d816b3cbfb81f3f (patch) | |
| tree | ddda1118461d6151597a4bf9eefcb0eddc835da1 /data/maps/objects/RocketHideoutB2F.asm | |
| parent | 2fe1505babaf02b995cc0d9c3a827b798935b19a (diff) | |
| parent | d5db0c3dbf78a957e8f10ad410789c4256d64f74 (diff) | |
Merge pull request #287 from Rangi42/master
Simplify map event definitions
Diffstat (limited to 'data/maps/objects/RocketHideoutB2F.asm')
| -rwxr-xr-x | data/maps/objects/RocketHideoutB2F.asm | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/data/maps/objects/RocketHideoutB2F.asm b/data/maps/objects/RocketHideoutB2F.asm index ee4f81cd..e7fd011e 100755 --- a/data/maps/objects/RocketHideoutB2F.asm +++ b/data/maps/objects/RocketHideoutB2F.asm @@ -1,25 +1,20 @@ RocketHideoutB2F_Object: db $2e ; border block - db 5 ; warps + def_warps warp 27, 8, 0, ROCKET_HIDEOUT_B1F warp 21, 8, 0, ROCKET_HIDEOUT_B3F warp 24, 19, 0, ROCKET_HIDEOUT_ELEVATOR warp 21, 22, 3, ROCKET_HIDEOUT_B1F warp 25, 19, 1, ROCKET_HIDEOUT_ELEVATOR - db 0 ; signs + def_signs - db 5 ; objects + def_objects object SPRITE_ROCKET, 20, 12, STAY, DOWN, 1, OPP_ROCKET, 13 object SPRITE_POKE_BALL, 1, 11, STAY, NONE, 2, MOON_STONE object SPRITE_POKE_BALL, 16, 8, STAY, NONE, 3, NUGGET object SPRITE_POKE_BALL, 6, 12, STAY, NONE, 4, TM_HORN_DRILL object SPRITE_POKE_BALL, 3, 21, STAY, NONE, 5, SUPER_POTION - ; warp-to - warp_to 27, 8, ROCKET_HIDEOUT_B2F_WIDTH ; ROCKET_HIDEOUT_B1F - warp_to 21, 8, ROCKET_HIDEOUT_B2F_WIDTH ; ROCKET_HIDEOUT_B3F - warp_to 24, 19, ROCKET_HIDEOUT_B2F_WIDTH ; ROCKET_HIDEOUT_ELEVATOR - warp_to 21, 22, ROCKET_HIDEOUT_B2F_WIDTH ; ROCKET_HIDEOUT_B1F - warp_to 25, 19, ROCKET_HIDEOUT_B2F_WIDTH ; ROCKET_HIDEOUT_ELEVATOR + def_warps_to ROCKET_HIDEOUT_B2F |