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/PokecomCenterAdminOfficeMobile.asm | |
| parent | 89c47f21701caf32641573264d83ca16eb0aed91 (diff) | |
Use def_* macros for automatic map event counts
Resolves #742
Diffstat (limited to 'maps/PokecomCenterAdminOfficeMobile.asm')
| -rw-r--r-- | maps/PokecomCenterAdminOfficeMobile.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/PokecomCenterAdminOfficeMobile.asm b/maps/PokecomCenterAdminOfficeMobile.asm index c6c815ab2..605cc7b32 100644 --- a/maps/PokecomCenterAdminOfficeMobile.asm +++ b/maps/PokecomCenterAdminOfficeMobile.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const POKECOMCENTERADMINOFFICEMOBILE_SCIENTIST1 const POKECOMCENTERADMINOFFICEMOBILE_SCIENTIST2 const POKECOMCENTERADMINOFFICEMOBILE_SCIENTIST3 PokecomCenterAdminOfficeMobile_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks PokecomCenterAdminOfficeMobileScientist1Script: jumptextfaceplayer PokecomCenterAdminOfficeMobileScientist1Text @@ -263,18 +263,18 @@ PokecomCenterAdminOfficeMobileComputer3Text: PokecomCenterAdminOfficeMobile_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 0, 31, GOLDENROD_POKECENTER_1F, 3 warp_event 1, 31, GOLDENROD_POKECENTER_1F, 3 - db 0 ; coord events + def_coord_events - db 3 ; bg events + def_bg_events bg_event 6, 26, BGEVENT_UP, PokecomCenterAdminOfficeMobileComputer1 bg_event 6, 28, BGEVENT_UP, PokecomCenterAdminOfficeMobileComputer2 bg_event 3, 26, BGEVENT_UP, PokecomCenterAdminOfficeMobileComputer3 - db 3 ; object events + def_object_events object_event 4, 28, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminOfficeMobileScientist1Script, -1 object_event 7, 27, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminOfficeMobileScientist2Script, -1 object_event 7, 29, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminOfficeMobileScientist3Script, -1 |