pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-09-09 09:51:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Create data/collision/ for tile collision-related data

Browse Source
This commit is contained in:
Rangi 2020-10-27 10:00:56 -04:00
parent 66ddeeff6c
commit 2738858985
7 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
constants/collision_constants.asm
View File

@ -1,11 +1,11 @@
; collision permissions (see data/collision_permissions.asm) ; collision permissions (see data/collision/collision_permissions.asm)
LAND_TILE EQU $00 LAND_TILE EQU $00
WATER_TILE EQU $01 WATER_TILE EQU $01
WALL_TILE EQU $0f WALL_TILE EQU $0f
TALK EQU $10 TALK EQU $10
; collision data types (see data/tilesets/*_collision.asm) ; 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_FLOOR EQU $00
COLL_01 EQU $01 ; garbage COLL_01 EQU $01 ; garbage
COLL_03 EQU $03 ; garbage COLL_03 EQU $03 ; garbage

0
data/collision_permissions.asm → data/collision/collision_permissions.asm
View File

0
data/events/collision_stdscripts.asm → data/collision/collision_stdscripts.asm
View File

3
data/events/field_move_blocks.asm → data/collision/field_move_blocks.asm
View File

@ -1,3 +1,4 @@
; these blocks all use COLL_CUT_TREE in one quadrant
CutTreeBlockPointers: CutTreeBlockPointers:
; tileset, block list pointer ; tileset, block list pointer
dbw TILESET_JOHTO, .johto dbw TILESET_JOHTO, .johto
@ -42,6 +43,8 @@ CutTreeBlockPointers:
db $0f, $17, 0 db $0f, $17, 0
db -1 ; end db -1 ; end
; these blocks all use COLL_WHIRLPOOL in one quadrant
WhirlpoolBlockPointers: WhirlpoolBlockPointers:
dbw TILESET_JOHTO, .johto dbw TILESET_JOHTO, .johto
db -1 ; end db -1 ; end

2
engine/events/overworld.asm
View File

@ -271,7 +271,7 @@ CheckOverworldTileArrays:
xor a xor a
ret ret
INCLUDE "data/events/field_move_blocks.asm" INCLUDE "data/collision/field_move_blocks.asm"
FlashFunction: FlashFunction:
call .CheckUseFlash call .CheckUseFlash

2
engine/events/std_collision.asm
View File

@ -23,7 +23,7 @@ CheckFacingTileForStdScript::
xor a xor a
ret ret
INCLUDE "data/events/collision_stdscripts.asm" INCLUDE "data/collision/collision_stdscripts.asm"
Script_JumpStdFromRAM: Script_JumpStdFromRAM:
sjump wJumpStdScriptBuffer sjump wJumpStdScriptBuffer

2
main.asm
View File

@ -203,7 +203,7 @@ SECTION "bank13", ROMX
INCLUDE "engine/tilesets/map_palettes.asm" INCLUDE "engine/tilesets/map_palettes.asm"
INCLUDE "gfx/tileset_palette_maps.asm" INCLUDE "gfx/tileset_palette_maps.asm"
INCLUDE "data/collision_permissions.asm" INCLUDE "data/collision/collision_permissions.asm"
INCLUDE "engine/menus/empty_sram.asm" INCLUDE "engine/menus/empty_sram.asm"
INCLUDE "engine/menus/savemenu_copytilemapatonce.asm" INCLUDE "engine/menus/savemenu_copytilemapatonce.asm"
INCLUDE "engine/events/checksave.asm" INCLUDE "engine/events/checksave.asm"