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/TeamRocketBaseB2F.asm | |
| parent | 89c47f21701caf32641573264d83ca16eb0aed91 (diff) | |
Use def_* macros for automatic map event counts
Resolves #742
Diffstat (limited to 'maps/TeamRocketBaseB2F.asm')
| -rw-r--r-- | maps/TeamRocketBaseB2F.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 9f8beea70..899c47d73 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const TEAMROCKETBASEB2F_ROCKET1 const TEAMROCKETBASEB2F_ROCKET_GIRL const TEAMROCKETBASEB2F_LANCE @@ -15,13 +15,13 @@ const TEAMROCKETBASEB2F_POKE_BALL TeamRocketBaseB2F_MapScripts: - db 4 ; scene scripts + def_scene_scripts scene_script .DummyScene0 ; SCENE_DEFAULT scene_script .DummyScene1 ; SCENE_TEAMROCKETBASEB2F_ROCKET_BOSS scene_script .DummyScene2 ; SCENE_TEAMROCKETBASEB2F_ELECTRODES scene_script .DummyScene3 ; SCENE_TEAMROCKETBASEB2F_NOTHING - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_TILES, .TransmitterDoorCallback .DummyScene0: @@ -909,14 +909,14 @@ RocketBaseB2FDeactivateTransmitterText: TeamRocketBaseB2F_MapEvents: db 0, 0 ; filler - db 5 ; warp events + def_warp_events warp_event 3, 14, TEAM_ROCKET_BASE_B1F, 2 warp_event 3, 2, TEAM_ROCKET_BASE_B3F, 1 warp_event 27, 2, TEAM_ROCKET_BASE_B3F, 2 warp_event 3, 6, TEAM_ROCKET_BASE_B3F, 3 warp_event 27, 14, TEAM_ROCKET_BASE_B3F, 4 - db 9 ; coord events + def_coord_events coord_event 5, 14, SCENE_DEFAULT, LanceHealsScript1 coord_event 4, 13, SCENE_DEFAULT, LanceHealsScript2 coord_event 14, 11, SCENE_TEAMROCKETBASEB2F_ROCKET_BOSS, RocketBaseBossFLeft @@ -927,7 +927,7 @@ TeamRocketBaseB2F_MapEvents: coord_event 12, 10, SCENE_TEAMROCKETBASEB2F_ELECTRODES, RocketBaseLancesSideScript coord_event 12, 11, SCENE_TEAMROCKETBASEB2F_ELECTRODES, RocketBaseLancesSideScript - db 23 ; bg events + def_bg_events bg_event 14, 12, BGEVENT_IFNOTSET, TeamRocketBaseB2FLockedDoor bg_event 15, 12, BGEVENT_IFNOTSET, TeamRocketBaseB2FLockedDoor bg_event 17, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript @@ -952,7 +952,7 @@ TeamRocketBaseB2F_MapEvents: bg_event 17, 8, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript bg_event 26, 7, BGEVENT_ITEM, TeamRocketBaseB2FHiddenFullHeal - db 14 ; object events + def_object_events object_event 20, 16, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_GRUNT_WITH_EXECUTIVE object_event 20, 16, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_EXECUTIVE object_event 5, 13, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_LANCE |