aboutsummaryrefslogtreecommitdiffstats
path: root/data/events
diff options
context:
space:
mode:
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 f597a26d..363b1887 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 5705feed..1201c270 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 2afd1275..3e8ea745 100644
--- a/data/events/hidden_objects.asm
+++ b/data/events/hidden_objects.asm
@@ -82,14 +82,14 @@ HiddenObjectMaps:
dbw CINNABAR_POKECENTER, CinnabarPokecenterHiddenObjects
db -1 ; end
-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
@@ -99,7 +99,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
SilphCo11FHiddenObjects:
hidden_object 10, 12, SPRITE_FACING_UP, OpenPokemonCenterPC