diff options
Diffstat (limited to 'macros')
| -rw-r--r-- | macros/base_stats.asm | 8 | ||||
| -rw-r--r-- | macros/coords.asm | 6 | ||||
| -rw-r--r-- | macros/scripts/events.asm | 4 | ||||
| -rw-r--r-- | macros/scripts/maps.asm | 28 |
4 files changed, 23 insertions, 23 deletions
diff --git a/macros/base_stats.asm b/macros/base_stats.asm index f260e35d9..1a2ce8529 100644 --- a/macros/base_stats.asm +++ b/macros/base_stats.asm @@ -1,7 +1,7 @@ ; Used in data/pokemon/base_stats/*.asm define: MACRO -if !def(\1) +if !DEF(\1) \1 EQUS \2 endc ENDM @@ -9,7 +9,7 @@ ENDM const_value = 0 add_tm: MACRO -if !def(TM01) +if !DEF(TM01) TM01 = const_value enum_start 1 endc @@ -19,7 +19,7 @@ endc ENDM add_hm: MACRO -if !def(HM01) +if !DEF(HM01) HM01 = const_value endc define _\@_1, "HM_\1" @@ -38,7 +38,7 @@ tms1 = 0 tms2 = 0 tms3 = 0 rept _NARG - if def(\1_TMNUM) + if DEF(\1_TMNUM) if \1_TMNUM < 24 + 1 tms1 = tms1 | (1 << ((\1_TMNUM) - 1)) elif \1_TMNUM < 48 + 1 diff --git a/macros/coords.asm b/macros/coords.asm index a8e64c0c9..b889be765 100644 --- a/macros/coords.asm +++ b/macros/coords.asm @@ -43,9 +43,9 @@ debgcoord EQUS "bgcoord de," bcbgcoord EQUS "bgcoord bc," bgcoord: MACRO -IF _NARG >= 4 + if _NARG >= 4 ld \1, \3 bgrows + \2 + \4 -ELSE + else ld \1, \3 bgrows + \2 + vBGMap0 -ENDC + endc ENDM diff --git a/macros/scripts/events.asm b/macros/scripts/events.asm index a494a33af..694a7cd12 100644 --- a/macros/scripts/events.asm +++ b/macros/scripts/events.asm @@ -538,13 +538,13 @@ jumptextfaceplayer: MACRO dw \1 ; text_pointer ENDM -; IF _CRYSTAL +; if _CRYSTAL enum farjumptext_command ; $52 farjumptext: MACRO db farjumptext_command dba \1 ENDM -; ENDC +; endc enum jumptext_command ; $53 jumptext: MACRO diff --git a/macros/scripts/maps.asm b/macros/scripts/maps.asm index 6ab4a3f61..e9703531d 100644 --- a/macros/scripts/maps.asm +++ b/macros/scripts/maps.asm @@ -10,39 +10,39 @@ scene_script: MACRO ENDM warp_def: MACRO -;\1: y: top to bottom, starts at 0 -;\2: x: left to right, starts at 0 +;\1: x: left to right, starts at 0 +;\2: y: top to bottom, starts at 0 ;\3: warp destination: starts at 1 ;\4: map id: from constants/map_constants.asm - db \1, \2, \3 + db \2, \1, \3 map \4 ENDM coord_event: MACRO -;\1: scene id: controlled by setscene/setmapscene +;\1: x: left to right, starts at 0 ;\2: y: top to bottom, starts at 0 -;\3: x: left to right, starts at 0 +;\3: scene id: controlled by setscene/setmapscene ;\4: script pointer - db \1, \2, \3, $0 + db \3, \2, \1, $0 dw \4 db $0, $0 ENDM bg_event: MACRO -;\1: y: top to bottom, starts at 0 -;\2: x: left to right, starts at 0 +;\1: x: left to right, starts at 0 +;\2: y: top to bottom, starts at 0 ;\3: function: a BGEVENT_* constant ;\4: script pointer - db \1, \2, \3 + db \2, \1, \3 dw \4 ENDM object_event: MACRO -;\1: sprite: a SPRITE_* constant +;\1: x: left to right, starts at 0 ;\2: y: top to bottom, starts at 0 -;\3: x: left to right, starts at 0 +;\3: sprite: a SPRITE_* constant ;\4: movement function: a SPRITEMOVEDATA_* constant -;\5, \6: movement radius: y, x +;\5, \6: movement radius: x, y ;\7, \8: hour limits: h1, h2 (0-23) ; * if h1 < h2, the object_event will only appear from h1 to h2 ; * if h1 > h2, the object_event will not appear from h2 to h1 @@ -54,8 +54,8 @@ object_event: MACRO ;\11: sight range: applies to OBJECTTYPE_TRAINER ;\12: script pointer ;\13: event flag: an EVENT_* constant, or -1 to always appear - db \1, \2 + 4, \3 + 4, \4 - dn \5, \6 + db \3, \2 + 4, \1 + 4, \4 + dn \6, \5 db \7, \8 shift dn \8, \9 |