diff options
| author | Yoann Fievez <yoann.fievez@gmail.com> | 2021-09-27 04:56:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-26 21:56:09 -0500 |
| commit | 2c4f35848b786864822a3f211df91de30a2857c9 (patch) | |
| tree | fcf65394ef3a2361d4dce8bd6cadaac8c9d021d3 /data/maps/objects/GameCornerPrizeRoom.asm | |
| parent | `ASSERT LOW(wSpriteStateData1) == 0 && LOW(wSpriteStateData2) == 0` (diff) | |
| download | pokeyellow-2c4f35848b786864822a3f211df91de30a2857c9.tar.gz pokeyellow-2c4f35848b786864822a3f211df91de30a2857c9.tar.xz pokeyellow-2c4f35848b786864822a3f211df91de30a2857c9.zip | |
Unify map event gen1 gen2 (#335)
* Update sign to bg_event #289
* Rename warp to warp_event
* Replace object to object_event
* Move warp macro parameter from warp x, y, id, map to warp_event x, y, map, id
Diffstat (limited to 'data/maps/objects/GameCornerPrizeRoom.asm')
| -rw-r--r-- | data/maps/objects/GameCornerPrizeRoom.asm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/data/maps/objects/GameCornerPrizeRoom.asm b/data/maps/objects/GameCornerPrizeRoom.asm index d55decf1..fab25b4f 100644 --- a/data/maps/objects/GameCornerPrizeRoom.asm +++ b/data/maps/objects/GameCornerPrizeRoom.asm @@ -1,17 +1,17 @@ GameCornerPrizeRoom_Object: db $f ; border block - def_warps - warp 4, 7, 9, LAST_MAP - warp 5, 7, 9, LAST_MAP + def_warp_events + warp_event 4, 7, LAST_MAP, 9 + warp_event 5, 7, LAST_MAP, 9 - def_signs - sign 2, 2, 3 ; CeladonPrizeRoomText3 - sign 4, 2, 4 ; CeladonPrizeRoomText4 - sign 6, 2, 5 ; CeladonPrizeRoomText5 + def_bg_events + bg_event 2, 2, 3 ; CeladonPrizeRoomText3 + bg_event 4, 2, 4 ; CeladonPrizeRoomText4 + bg_event 6, 2, 5 ; CeladonPrizeRoomText5 - def_objects - object SPRITE_BALDING_GUY, 1, 4, STAY, NONE, 1 ; person - object SPRITE_GAMBLER, 7, 3, WALK, LEFT_RIGHT, 2 ; person + def_object_events + object_event 1, 4, SPRITE_BALDING_GUY, STAY, NONE, 1 ; person + object_event 7, 3, SPRITE_GAMBLER, WALK, LEFT_RIGHT, 2 ; person def_warps_to GAME_CORNER_PRIZE_ROOM |