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

Identify some more unnamed labels

Browse Source
This commit is contained in:
Rangi
2020-10-05 11:24:47 -04:00
parent d9603e3e33
commit ff2d850219
6 changed files with 100 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
engine/overworld/npc_movement.asm
View File

@@ -58,7 +58,7 @@ CanObjectMoveInDirection:
ret
WillObjectBumpIntoWater:
call Function6f5f
call CanObjectLeaveTile
ret c
ld hl, OBJECT_NEXT_MAP_X
add hl, bc
@@ -69,7 +69,7 @@ WillObjectBumpIntoWater:
ld hl, OBJECT_PALETTE
add hl, bc
bit OAM_PRIORITY, [hl]
jp nz, Function6fa1
jp nz, WillObjectRemainOnWater
ld hl, OBJECT_NEXT_TILE
add hl, bc
ld a, [hl]
@@ -81,7 +81,7 @@ WillObjectBumpIntoWater:
ret
WillObjectBumpIntoLand:
call Function6f5f
call CanObjectLeaveTile
ret c
ld hl, OBJECT_NEXT_TILE
add hl, bc
@@ -96,7 +96,7 @@ WillObjectBumpIntoTile:
ld hl, OBJECT_NEXT_TILE
add hl, bc
ld a, [hl]
call Function6f7f
call GetSideWallDirectionMask
ret nc
push af
ld hl, OBJECT_DIRECTION_WALKING
@@ -105,7 +105,7 @@ WillObjectBumpIntoTile:
maskbits NUM_DIRECTIONS
ld e, a
ld d, 0
ld hl, .data_6f5b
ld hl, .dir_masks
add hl, de
pop af
and [hl]
@@ -113,17 +113,17 @@ WillObjectBumpIntoTile:
scf
ret
.data_6f5b
.dir_masks
db DOWN_MASK ; DOWN
db UP_MASK ; UP
db RIGHT_MASK ; LEFT
db LEFT_MASK ; RIGHT
Function6f5f:
CanObjectLeaveTile:
ld hl, OBJECT_STANDING_TILE
add hl, bc
ld a, [hl]
call Function6f7f
call GetSideWallDirectionMask
ret nc
push af
ld hl, OBJECT_DIRECTION_WALKING
@@ -131,7 +131,7 @@ Function6f5f:
maskbits NUM_DIRECTIONS
ld e, a
ld d, 0
ld hl, .data_6f7b
ld hl, .dir_masks
add hl, de
pop af
and [hl]
@@ -139,13 +139,13 @@ Function6f5f:
scf
ret
.data_6f7b
.dir_masks
db UP_MASK ; DOWN
db DOWN_MASK ; UP
db LEFT_MASK ; LEFT
db RIGHT_MASK ; RIGHT
Function6f7f:
GetSideWallDirectionMask:
ld d, a
and $f0
cp HI_NYBBLE_SIDE_WALLS
@@ -157,16 +157,16 @@ Function6f7f:
.continue
ld a, d
and 7
and $7
ld e, a
ld d, 0
ld hl, .data_6f99
ld hl, .side_wall_masks
add hl, de
ld a, [hl]
scf
ret
.data_6f99
.side_wall_masks
db RIGHT_MASK ; COLL_RIGHT_WALL/BUOY
db LEFT_MASK ; COLL_LEFT_WALL/BUOY
db DOWN_MASK ; COLL_UP_WALL/BUOY
@@ -176,7 +176,7 @@ Function6f7f:
db DOWN_MASK | RIGHT_MASK ; COLL_UP_RIGHT_WALL/BUOY
db DOWN_MASK | LEFT_MASK ; COLL_UP_LEFT_WALL/BUOY
Function6fa1:
WillObjectRemainOnWater:
ld hl, OBJECT_DIRECTION_WALKING
add hl, bc
ld a, [hl]
@@ -231,7 +231,7 @@ CheckFacingObject::
; Double the distance for counter tiles.
call CheckCounterTile
jr nz, .asm_6ff1
jr nz, .not_counter
ld a, [wPlayerStandingMapX]
sub d
@@ -247,7 +247,7 @@ CheckFacingObject::
add e
ld e, a
.asm_6ff1
.not_counter
ld bc, wObjectStructs ; redundant
ld a, 0
ldh [hMapObjectIndexBuffer], a
@@ -328,7 +328,7 @@ IsNPCAtCoord:
bit BIG_OBJECT_F, [hl]
jr z, .got
call Function7171
call WillObjectIntersectBigObject
jr nc, .ok
jr .ok2
@@ -489,7 +489,7 @@ Function7113: ; unreferenced
ld a, [hl]
cp SPRITEMOVEDATA_BIGDOLLSYM
jr nz, .not_snorlax
call Function7171
call WillObjectIntersectBigObject
jr c, .yes
jr .next
@@ -538,20 +538,20 @@ Function7113: ; unreferenced
scf
ret
Function7171:
WillObjectIntersectBigObject:
ld hl, OBJECT_NEXT_MAP_X
add hl, bc
ld a, d
sub [hl]
jr c, .nope
cp $2
cp 2 ; big doll width
jr nc, .nope
ld hl, OBJECT_NEXT_MAP_Y
add hl, bc
ld a, e
sub [hl]
jr c, .nope
cp $2
cp 2 ; big doll height
jr nc, .nope
scf
ret