mirror of
https://github.com/pret/pokegold.git
synced 2026-08-09 11:47:26 -05:00
Create data/collision/ for tile collision-related data
This commit is contained in:
parent
676f2f12e3
commit
6e142eb5b3
|
|
@ -1,11 +1,11 @@
|
|||
; collision permissions (see data/collision_permissions.asm)
|
||||
; collision permissions (see data/collision/collision_permissions.asm)
|
||||
LAND_TILE EQU $00
|
||||
WATER_TILE EQU $01
|
||||
WALL_TILE EQU $0f
|
||||
TALK EQU $10
|
||||
|
||||
; collision data types (see data/tilesets/*_collision.asm)
|
||||
; TileCollisionTable indexes (see data/collision_permissions.asm)
|
||||
; TileCollisionTable indexes (see data/collision/collision_permissions.asm)
|
||||
COLL_FLOOR EQU $00
|
||||
COLL_01 EQU $01 ; garbage
|
||||
COLL_03 EQU $03 ; garbage
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
; these blocks all use COLL_CUT_TREE in one quadrant
|
||||
CutTreeBlockPointers:
|
||||
; tileset, block list pointer
|
||||
dbw TILESET_JOHTO, .johto
|
||||
|
|
@ -42,6 +43,8 @@ CutTreeBlockPointers:
|
|||
db $0f, $17, 0
|
||||
db -1 ; end
|
||||
|
||||
|
||||
; these blocks all use COLL_WHIRLPOOL in one quadrant
|
||||
WhirlpoolBlockPointers:
|
||||
dbw TILESET_JOHTO, .johto
|
||||
db -1 ; end
|
||||
|
|
@ -268,7 +268,7 @@ CheckOverworldTileArrays:
|
|||
xor a
|
||||
ret
|
||||
|
||||
INCLUDE "data/events/field_move_blocks.asm"
|
||||
INCLUDE "data/collision/field_move_blocks.asm"
|
||||
|
||||
FlashFunction:
|
||||
call .CheckUseFlash
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ CheckFacingTileForStdScript::
|
|||
xor a
|
||||
ret
|
||||
|
||||
INCLUDE "data/events/collision_stdscripts.asm"
|
||||
INCLUDE "data/collision/collision_stdscripts.asm"
|
||||
|
||||
Script_JumpStdFromRAM:
|
||||
sjump wJumpStdScriptBuffer
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user