diff options
Diffstat (limited to 'macros')
| -rw-r--r-- | macros/event.asm | 1 | ||||
| -rw-r--r-- | macros/map.asm | 11 | ||||
| -rw-r--r-- | macros/move_anim.asm | 1 | ||||
| -rw-r--r-- | macros/movement.asm | 1 | ||||
| -rw-r--r-- | macros/sound.asm | 2 | ||||
| -rw-r--r-- | macros/text.asm | 8 | ||||
| -rwxr-xr-x | macros/tilesets.asm (renamed from macros/pals.asm) | 4 | ||||
| -rwxr-xr-x | macros/trade_anim.asm | 2 |
8 files changed, 19 insertions, 11 deletions
diff --git a/macros/event.asm b/macros/event.asm index a439b8fbf..b00b6a6da 100644 --- a/macros/event.asm +++ b/macros/event.asm @@ -1,3 +1,4 @@ +; ScriptCommandTable indexes (see engine/scripting.asm) enum_start enum scall_command diff --git a/macros/map.asm b/macros/map.asm index eb78be725..f153806da 100644 --- a/macros/map.asm +++ b/macros/map.asm @@ -21,13 +21,10 @@ xy_trigger: macro ;\1: number: controlled by dotrigger/domaptrigger ;\2: y: top to bottom, starts at 0 ;\3: x: left to right, starts at 0 -;\4: unknown1: $0 -;\5: script pointer -;\6: unknown2: $0 -;\7: unknown3: $0 - db \1, \2, \3, \4 - dw \5 - db \6, \7 +;\4: script pointer + db \1, \2, \3, $0 + dw \4 + db $0, $0 endm signpost: macro diff --git a/macros/move_anim.asm b/macros/move_anim.asm index c795f561e..9859fbd50 100644 --- a/macros/move_anim.asm +++ b/macros/move_anim.asm @@ -5,6 +5,7 @@ endc db \1 endm +; BattleAnimCommands indexes (see battle/anim_commands.asm) enum_start $d0 enum anim_obj_command ; d0 diff --git a/macros/movement.asm b/macros/movement.asm index 53b8bf107..a2acf1356 100644 --- a/macros/movement.asm +++ b/macros/movement.asm @@ -1,3 +1,4 @@ +; MovementPointers indexes (see engine/movement.asm) enum_start ; Directional movements diff --git a/macros/sound.asm b/macros/sound.asm index ad6a50749..bac979a5f 100644 --- a/macros/sound.asm +++ b/macros/sound.asm @@ -23,7 +23,9 @@ cry_header: macro dw \1, \2, \3 endm +; MusicCommands indexes (see audio/engine.asm) enum_start $d8 + enum notetype_cmd octave: macro db notetype_cmd - (\1) diff --git a/macros/text.asm b/macros/text.asm index 08004f32a..e29f8a511 100644 --- a/macros/text.asm +++ b/macros/text.asm @@ -1,15 +1,15 @@ text EQUS "db $00," ; Start writing text. next EQUS "db $4e," ; Move a line down. line EQUS "db $4f," ; Start writing at the bottom line. -page EQUS "db $50," ; Start a new Pokedex page. +page EQUS "db $50," ; Start a new Pokédex page. para EQUS "db $51," ; Start a new paragraph. cont EQUS "db $55," ; Scroll to the next line. done EQUS "db $57" ; End a text box. prompt EQUS "db $58" ; Prompt the player to end a text box (initiating some other event). -; TX_RAM EQU $01 -; TX_FAR EQU $16 - enum_start 1 +; TextCommands indexes (see home/text.asm) + enum_start $01 + enum TX_RAM text_from_ram: MACRO db TX_RAM diff --git a/macros/pals.asm b/macros/tilesets.asm index 72bb4c96d..6a233254e 100755 --- a/macros/pals.asm +++ b/macros/tilesets.asm @@ -7,3 +7,7 @@ rept (_NARG +- 1) / 2 shift endr endm + +tilecoll: MACRO + db COLL_\1, COLL_\2, COLL_\3, COLL_\4 +endm diff --git a/macros/trade_anim.asm b/macros/trade_anim.asm index c590cb620..c38dc75d6 100755 --- a/macros/trade_anim.asm +++ b/macros/trade_anim.asm @@ -1,4 +1,6 @@ +; DoTradeAnimation.JumpTable indexes (see engine/trade/animation.asm) enum_start + enum tradeanim_next_command tradeanim_next: macro db tradeanim_next_command ; 00 |