diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-06-11 10:17:12 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-11 10:17:12 -0400 |
| commit | 0cf0a5b9b446c7d743355852667a987011839605 (patch) | |
| tree | de35c73058f041e5551a64e3f9d99e8a4fdfc5b5 /data | |
| parent | 32e7e368f4b3ae61bf4a219e89fc04ac8263f431 (diff) | |
| parent | 60c71add580aa3aa5b096beeadd9bb83145768f6 (diff) | |
Merge pull request #729 from Rangi42/master
Treat std scripts like specials and predefs
Diffstat (limited to 'data')
| -rw-r--r-- | data/events/collision_stdscripts.asm | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/data/events/collision_stdscripts.asm b/data/events/collision_stdscripts.asm index dff26dd85..5c94c62f9 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 |