diff options
Diffstat (limited to 'macros/scripts')
| -rw-r--r-- | macros/scripts/battle_commands.asm | 2 | ||||
| -rw-r--r-- | macros/scripts/events.asm | 10 | ||||
| -rw-r--r-- | macros/scripts/maps.asm | 33 |
3 files changed, 37 insertions, 8 deletions
diff --git a/macros/scripts/battle_commands.asm b/macros/scripts/battle_commands.asm index 5933740f0..4ae8dbaf4 100644 --- a/macros/scripts/battle_commands.asm +++ b/macros/scripts/battle_commands.asm @@ -3,7 +3,7 @@ command: MACRO \1 EQUS "db \1_command" ENDM -; BattleCommandPointers indexes (see data/battle_command_pointers.asm) +; BattleCommandPointers indexes (see data/battle/effect_command_pointers.asm) enum_start 1 command checkturn ; 01 command checkobedience ; 02 diff --git a/macros/scripts/events.asm b/macros/scripts/events.asm index 694a7cd12..40a5bbf46 100644 --- a/macros/scripts/events.asm +++ b/macros/scripts/events.asm @@ -424,9 +424,9 @@ readcoins: MACRO db \1 ; memory ENDM - enum RAM2MEM_command ; $3f -RAM2MEM: MACRO - db RAM2MEM_command + enum vartomem_command ; $3f +vartomem: MACRO + db vartomem_command db \1 ; memory ENDM @@ -483,7 +483,11 @@ ENDM enum refreshscreen_command ; $48 refreshscreen: MACRO db refreshscreen_command +if _NARG == 1 db \1 ; dummy +else + db 0 +endc ENDM enum closetext_command ; $49 diff --git a/macros/scripts/maps.asm b/macros/scripts/maps.asm index e9703531d..31a1f16d9 100644 --- a/macros/scripts/maps.asm +++ b/macros/scripts/maps.asm @@ -9,6 +9,12 @@ scene_script: MACRO dw \1, 0 ENDM +callback: MACRO +;\1: type: a MAPCALLBACK_* constant +;\2: script pointer + dbw \1, \2 +ENDM + warp_def: MACRO ;\1: x: left to right, starts at 0 ;\2: y: top to bottom, starts at 0 @@ -23,9 +29,10 @@ coord_event: MACRO ;\2: y: top to bottom, starts at 0 ;\3: scene id: controlled by setscene/setmapscene ;\4: script pointer - db \3, \2, \1, $0 + db \3, \2, \1 + db 0 ; filler dw \4 - db $0, $0 + db 0, 0 ; filler ENDM bg_event: MACRO @@ -91,6 +98,12 @@ else endc ENDM +hiddenitem: MACRO +;\1: flag: an EVENT_* constant +;\2: item: from constants/item_constants.asm + dwb \1, \2 +ENDM + elevfloor: MACRO ;\1: floor: a FLOOR_* constant ;\2: warp destination: starts at 1 @@ -99,10 +112,22 @@ elevfloor: MACRO map \3 ENDM +conditional_event: MACRO +;\1: flag: an EVENT_* constant +;\2: script pointer + dw \1, \2 +ENDM + +cmdqueue: MACRO +;\1: type: a CMDQUEUE_* constant +;\2: data pointer + dbw \1, \2 + dw 0 ; filler +ENDM + stonetable: MACRO ;\1: warp id ;\2: object_event id ;\3: script pointer - db \1, \2 - dw \3 + dbbw \1, \2, \3 ENDM |