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/Route35GoldenrodGate.asm | |
| parent | 6ca1857732502a60251e3738cbccc6d0067eaed2 (diff) | |
Use def_* macros for automatic map event counts
Diffstat (limited to 'maps/Route35GoldenrodGate.asm')
| -rw-r--r-- | maps/Route35GoldenrodGate.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/Route35GoldenrodGate.asm b/maps/Route35GoldenrodGate.asm index b3d8b048..7295b6ad 100644 --- a/maps/Route35GoldenrodGate.asm +++ b/maps/Route35GoldenrodGate.asm @@ -1,11 +1,11 @@ - object_const_def ; object_event constants + object_const_def const ROUTE35GOLDENRODGATE_RANDY const ROUTE35GOLDENRODGATE_POKEFAN_F Route35GoldenrodGate_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks RandyScript: faceplayer @@ -178,16 +178,16 @@ Route35GoldenrodGatePokefanFText_FoughtSudowoodo: Route35GoldenrodGate_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events warp_event 4, 0, ROUTE_35, 1 warp_event 5, 0, ROUTE_35, 2 warp_event 4, 7, GOLDENROD_CITY, 13 warp_event 5, 7, GOLDENROD_CITY, 13 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 2 ; object events + def_object_events object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RandyScript, -1 object_event 6, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route35GoldenrodGatePokefanFScript, -1 |