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

More sprite movement data flag constants

Browse Source
This commit is contained in:
Rangi 2018-05-23 19:06:04 -04:00
parent c5d18de8ff
commit c85b32ed80
5 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
constants/map_object_constants.asm
View File

@ -63,6 +63,15 @@ LOW_PRIORITY EQU 1 << LOW_PRIORITY_F
HIGH_PRIORITY EQU 1 << HIGH_PRIORITY_F HIGH_PRIORITY EQU 1 << HIGH_PRIORITY_F
OVERHEAD EQU 1 << OVERHEAD_F OVERHEAD EQU 1 << OVERHEAD_F
; object_struct OBJECT_PALETTE bit flags
WALK_ON_WATER_F EQU 5
STRENGTH_BOULDER_F EQU 6
BIG_OBJECT_F EQU 7
WALK_ON_WATER EQU 1 << WALK_ON_WATER_F
STRENGTH_BOULDER EQU 1 << STRENGTH_BOULDER_F
BIG_OBJECT EQU 1 << BIG_OBJECT_F
; map_object struct members (see macros/wram.asm) ; map_object struct members (see macros/wram.asm)
const_def const_def
const MAPOBJECT_OBJECT_STRUCT_ID ; 0 const MAPOBJECT_OBJECT_STRUCT_ID ; 0

10
data/sprites/map_objects.asm
View File

@ -175,7 +175,7 @@ SpriteMovementData:: ; 4273
db OBJECT_ACTION_BIG_DOLL_SYM ; action db OBJECT_ACTION_BIG_DOLL_SYM ; action
db 1 << 1 | FIXED_FACING | SLIDING | 1 << 5 ; flags1 db 1 << 1 | FIXED_FACING | SLIDING | 1 << 5 ; flags1
db LOW_PRIORITY ; flags2 db LOW_PRIORITY ; flags2
db 1 << 6 | 1 << 7 ; palette flags db STRENGTH_BOULDER | BIG_OBJECT ; palette flags
; SPRITEMOVEDATA_POKEMON ; SPRITEMOVEDATA_POKEMON
db SPRITEMOVEFN_BOUNCE ; movement function db SPRITEMOVEFN_BOUNCE ; movement function
@ -207,7 +207,7 @@ SpriteMovementData:: ; 4273
db OBJECT_ACTION_STAND ; action db OBJECT_ACTION_STAND ; action
db 1 << 1 | FIXED_FACING | SLIDING | 1 << 5 ; flags1 db 1 << 1 | FIXED_FACING | SLIDING | 1 << 5 ; flags1
db 0 ; flags2 db 0 ; flags2
db 1 << 6 ; palette flags db STRENGTH_BOULDER ; palette flags
; SPRITEMOVEDATA_FOLLOWNOTEXACT ; SPRITEMOVEDATA_FOLLOWNOTEXACT
db SPRITEMOVEFN_FOLLOWNOTEXACT ; movement function db SPRITEMOVEFN_FOLLOWNOTEXACT ; movement function
@ -263,7 +263,7 @@ SpriteMovementData:: ; 4273
db OBJECT_ACTION_BIG_DOLL_ASYM ; action db OBJECT_ACTION_BIG_DOLL_ASYM ; action
db 1 << 1 | FIXED_FACING | SLIDING | 1 << 5 ; flags1 db 1 << 1 | FIXED_FACING | SLIDING | 1 << 5 ; flags1
db LOW_PRIORITY ; flags2 db LOW_PRIORITY ; flags2
db 1 << 6 | 1 << 7 ; palette flags db STRENGTH_BOULDER | BIG_OBJECT ; palette flags
; SPRITEMOVEDATA_BIGDOLL ; SPRITEMOVEDATA_BIGDOLL
db SPRITEMOVEFN_STRENGTH ; movement function db SPRITEMOVEFN_STRENGTH ; movement function
@ -271,7 +271,7 @@ SpriteMovementData:: ; 4273
db OBJECT_ACTION_BIG_DOLL ; action db OBJECT_ACTION_BIG_DOLL ; action
db 1 << 1 | FIXED_FACING | SLIDING | 1 << 5 ; flags1 db 1 << 1 | FIXED_FACING | SLIDING | 1 << 5 ; flags1
db LOW_PRIORITY ; flags2 db LOW_PRIORITY ; flags2
db 1 << 6 | 1 << 7 ; palette flags db STRENGTH_BOULDER | BIG_OBJECT ; palette flags
; SPRITEMOVEDATA_BOULDERDUST ; SPRITEMOVEDATA_BOULDERDUST
db SPRITEMOVEFN_BOULDERDUST ; movement function db SPRITEMOVEFN_BOULDERDUST ; movement function
@ -295,7 +295,7 @@ SpriteMovementData:: ; 4273
db OBJECT_ACTION_STAND ; action db OBJECT_ACTION_STAND ; action
db 0 ; flags1 db 0 ; flags1
db 0 ; flags2 db 0 ; flags2
db 1 << 5 ; palette flags db WALK_ON_WATER ; palette flags
; 25 ; 25
db SPRITEMOVEFN_00 ; movement function db SPRITEMOVEFN_00 ; movement function

2
engine/overworld/map_objects.asm
View File

@ -2444,7 +2444,7 @@ Function56cd: ; 56cd
ld [hUsedSpriteTile], a ld [hUsedSpriteTile], a
ld hl, OBJECT_PALETTE ld hl, OBJECT_PALETTE
add hl, bc add hl, bc
bit 7, [hl] bit BIG_OBJECT_F, [hl]
jr z, .ok7 jr z, .ok7
ld a, d ld a, d
add 2 add 2

8
engine/overworld/npc_movement.asm
View File

@ -2,8 +2,8 @@ Function6ec1: ; 6ec1
ld hl, OBJECT_PALETTE ld hl, OBJECT_PALETTE
add hl, bc add hl, bc
bit 5, [hl] bit WALK_ON_WATER_F, [hl]
jr z, .not_bit_5 jr z, .walks_on_land
ld hl, OBJECT_FLAGS1 ld hl, OBJECT_FLAGS1
add hl, bc add hl, bc
@ -17,7 +17,7 @@ Function6ec1: ; 6ec1
ret c ret c
jr .resume jr .resume
.not_bit_5 .walks_on_land
ld hl, OBJECT_FLAGS1 ld hl, OBJECT_FLAGS1
add hl, bc add hl, bc
bit 4, [hl] bit 4, [hl]
@ -331,7 +331,7 @@ IsNPCAtCoord: ; 7041
ld hl, OBJECT_PALETTE ld hl, OBJECT_PALETTE
add hl, bc add hl, bc
bit 7, [hl] bit BIG_OBJECT_F, [hl]
jr z, .got jr z, .got
call Function7171 call Function7171

4
engine/overworld/player_movement.asm
View File

@ -684,7 +684,7 @@ DoPlayerMovement:: ; 80000
ld hl, OBJECT_PALETTE ld hl, OBJECT_PALETTE
add hl, bc add hl, bc
bit 6, [hl] bit STRENGTH_BOULDER_F, [hl]
jr z, .not_boulder jr z, .not_boulder
ld hl, OBJECT_FLAGS2 ld hl, OBJECT_FLAGS2
@ -696,7 +696,7 @@ DoPlayerMovement:: ; 80000
ld hl, OBJECT_RANGE ld hl, OBJECT_RANGE
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
and $fc and %11111100
or d or d
ld [hl], a ld [hl], a