diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-04-19 16:31:37 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-04-19 16:31:37 -0400 |
| commit | 316fa4b69558a1930a1a1ae44a40221a1ddd4f26 (patch) | |
| tree | 4706eaec78ee5706e16e944eba4abfe1e7316168 /macros/scripts | |
| parent | 35219230960f0dc85c0cb6a5723877b247609e46 (diff) | |
Use rgbds 0.5.0
Diffstat (limited to 'macros/scripts')
| -rw-r--r-- | macros/scripts/maps.asm | 69 |
1 files changed, 27 insertions, 42 deletions
diff --git a/macros/scripts/maps.asm b/macros/scripts/maps.asm index a30e0c06a..fc6d201b6 100644 --- a/macros/scripts/maps.asm +++ b/macros/scripts/maps.asm @@ -8,44 +8,35 @@ ENDM object_const_def EQUS "const_def 2" def_scene_scripts: MACRO -if DEF(_NUM_SCENE_SCRIPTS) - PURGE _NUM_SCENE_SCRIPTS -endc -_NUM_SCENE_SCRIPTS EQUS "_NUM_SCENE_SCRIPTS_\@" - db _NUM_SCENE_SCRIPTS -_NUM_SCENE_SCRIPTS = 0 +REDEF _NUM_SCENE_SCRIPTS EQUS "_NUM_SCENE_SCRIPTS_\@" + db {_NUM_SCENE_SCRIPTS} +{_NUM_SCENE_SCRIPTS} = 0 ENDM scene_script: MACRO ;\1: script pointer dw \1 dw 0 ; filler -_NUM_SCENE_SCRIPTS = _NUM_SCENE_SCRIPTS + 1 +{_NUM_SCENE_SCRIPTS} = {_NUM_SCENE_SCRIPTS} + 1 ENDM def_callbacks: MACRO -if DEF(_NUM_CALLBACKS) - PURGE _NUM_CALLBACKS -endc -_NUM_CALLBACKS EQUS "_NUM_CALLBACKS_\@" - db _NUM_CALLBACKS -_NUM_CALLBACKS = 0 +REDEF _NUM_CALLBACKS EQUS "_NUM_CALLBACKS_\@" + db {_NUM_CALLBACKS} +{_NUM_CALLBACKS} = 0 ENDM callback: MACRO ;\1: type: a MAPCALLBACK_* constant ;\2: script pointer dbw \1, \2 -_NUM_CALLBACKS = _NUM_CALLBACKS + 1 +{_NUM_CALLBACKS} = {_NUM_CALLBACKS} + 1 ENDM def_warp_events: MACRO -if DEF(_NUM_WARP_EVENTS) - PURGE _NUM_WARP_EVENTS -endc -_NUM_WARP_EVENTS EQUS "_NUM_WARP_EVENTS_\@" - db _NUM_WARP_EVENTS -_NUM_WARP_EVENTS = 0 +REDEF _NUM_WARP_EVENTS EQUS "_NUM_WARP_EVENTS_\@" + db {_NUM_WARP_EVENTS} +{_NUM_WARP_EVENTS} = 0 ENDM warp_event: MACRO @@ -55,16 +46,13 @@ warp_event: MACRO ;\4: warp destination: starts at 1 db \2, \1, \4 map_id \3 -_NUM_WARP_EVENTS = _NUM_WARP_EVENTS + 1 +{_NUM_WARP_EVENTS} = {_NUM_WARP_EVENTS} + 1 ENDM def_coord_events: MACRO -if DEF(_NUM_COORD_EVENTS) - PURGE _NUM_COORD_EVENTS -endc -_NUM_COORD_EVENTS EQUS "_NUM_COORD_EVENTS_\@" - db _NUM_COORD_EVENTS -_NUM_COORD_EVENTS = 0 +REDEF _NUM_COORD_EVENTS EQUS "_NUM_COORD_EVENTS_\@" + db {_NUM_COORD_EVENTS} +{_NUM_COORD_EVENTS} = 0 ENDM coord_event: MACRO @@ -76,16 +64,13 @@ coord_event: MACRO db 0 ; filler dw \4 dw 0 ; filler -_NUM_COORD_EVENTS = _NUM_COORD_EVENTS + 1 +{_NUM_COORD_EVENTS} = {_NUM_COORD_EVENTS} + 1 ENDM def_bg_events: MACRO -if DEF(_NUM_BG_EVENTS) - PURGE _NUM_BG_EVENTS -endc -_NUM_BG_EVENTS EQUS "_NUM_BG_EVENTS_\@" - db _NUM_BG_EVENTS -_NUM_BG_EVENTS = 0 +REDEF _NUM_BG_EVENTS EQUS "_NUM_BG_EVENTS_\@" + db {_NUM_BG_EVENTS} +{_NUM_BG_EVENTS} = 0 ENDM bg_event: MACRO @@ -95,16 +80,13 @@ bg_event: MACRO ;\4: script pointer db \2, \1, \3 dw \4 -_NUM_BG_EVENTS = _NUM_BG_EVENTS + 1 +{_NUM_BG_EVENTS} = {_NUM_BG_EVENTS} + 1 ENDM def_object_events: MACRO -if DEF(_NUM_OBJECT_EVENTS) - PURGE _NUM_OBJECT_EVENTS -endc -_NUM_OBJECT_EVENTS EQUS "_NUM_OBJECT_EVENTS_\@" - db _NUM_OBJECT_EVENTS -_NUM_OBJECT_EVENTS = 0 +REDEF _NUM_OBJECT_EVENTS EQUS "_NUM_OBJECT_EVENTS_\@" + db {_NUM_OBJECT_EVENTS} +{_NUM_OBJECT_EVENTS} = 0 ENDM object_event: MACRO @@ -135,7 +117,10 @@ object_event: MACRO dw \9 shift dw \9 -_NUM_OBJECT_EVENTS = _NUM_OBJECT_EVENTS + 1 +; the dummy PlayerObjectTemplate object_event has no def_object_events +if DEF(_NUM_OBJECT_EVENTS) +{_NUM_OBJECT_EVENTS} = {_NUM_OBJECT_EVENTS} + 1 +endc ENDM trainer: MACRO |