pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

formatting in TileTypeTable and tile checks

Browse Source
This commit is contained in:
yenatch 2013-08-20 17:08:00 -04:00
parent 636a960909
commit 9ac0fc631b
1 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
main.asm
View File

@ -2797,23 +2797,27 @@ Function1852: ; 1852
GetTileType: ; 185d GetTileType: ; 185d
; checks the properties of a tile ; Get the properties of tile a in TileTypeTable
; input: a = tile id
push de push de
push hl push hl
ld hl, TileTypeTable ld hl, TileTypeTable
ld e, a ld e, a
ld d, $00 ld d, 0
add hl, de add hl, de
ld a, [hROMBank] ; current bank
ld a, [hROMBank]
push af push af
ld a, BANK(TileTypeTable) ld a, BANK(TileTypeTable)
rst Bankswitch rst Bankswitch
ld e, [hl] ; get tile type ld e, [hl]
pop af pop af
rst Bankswitch ; return to current bank rst Bankswitch
ld a, e ld a, e
and a, $0f ; lo nybble only and $f ; lo nybble only
pop hl pop hl
pop de pop de
ret ret
@ -2852,22 +2856,20 @@ Function188e: ; 188e
ret ret
; 1894 ; 1894
Function1894: ; 1894 CheckCutTreeTile: ; 1894
cp $12 cp $12
ret z ret z
cp $1a cp $1a
ret ret
; 189a ; 189a
Function189a: ; 189a CheckHeadbuttTreeTile: ; 189a
cp $15 cp $15
ret z ret z
cp $1d cp $1d
ret ret
; 18a0 ; 18a0
CheckCounterTile: ; 18a0 CheckCounterTile: ; 18a0
cp $90 cp $90
ret z ret z
@ -2893,9 +2895,9 @@ CheckIceTile: ; 18ac
CheckWhirlpoolTile: ; 18b4 CheckWhirlpoolTile: ; 18b4
nop nop
cp $24 ; whirlpool 1 cp $24
ret z ret z
cp $2c ; whirlpool 2 cp $2c
ret z ret z
scf scf
ret ret
@ -2908,21 +2910,19 @@ CheckWaterfallTile: ; 18bd
ret ret
; 18c3 ; 18c3
CheckStandingOnEntrance: ; 18c3
Function18c3: ; 18c3
ld a, [StandingTile] ld a, [StandingTile]
cp $71 cp $71 ; door
ret z ret z
cp $79 cp $79
ret z ret z
cp $7a cp $7a ; stairs
ret z ret z
cp $7b cp $7b ; cave
ret ret
; 18d2 ; 18d2
GetMapObject: ; 18d2 GetMapObject: ; 18d2
; Return the location of map object a in bc. ; Return the location of map object a in bc.
ld hl, MapObjects ld hl, MapObjects
@ -21332,7 +21332,7 @@ Functionce7d: ; ce7d
Functionce86: ; ce86 Functionce86: ; ce86
call GetFacingTileCoord call GetFacingTileCoord
call Function189a call CheckHeadbuttTreeTile
jr nz, .asm_ce97 jr nz, .asm_ce97
ld hl, $4ea7 ld hl, $4ea7
call Function31cd call Function31cd
@ -50001,8 +50001,12 @@ INCBIN "baserom.gbc", $4ce05, $4ce1f - $4ce05
TileTypeTable: ; 4ce1f TileTypeTable: ; 4ce1f
; 256 tiletypes ; 256 tiletypes
; 00 = land ; 00 land
; 01 = water ; 01 water
; 0f wall
; 11 talkable water
; 1f talkable wall
db $00, $00, $00, $00, $00, $00, $00, $0f db $00, $00, $00, $00, $00, $00, $00, $0f
db $00, $00, $00, $00, $00, $00, $00, $0f db $00, $00, $00, $00, $00, $00, $00, $0f
db $00, $00, $1f, $00, $00, $1f, $00, $00 db $00, $00, $1f, $00, $00, $1f, $00, $00
@ -60477,7 +60481,7 @@ Function97c5f: ; 97c5f
ld hl, $765b ld hl, $765b
rst FarCall rst FarCall
jr c, .asm_97cb9 jr c, .asm_97cb9
call Function1894 call CheckCutTreeTile
jr nz, .asm_97c7b jr nz, .asm_97c7b
ld a, $3 ld a, $3
ld hl, $5186 ld hl, $5186
@ -60504,7 +60508,7 @@ Function97c5f: ; 97c5f
.asm_97c9b .asm_97c9b
ld a, [EngineBuffer1] ld a, [EngineBuffer1]
call Function189a call CheckHeadbuttTreeTile
jr nz, .asm_97cad jr nz, .asm_97cad
ld a, $3 ld a, $3
ld hl, $4ec9 ld hl, $4ec9