summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/events/collision_stdscripts.asm25
1 files changed, 15 insertions, 10 deletions
diff --git a/data/events/collision_stdscripts.asm b/data/events/collision_stdscripts.asm
index dff26dd8..5c94c62f 100644
--- a/data/events/collision_stdscripts.asm
+++ b/data/events/collision_stdscripts.asm
@@ -1,13 +1,18 @@
-; stdscripts associated with tile collisions
+; std scripts associated with tile collisions
+
+stdcoll: MACRO
+ db \1
+ dw (\2StdScript - StdScripts) / 3
+ENDM
TileCollisionStdScripts:
- ; collision type, stdscript
- dbw COLL_BOOKSHELF, magazinebookshelf
- dbw COLL_PC, pcscript
- dbw COLL_RADIO, radio1
- dbw COLL_TOWN_MAP, townmap
- dbw COLL_MART_SHELF, merchandiseshelf
- dbw COLL_TV, tv
- dbw COLL_WINDOW, window
- dbw COLL_INCENSE_BURNER, incenseburner
+ ; collision type, std script
+ stdcoll COLL_BOOKSHELF, MagazineBookshelfScript
+ stdcoll COLL_PC, PCScript
+ stdcoll COLL_RADIO, Radio1Script
+ stdcoll COLL_TOWN_MAP, TownMapScript
+ stdcoll COLL_MART_SHELF, MerchandiseShelfScript
+ stdcoll COLL_TV, TVScript
+ stdcoll COLL_WINDOW, WindowScript
+ stdcoll COLL_INCENSE_BURNER, IncenseBurnerScript
db -1 ; end