diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-26 16:29:43 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-26 16:29:43 -0400 |
| commit | d24f1c71149b59c50dba57e500f30b223a54a25f (patch) | |
| tree | 140ad8c04b396af2e0d55f3218bfb3e428391f42 /maps/PokemonFanClub.asm | |
| parent | 6ca1857732502a60251e3738cbccc6d0067eaed2 (diff) | |
Use def_* macros for automatic map event counts
Diffstat (limited to 'maps/PokemonFanClub.asm')
| -rw-r--r-- | maps/PokemonFanClub.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/PokemonFanClub.asm b/maps/PokemonFanClub.asm index 5f38a573..55879acd 100644 --- a/maps/PokemonFanClub.asm +++ b/maps/PokemonFanClub.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const POKEMONFANCLUB_CHAIRMAN const POKEMONFANCLUB_RECEPTIONIST const POKEMONFANCLUB_CLEFAIRY_GUY @@ -7,9 +7,9 @@ const POKEMONFANCLUB_ODDISH PokemonFanClub_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks PokemonFanClubChairmanScript: faceplayer @@ -297,17 +297,17 @@ PokemonFanClubBraggingSignText: PokemonFanClub_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, VERMILION_CITY, 3 warp_event 3, 7, VERMILION_CITY, 3 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 7, 0, BGEVENT_READ, PokemonFanClubListenSign bg_event 9, 0, BGEVENT_READ, PokemonFanClubBraggingSign - db 6 ; object events + def_object_events object_event 3, 1, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokemonFanClubChairmanScript, -1 object_event 4, 1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokemonFanClubReceptionistScript, -1 object_event 2, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokemonFanClubClefairyGuyScript, -1 |