diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-24 09:49:26 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-24 09:57:16 -0400 |
| commit | dcb24bc72428a60e37c1dfa7a93dc46bff7bd5ed (patch) | |
| tree | 4788cafe99972e5b4f6528affb925c9d7eb24134 /maps/BrunosRoom.asm | |
| parent | 89c47f21701caf32641573264d83ca16eb0aed91 (diff) | |
Use def_* macros for automatic map event counts
Resolves #742
Diffstat (limited to 'maps/BrunosRoom.asm')
| -rw-r--r-- | maps/BrunosRoom.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm index cc92d175e..b8a6d9746 100644 --- a/maps/BrunosRoom.asm +++ b/maps/BrunosRoom.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const BRUNOSROOM_BRUNO BrunosRoom_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .LockDoor ; SCENE_DEFAULT scene_script .DummyScene ; SCENE_FINISHED - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_TILES, .BrunosRoomDoors .LockDoor: @@ -125,15 +125,15 @@ BrunoScript_BrunoDefeatText: BrunosRoom_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events warp_event 4, 17, KOGAS_ROOM, 3 warp_event 5, 17, KOGAS_ROOM, 4 warp_event 4, 2, KARENS_ROOM, 1 warp_event 5, 2, KARENS_ROOM, 2 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 1 ; object events + def_object_events object_event 5, 7, SPRITE_BRUNO, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BrunoScript_Battle, -1 |