aboutsummaryrefslogtreecommitdiffstats
path: root/data/events
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2024-05-05 11:06:40 -0500
committerdannye <33dannye@gmail.com>2024-05-05 11:06:40 -0500
commitb135272f9510ed78e8c062efe552d6dbdcc1523f (patch)
tree5dc1941a3b42651f268dbb90f6e3170ccd977408 /data/events
parentRemove pcm.py since pcm.c handles it (diff)
parentUse constant in wram for hidden item flags (#445) (diff)
downloadpokeyellow-b135272f9510ed78e8c062efe552d6dbdcc1523f.tar.gz
pokeyellow-b135272f9510ed78e8c062efe552d6dbdcc1523f.tar.xz
pokeyellow-b135272f9510ed78e8c062efe552d6dbdcc1523f.zip
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'data/events')
-rw-r--r--data/events/hidden_coins.asm2
-rw-r--r--data/events/hidden_item_coords.asm2
2 files changed, 4 insertions, 0 deletions
diff --git a/data/events/hidden_coins.asm b/data/events/hidden_coins.asm
index f2485f50..1fa5af23 100644
--- a/data/events/hidden_coins.asm
+++ b/data/events/hidden_coins.asm
@@ -3,6 +3,7 @@ MACRO hidden_coin
ENDM
HiddenCoinCoords:
+ table_width 3, HiddenCoinCoords
; map id, x, y
hidden_coin GAME_CORNER, 0, 8
hidden_coin GAME_CORNER, 1, 16
@@ -16,4 +17,5 @@ HiddenCoinCoords:
hidden_coin GAME_CORNER, 11, 7
hidden_coin GAME_CORNER, 15, 8
hidden_coin GAME_CORNER, 12, 15
+ assert_max_table_length MAX_HIDDEN_COINS
db -1 ; end
diff --git a/data/events/hidden_item_coords.asm b/data/events/hidden_item_coords.asm
index 1201c270..b6fce06a 100644
--- a/data/events/hidden_item_coords.asm
+++ b/data/events/hidden_item_coords.asm
@@ -3,6 +3,7 @@ MACRO hidden_item
ENDM
HiddenItemCoords:
+ table_width 3, HiddenItemCoords
; map id, x, y
hidden_item SILPH_CO_5F, 12, 3
hidden_item SILPH_CO_9F, 2, 15
@@ -59,4 +60,5 @@ HiddenItemCoords:
hidden_item CELADON_CITY, 48, 15
hidden_item SAFARI_ZONE_GATE, 10, 1 ; inaccessible
hidden_item POKEMON_MANSION_1F, 8, 16
+ assert_max_table_length MAX_HIDDEN_ITEMS
db -1 ; end