aboutsummaryrefslogtreecommitdiffstats
path: root/data/events
diff options
context:
space:
mode:
authorvulcandth <vulcandth@gmail.com>2022-06-06 16:25:31 -0500
committerGitHub <noreply@github.com>2022-06-06 17:25:31 -0400
commit6b5be9129cabe72b9f775b02db1bf7e7169153da (patch)
treed92012450c70f90bf8086bed32ec3dc87b68b332 /data/events
parentImproved Virtual Console patch identifiers (#357) (diff)
downloadpokeyellow-6b5be9129cabe72b9f775b02db1bf7e7169153da.tar.gz
pokeyellow-6b5be9129cabe72b9f775b02db1bf7e7169153da.tar.xz
pokeyellow-6b5be9129cabe72b9f775b02db1bf7e7169153da.zip
RGBDS syntax updates (#358)
New MACRO and DEF syntax
Diffstat (limited to 'data/events')
-rw-r--r--data/events/bench_guys.asm2
-rw-r--r--data/events/hidden_coins.asm2
-rw-r--r--data/events/hidden_item_coords.asm2
-rw-r--r--data/events/hidden_objects.asm6
4 files changed, 6 insertions, 6 deletions
diff --git a/data/events/bench_guys.asm b/data/events/bench_guys.asm
index 2e7eeb2a..8f3d0948 100644
--- a/data/events/bench_guys.asm
+++ b/data/events/bench_guys.asm
@@ -1,4 +1,4 @@
-bench_guy_text: MACRO
+MACRO bench_guy_text
db \1, \2
db_tx_pre \3
ENDM
diff --git a/data/events/hidden_coins.asm b/data/events/hidden_coins.asm
index bcdbcd80..f2485f50 100644
--- a/data/events/hidden_coins.asm
+++ b/data/events/hidden_coins.asm
@@ -1,4 +1,4 @@
-hidden_coin: MACRO
+MACRO hidden_coin
db \1, \3, \2
ENDM
diff --git a/data/events/hidden_item_coords.asm b/data/events/hidden_item_coords.asm
index 115f53aa..30619d6b 100644
--- a/data/events/hidden_item_coords.asm
+++ b/data/events/hidden_item_coords.asm
@@ -1,4 +1,4 @@
-hidden_item: MACRO
+MACRO hidden_item
db \1, \3, \2
ENDM
diff --git a/data/events/hidden_objects.asm b/data/events/hidden_objects.asm
index efb99026..55e33731 100644
--- a/data/events/hidden_objects.asm
+++ b/data/events/hidden_objects.asm
@@ -174,14 +174,14 @@ HiddenObjectPointers:
dw CeruleanCityHiddenObjects
dw Route4HiddenObjects
-hidden_object: MACRO
+MACRO hidden_object
db \2 ; y coord
db \1 ; x coord
db \3 ; item id
dba \4 ; object routine
ENDM
-hidden_text_predef: MACRO
+MACRO hidden_text_predef
db \2 ; y coord
db \1 ; x coord
db_tx_pre \3 ; text id
@@ -191,7 +191,7 @@ ENDM
; Some hidden objects use SPRITE_FACING_* values,
; but these do not actually prevent the player
; from interacting with them in any direction.
-ANY_FACING EQU $d0
+DEF ANY_FACING EQU $d0
TradeCenterHiddenObjects:
hidden_object 5, 4, ANY_FACING, CableClubRightGameboy