diff options
Diffstat (limited to 'macros')
| -rw-r--r-- | macros/coords.asm | 4 | ||||
| -rw-r--r-- | macros/legacy.asm | 2 | ||||
| -rw-r--r-- | macros/scripts/events.asm | 14 | ||||
| -rw-r--r-- | macros/scripts/movement.asm | 2 |
4 files changed, 12 insertions, 10 deletions
diff --git a/macros/coords.asm b/macros/coords.asm index 95c4cb041..0833c242c 100644 --- a/macros/coords.asm +++ b/macros/coords.asm @@ -26,11 +26,11 @@ ENDM dwcoord: MACRO ; x, y - rept _NARG / 2 +rept _NARG / 2 dw (\2) * SCREEN_WIDTH + (\1) + wTileMap shift shift - endr +endr ENDM ldcoord_a: MACRO diff --git a/macros/legacy.asm b/macros/legacy.asm index a139e02b4..9e452da28 100644 --- a/macros/legacy.asm +++ b/macros/legacy.asm @@ -51,6 +51,8 @@ reloadmapmusic EQUS "dontrestartmapmusic" resetfuncs EQUS "endall" storetext EQUS "battletowertext" displaylocation EQUS "landmarktotext" +givepokeitem EQUS "givepokemail" +checkpokeitem EQUS "checkpokemail" ; macros/scripts/maps.asm diff --git a/macros/scripts/events.asm b/macros/scripts/events.asm index 3723a3a8d..a8f6c2015 100644 --- a/macros/scripts/events.asm +++ b/macros/scripts/events.asm @@ -1,4 +1,4 @@ -; ScriptCommandTable indexes (see engine/scripting.asm) +; ScriptCommandTable indexes (see engine/overworld/scripting.asm) enum_start enum scall_command ; $00 @@ -315,15 +315,15 @@ giveegg: MACRO db \2 ; level ENDM - enum givepokeitem_command ; $2f -givepokeitem: MACRO - db givepokeitem_command + enum givepokemail_command ; $2f +givepokemail: MACRO + db givepokemail_command dw \1 ; pointer ENDM - enum checkpokeitem_command ; $30 -checkpokeitem: MACRO - db checkpokeitem_command + enum checkpokemail_command ; $30 +checkpokemail: MACRO + db checkpokemail_command dw \1 ; pointer ENDM diff --git a/macros/scripts/movement.asm b/macros/scripts/movement.asm index 451608723..83d1ad0e6 100644 --- a/macros/scripts/movement.asm +++ b/macros/scripts/movement.asm @@ -1,4 +1,4 @@ -; MovementPointers indexes (see engine/movement.asm) +; MovementPointers indexes (see engine/overworld/movement.asm) enum_start ; Directional movements |