diff options
Diffstat (limited to 'macros')
-rw-r--r-- | macros/code.asm | 1 | ||||
-rw-r--r-- | macros/data.asm | 5 | ||||
-rw-r--r-- | macros/enum.asm | 2 | ||||
-rw-r--r-- | macros/legacy.asm | 3 | ||||
-rw-r--r-- | macros/scripts/maps.asm | 2 | ||||
-rw-r--r-- | macros/scripts/trade_anims.asm | 1 | ||||
-rw-r--r-- | macros/wram.asm | 2 |
7 files changed, 0 insertions, 16 deletions
diff --git a/macros/code.asm b/macros/code.asm index 09b15255e..72fd4b0d2 100644 --- a/macros/code.asm +++ b/macros/code.asm @@ -19,7 +19,6 @@ ENDM depixel EQUS "ldpixel de," bcpixel EQUS "ldpixel bc," - ; Design patterns jumptable: MACRO diff --git a/macros/data.asm b/macros/data.asm index ad2d9b8ef..08a23ad29 100644 --- a/macros/data.asm +++ b/macros/data.asm @@ -2,7 +2,6 @@ percent EQUS "* $ff / 100" - ; Constant data (db, dw, dl) macros dwb: MACRO @@ -87,7 +86,6 @@ dba_pic: MACRO ; dbw bank, address dw \1 ENDM - dbpixel: MACRO if _NARG >= 4 ; x tile, x pxl, y tile, y pxl @@ -103,14 +101,12 @@ dsprite: MACRO db (\1 * 8) % $100 + \2, (\3 * 8) % $100 + \4, \5, \6 ENDM - menu_coords: MACRO ; x1, y1, x2, y2 db \2, \1 ; start coords db \4, \3 ; end coords ENDM - bcd: MACRO rept _NARG dn ((\1) % 100) / 10, (\1) % 10 @@ -118,7 +114,6 @@ rept _NARG endr ENDM - sine_table: MACRO ; \1 samples of sin(x) from x=0 to x<32768 (pi radians) x = 0 diff --git a/macros/enum.asm b/macros/enum.asm index 385aee6f8..009400743 100644 --- a/macros/enum.asm +++ b/macros/enum.asm @@ -22,7 +22,6 @@ enum_set: MACRO __enum__ = \1 ENDM - ; Enumerate constants const_def: MACRO @@ -43,7 +42,6 @@ shift_const: MACRO const_value = const_value + 1 ENDM - ; Enumerate strings define: MACRO diff --git a/macros/legacy.asm b/macros/legacy.asm index 9e452da28..35e6e9ccb 100644 --- a/macros/legacy.asm +++ b/macros/legacy.asm @@ -8,7 +8,6 @@ callab EQUS "callfar" ; macros/scripts/audio.asm unknownmusic0xde EQUS "sound_duty" - ; macros/scripts/events.asm checkmorn EQUS "checktime MORN" @@ -54,7 +53,6 @@ displaylocation EQUS "landmarktotext" givepokeitem EQUS "givepokemail" checkpokeitem EQUS "checkpokemail" - ; macros/scripts/maps.asm mapconst: MACRO @@ -94,7 +92,6 @@ PERSONTYPE_SCRIPT EQUS "OBJECTTYPE_SCRIPT" PERSONTYPE_ITEMBALL EQUS "OBJECTTYPE_ITEMBALL" PERSONTYPE_TRAINER EQUS "OBJECTTYPE_TRAINER" - ; macros/scripts/movement.asm show_person EQUS "show_object" diff --git a/macros/scripts/maps.asm b/macros/scripts/maps.asm index d5f5b00e1..7f5947a55 100644 --- a/macros/scripts/maps.asm +++ b/macros/scripts/maps.asm @@ -3,7 +3,6 @@ map_id: MACRO db GROUP_\1, MAP_\1 ENDM - scene_script: MACRO ;\1: script pointer dw \1 @@ -75,7 +74,6 @@ object_event: MACRO dw \9 ENDM - trainer: MACRO ;\1: trainer group ;\2: trainer id diff --git a/macros/scripts/trade_anims.asm b/macros/scripts/trade_anims.asm index 633047b82..6227f2022 100644 --- a/macros/scripts/trade_anims.asm +++ b/macros/scripts/trade_anims.asm @@ -166,7 +166,6 @@ tradeanim_wait_180_if_ot_egg: MACRO db tradeanim_wait_180_if_ot_egg_command ENDM - ; Mobile enum_start $01 diff --git a/macros/wram.asm b/macros/wram.asm index cbf13a1e5..eec839b7d 100644 --- a/macros/wram.asm +++ b/macros/wram.asm @@ -76,7 +76,6 @@ red_party_struct: MACRO \1Special:: dw ENDM - battle_struct: MACRO \1Species:: db \1Item:: db @@ -114,7 +113,6 @@ box: MACRO \1End:: ds 2 ; padding ENDM - map_connection_struct: MACRO \1ConnectedMapGroup:: db \1ConnectedMapNumber:: db |