summaryrefslogtreecommitdiff
path: root/maps/IlexForestAzaleaGate.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-07-24 09:49:26 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-07-24 09:57:16 -0400
commitdcb24bc72428a60e37c1dfa7a93dc46bff7bd5ed (patch)
tree4788cafe99972e5b4f6528affb925c9d7eb24134 /maps/IlexForestAzaleaGate.asm
parent89c47f21701caf32641573264d83ca16eb0aed91 (diff)
Use def_* macros for automatic map event counts
Resolves #742
Diffstat (limited to 'maps/IlexForestAzaleaGate.asm')
-rw-r--r--maps/IlexForestAzaleaGate.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/IlexForestAzaleaGate.asm b/maps/IlexForestAzaleaGate.asm
index 33f7bf9c1..730eeee74 100644
--- a/maps/IlexForestAzaleaGate.asm
+++ b/maps/IlexForestAzaleaGate.asm
@@ -1,11 +1,11 @@
- object_const_def ; object_event constants
+ object_const_def
const ILEXFORESTAZALEAGATE_OFFICER
const ILEXFORESTAZALEAGATE_GRANNY
IlexForestAzaleaGate_MapScripts:
- db 0 ; scene scripts
+ def_scene_scripts
- db 0 ; callbacks
+ def_callbacks
IlexForestAzaleaGateOfficerScript:
jumptextfaceplayer IlexForestAzaleaGateOfficerText
@@ -31,16 +31,16 @@ IlexForestAzaleaGateGrannyText:
IlexForestAzaleaGate_MapEvents:
db 0, 0 ; filler
- db 4 ; warp events
+ def_warp_events
warp_event 0, 4, ILEX_FOREST, 2
warp_event 0, 5, ILEX_FOREST, 3
warp_event 9, 4, AZALEA_TOWN, 7
warp_event 9, 5, AZALEA_TOWN, 8
- db 0 ; coord events
+ def_coord_events
- db 0 ; bg events
+ def_bg_events
- db 2 ; object events
+ def_object_events
object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, IlexForestAzaleaGateOfficerScript, -1
object_event 1, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, IlexForestAzaleaGateGrannyScript, -1