aboutsummaryrefslogtreecommitdiffstats
path: root/engine/overworld
diff options
context:
space:
mode:
authorvulcandth <vulcandth@gmail.com>2022-06-06 16:25:34 -0500
committerGitHub <noreply@github.com>2022-06-06 17:25:34 -0400
commitc1ef7b75972fa4fbdf125bc85cc1a66f358151cd (patch)
treebcf71939ec5573ed5001c4a4b4342d26e5d8f9b1 /engine/overworld
parentImproved Virtual Console patch identifiers (#85) (diff)
downloadpokeyellow-c1ef7b75972fa4fbdf125bc85cc1a66f358151cd.tar.gz
pokeyellow-c1ef7b75972fa4fbdf125bc85cc1a66f358151cd.tar.xz
pokeyellow-c1ef7b75972fa4fbdf125bc85cc1a66f358151cd.zip
RGBDS syntax updates (#86)
New MACRO and DEF syntax
Diffstat (limited to 'engine/overworld')
-rw-r--r--engine/overworld/dust_smoke.asm2
-rw-r--r--engine/overworld/movement.asm2
-rw-r--r--engine/overworld/player_animations.asm2
-rw-r--r--engine/overworld/unused_load_missable_object_data.asm2
4 files changed, 4 insertions, 4 deletions
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