From 6e142eb5b365659ec9e13360b663037cbfa615af Mon Sep 17 00:00:00 2001 From: Rangi Date: Tue, 27 Oct 2020 10:00:51 -0400 Subject: Create data/collision/ for tile collision-related data --- data/events/collision_stdscripts.asm | 18 ------------- data/events/field_move_blocks.asm | 52 ------------------------------------ 2 files changed, 70 deletions(-) delete mode 100644 data/events/collision_stdscripts.asm delete mode 100644 data/events/field_move_blocks.asm (limited to 'data/events') diff --git a/data/events/collision_stdscripts.asm b/data/events/collision_stdscripts.asm deleted file mode 100644 index 5c94c62f..00000000 --- a/data/events/collision_stdscripts.asm +++ /dev/null @@ -1,18 +0,0 @@ -; std scripts associated with tile collisions - -stdcoll: MACRO - db \1 - dw (\2StdScript - StdScripts) / 3 -ENDM - -TileCollisionStdScripts: - ; 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 diff --git a/data/events/field_move_blocks.asm b/data/events/field_move_blocks.asm deleted file mode 100644 index fea80f53..00000000 --- a/data/events/field_move_blocks.asm +++ /dev/null @@ -1,52 +0,0 @@ -CutTreeBlockPointers: -; tileset, block list pointer - dbw TILESET_JOHTO, .johto - dbw TILESET_JOHTO_MODERN, .johto_modern - dbw TILESET_KANTO, .kanto - dbw TILESET_PARK, .park - dbw TILESET_FOREST, .forest - db -1 ; end - -.johto: -; facing block, replacement block, animation - db $03, $02, 1 ; grass - db $5b, $3c, 0 ; tree - db $5f, $3d, 0 ; tree - db $63, $3f, 0 ; tree - db $67, $3e, 0 ; tree - db -1 ; end - -.johto_modern: -; facing block, replacement block, animation - db $03, $02, $01 ; grass - db -1 ; end - -.kanto: -; facing block, replacement block, animation - db $0b, $0a, 1 ; grass - db $32, $6d, 0 ; tree - db $33, $6c, 0 ; tree - db $34, $6f, 0 ; tree - db $35, $4c, 0 ; tree - db $60, $6e, 0 ; tree - db -1 ; end - -.park: -; facing block, replacement block, animation - db $13, $03, 1 ; grass - db $03, $04, 1 ; grass - db -1 ; end - -.forest: -; facing block, replacement block, animation - db $0f, $17, 0 - db -1 ; end - -WhirlpoolBlockPointers: - dbw TILESET_JOHTO, .johto - db -1 ; end - -.johto: -; facing block, replacement block, animation - db $07, $36, 0 - db -1 ; end -- cgit v1.2.3