From c1ef7b75972fa4fbdf125bc85cc1a66f358151cd Mon Sep 17 00:00:00 2001 From: vulcandth Date: Mon, 6 Jun 2022 16:25:34 -0500 Subject: RGBDS syntax updates (#86) New MACRO and DEF syntax --- engine/overworld/dust_smoke.asm | 2 +- engine/overworld/movement.asm | 2 +- engine/overworld/player_animations.asm | 2 +- engine/overworld/unused_load_missable_object_data.asm | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'engine/overworld') diff --git a/engine/overworld/dust_smoke.asm b/engine/overworld/dust_smoke.asm index ed016107..ebc80f69 100644 --- a/engine/overworld/dust_smoke.asm +++ b/engine/overworld/dust_smoke.asm @@ -53,7 +53,7 @@ GetMoveBoulderDustFunctionPointer: pop hl ret -boulder_dust_adjust: MACRO +MACRO boulder_dust_adjust db \1, \2 ; coords dw \3 ; function ENDM diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm index dadf2194..e6ca8748 100644 --- a/engine/overworld/movement.asm +++ b/engine/overworld/movement.asm @@ -1,4 +1,4 @@ -MAP_TILESET_SIZE EQU $60 +DEF MAP_TILESET_SIZE EQU $60 UpdatePlayerSprite: ld a, [wSpritePlayerStateData2WalkAnimationCounter] diff --git a/engine/overworld/player_animations.asm b/engine/overworld/player_animations.asm index 5056c0b2..d3cc22be 100644 --- a/engine/overworld/player_animations.asm +++ b/engine/overworld/player_animations.asm @@ -483,7 +483,7 @@ FishingRodOAM: dbsprite 8, 10, 0, 0, $fe, 0 ; left dbsprite 11, 10, 0, 0, $fe, OAM_HFLIP ; right -fishing_gfx: MACRO +MACRO fishing_gfx dw \1 db \2 db BANK(\1) diff --git a/engine/overworld/unused_load_missable_object_data.asm b/engine/overworld/unused_load_missable_object_data.asm index 5888b091..8a519350 100644 --- a/engine/overworld/unused_load_missable_object_data.asm +++ b/engine/overworld/unused_load_missable_object_data.asm @@ -28,7 +28,7 @@ LoadMissableObjectData:: call CopyData ret -missable_object_map: MACRO +MACRO missable_object_map db \1 db \3 - \2 dw \2 -- cgit v1.3.1-sl0p