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

WALKS_ON_WATER → SWIMMING

Browse Source
This commit is contained in:
Rangi 2018-05-23 19:10:15 -04:00
parent c85b32ed80
commit 50ea6d6e22
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
constants/map_object_constants.asm
View File

@ -64,11 +64,11 @@ HIGH_PRIORITY EQU 1 << HIGH_PRIORITY_F
OVERHEAD EQU 1 << OVERHEAD_F
; object_struct OBJECT_PALETTE bit flags
WALK_ON_WATER_F EQU 5
SWIMMING_F EQU 5
STRENGTH_BOULDER_F EQU 6
BIG_OBJECT_F EQU 7
WALK_ON_WATER EQU 1 << WALK_ON_WATER_F
SWIMMING EQU 1 << SWIMMING_F
STRENGTH_BOULDER EQU 1 << STRENGTH_BOULDER_F
BIG_OBJECT EQU 1 << BIG_OBJECT_F

2
data/sprites/map_objects.asm
View File

@ -295,7 +295,7 @@ SpriteMovementData:: ; 4273
db OBJECT_ACTION_STAND ; action
db 0 ; flags1
db 0 ; flags2
db WALK_ON_WATER ; palette flags
db SWIMMING ; palette flags
; 25
db SPRITEMOVEFN_00 ; movement function

6
engine/overworld/npc_movement.asm
View File

@ -2,8 +2,8 @@ Function6ec1: ; 6ec1
ld hl, OBJECT_PALETTE
add hl, bc
bit WALK_ON_WATER_F, [hl]
jr z, .walks_on_land
bit SWIMMING_F, [hl]
jr z, .not_swimming
ld hl, OBJECT_FLAGS1
add hl, bc
@ -17,7 +17,7 @@ Function6ec1: ; 6ec1
ret c
jr .resume
.walks_on_land
.not_swimming
ld hl, OBJECT_FLAGS1
add hl, bc
bit 4, [hl]