pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Implement Surf technique, avoid facing-tile events when player has yet to STEP_TURN or while not in BOARDEVENT_HANDLE_BOARD [bugfix to previous two commits] (#34)

Browse Source 
new tile permission SPACE_TILE added, which acts as WATER_TILE while on PLAYER_SURF or PLAYER_SURF_PIKA state, as LAND_TILE otherwise
This commit is contained in:
xCrystal
2023-12-30 00:27:50 +01:00
parent 303deca959
commit aa91909388
9 changed files with 96 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
data/collision/collision_permissions.asm
View File

@@ -209,22 +209,22 @@ TileCollisionTable::
db WATER_TILE ; cd
db WATER_TILE ; ce
db WATER_TILE ; cf
db LAND_TILE ; COLL_BLUE_SPACE
db LAND_TILE ; COLL_RED_SPACE
db LAND_TILE ; COLL_GREEN_SPACE
db LAND_TILE ; COLL_ITEM_SPACE
db LAND_TILE ; COLL_POKEMON_SPACE
db LAND_TILE ; COLL_MINIGAME_SPACE
db LAND_TILE ; COLL_END_SPACE
db LAND_TILE ; COLL_GREY_SPACE
db LAND_TILE ; COLL_BRANCH_SPACE
db LAND_TILE ; COLL_UNION_SPACE
db LAND_TILE ; da
db LAND_TILE ; db
db LAND_TILE ; dc
db LAND_TILE ; dd
db LAND_TILE ; de
db LAND_TILE ; df
db SPACE_TILE ; COLL_BLUE_SPACE
db SPACE_TILE ; COLL_RED_SPACE
db SPACE_TILE ; COLL_GREEN_SPACE
db SPACE_TILE ; COLL_ITEM_SPACE
db SPACE_TILE ; COLL_POKEMON_SPACE
db SPACE_TILE ; COLL_MINIGAME_SPACE
db SPACE_TILE ; COLL_END_SPACE
db SPACE_TILE ; COLL_GREY_SPACE
db SPACE_TILE ; COLL_BRANCH_SPACE
db SPACE_TILE ; COLL_UNION_SPACE
db SPACE_TILE ; da
db SPACE_TILE ; db
db SPACE_TILE ; dc
db SPACE_TILE ; dd
db SPACE_TILE ; de
db SPACE_TILE ; df
db LAND_TILE ; e0
db LAND_TILE ; e1
db LAND_TILE ; e2

34
data/tilesets/board_debug_1_collision.asm
View File

@@ -144,10 +144,10 @@
tilecoll BLUE_SPACE, FLOOR, FLOOR, FLOOR ; 8f
tilecoll BLUE_SPACE, FLOOR, FLOOR, FLOOR ; 90
tilecoll BLUE_SPACE, FLOOR, FLOOR, FLOOR ; 91
tilecoll BLUE_SPACE, FLOOR, FLOOR, FLOOR ; 92
tilecoll BLUE_SPACE, FLOOR, FLOOR, FLOOR ; 93
tilecoll BLUE_SPACE, FLOOR, FLOOR, FLOOR ; 94
tilecoll BLUE_SPACE, FLOOR, FLOOR, FLOOR ; 95
tilecoll BLUE_SPACE, WATER, WATER, WATER ; 92
tilecoll BLUE_SPACE, WATER, WATER, WATER ; 93
tilecoll BLUE_SPACE, WATER, FLOOR, WATER ; 94
tilecoll BLUE_SPACE, WATER, FLOOR, WATER ; 95
tilecoll BLUE_SPACE, FLOOR, FLOOR, FLOOR ; 96
tilecoll BLUE_SPACE, FLOOR, FLOOR, FLOOR ; 97
tilecoll POKEMON_SPACE, FLOOR, FLOOR, FLOOR ; 98
@@ -176,10 +176,10 @@
tilecoll POKEMON_SPACE, FLOOR, FLOOR, FLOOR ; af
tilecoll RED_SPACE, FLOOR, FLOOR, FLOOR ; b0
tilecoll RED_SPACE, FLOOR, FLOOR, FLOOR ; b1
tilecoll RED_SPACE, FLOOR, FLOOR, FLOOR ; b2
tilecoll RED_SPACE, FLOOR, FLOOR, FLOOR ; b3
tilecoll RED_SPACE, FLOOR, FLOOR, FLOOR ; b4
tilecoll RED_SPACE, FLOOR, FLOOR, FLOOR ; b5
tilecoll RED_SPACE, WATER, WATER, WATER ; b2
tilecoll RED_SPACE, WATER, WATER, WATER ; b3
tilecoll RED_SPACE, WATER, FLOOR, WATER ; b4
tilecoll RED_SPACE, WATER, FLOOR, WATER ; b5
tilecoll RED_SPACE, FLOOR, FLOOR, FLOOR ; b6
tilecoll RED_SPACE, FLOOR, FLOOR, FLOOR ; b7
tilecoll RED_SPACE, FLOOR, FLOOR, FLOOR ; b8
@@ -205,13 +205,13 @@
tilecoll GREEN_SPACE, FLOOR, FLOOR, FLOOR ; cc
tilecoll GREEN_SPACE, FLOOR, FLOOR, FLOOR ; cd
tilecoll ITEM_SPACE, FLOOR, FLOOR, FLOOR ; ce
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; cf
tilecoll MINIGAME_SPACE, FLOOR, FLOOR, FLOOR ; cf
tilecoll END_SPACE, FLOOR, FLOOR, FLOOR ; d0
tilecoll GREEN_SPACE, FLOOR, FLOOR, FLOOR ; d1
tilecoll ITEM_SPACE, FLOOR, FLOOR, FLOOR ; d2
tilecoll MINIGAME_SPACE, FLOOR, FLOOR, FLOOR ; d3
tilecoll GREEN_SPACE, FLOOR, FLOOR, FLOOR ; d4
tilecoll GREEN_SPACE, FLOOR, FLOOR, FLOOR ; d5
tilecoll ITEM_SPACE, WATER, WATER, WATER ; d2
tilecoll MINIGAME_SPACE, WATER, WATER, WATER ; d3
tilecoll GREEN_SPACE, WATER, FLOOR, WATER ; d4
tilecoll GREEN_SPACE, WATER, FLOOR, WATER ; d5
tilecoll ITEM_SPACE, FLOOR, FLOOR, FLOOR ; d6
tilecoll MINIGAME_SPACE, FLOOR, FLOOR, FLOOR ; d7
tilecoll END_SPACE, FLOOR, FLOOR, FLOOR ; d8
@@ -240,10 +240,10 @@
tilecoll GREY_SPACE, FLOOR, FLOOR, FLOOR ; ef
tilecoll GREY_SPACE, FLOOR, FLOOR, FLOOR ; f0
tilecoll GREY_SPACE, FLOOR, FLOOR, FLOOR ; f1
tilecoll GREY_SPACE, FLOOR, FLOOR, FLOOR ; f2
tilecoll GREY_SPACE, FLOOR, FLOOR, FLOOR ; f3
tilecoll GREY_SPACE, FLOOR, FLOOR, FLOOR ; f4
tilecoll GREY_SPACE, FLOOR, FLOOR, FLOOR ; f5
tilecoll GREY_SPACE, WATER, WATER, WATER ; f2
tilecoll GREY_SPACE, WATER, WATER, WATER ; f3
tilecoll GREY_SPACE, WATER, FLOOR, WATER ; f4
tilecoll GREY_SPACE, WATER, FLOOR, WATER ; f5
tilecoll GREY_SPACE, FLOOR, FLOOR, FLOOR ; f6
tilecoll GREY_SPACE, FLOOR, FLOOR, FLOOR ; f7
tilecoll GREY_SPACE, FLOOR, FLOOR, FLOOR ; f8

2
data/tilesets/board_debug_1_metatiles.bin
View File

File diff suppressed because one or more lines are too long