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

Identify some more map object labels and constants

Browse Source
This commit is contained in:
Rangi
2020-10-22 17:41:48 -04:00
parent 15f6a0af43
commit d8310c166d
7 changed files with 199 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
constants/map_object_constants.asm
View File

@@ -142,8 +142,8 @@ MAPOBJECT_SCREEN_HEIGHT EQU (SCREEN_HEIGHT / 2) + 2
const SPRITEMOVEDATA_STANDING_RIGHT ; 09 const SPRITEMOVEDATA_STANDING_RIGHT ; 09
const SPRITEMOVEDATA_SPINRANDOM_FAST ; 0a const SPRITEMOVEDATA_SPINRANDOM_FAST ; 0a
const SPRITEMOVEDATA_PLAYER ; 0b const SPRITEMOVEDATA_PLAYER ; 0b
const SPRITEMOVEDATA_0C ; 0c const SPRITEMOVEDATA_INDEXED_1 ; 0c
const SPRITEMOVEDATA_0D ; 0d const SPRITEMOVEDATA_INDEXED_2 ; 0d
const SPRITEMOVEDATA_0E ; 0e const SPRITEMOVEDATA_0E ; 0e
const SPRITEMOVEDATA_0F ; 0f const SPRITEMOVEDATA_0F ; 0f
const SPRITEMOVEDATA_10 ; 10 const SPRITEMOVEDATA_10 ; 10
@@ -179,8 +179,8 @@ NUM_SPRITEMOVEDATA EQU const_value
const SPRITEMOVEFN_FAST_RANDOM_SPIN ; 05 const SPRITEMOVEFN_FAST_RANDOM_SPIN ; 05
const SPRITEMOVEFN_STANDING ; 06 const SPRITEMOVEFN_STANDING ; 06
const SPRITEMOVEFN_OBEY_DPAD ; 07 const SPRITEMOVEFN_OBEY_DPAD ; 07
const SPRITEMOVEFN_08 ; 08 const SPRITEMOVEFN_INDEXED_1 ; 08
const SPRITEMOVEFN_09 ; 09 const SPRITEMOVEFN_INDEXED_2 ; 09
const SPRITEMOVEFN_0A ; 0a const SPRITEMOVEFN_0A ; 0a
const SPRITEMOVEFN_0B ; 0b const SPRITEMOVEFN_0B ; 0b
const SPRITEMOVEFN_0C ; 0c const SPRITEMOVEFN_0C ; 0c
@@ -202,32 +202,32 @@ NUM_SPRITEMOVEDATA EQU const_value
; StepTypesJumptable indexes (see engine/overworld/map_objects.asm) ; StepTypesJumptable indexes (see engine/overworld/map_objects.asm)
const_def const_def
const STEP_TYPE_00 ; 00 const STEP_TYPE_RESET ; 00
const STEP_TYPE_SLEEP ; 01 const STEP_TYPE_FROM_MOVEMENT ; 01
const STEP_TYPE_NPC_WALK ; 02 const STEP_TYPE_NPC_WALK ; 02
const STEP_TYPE_03 ; 03 const STEP_TYPE_SLEEP ; 03
const STEP_TYPE_04 ; 04 const STEP_TYPE_STANDING ; 04
const STEP_TYPE_05 ; 05 const STEP_TYPE_RESTORE ; 05
const STEP_TYPE_PLAYER_WALK ; 06 const STEP_TYPE_PLAYER_WALK ; 06
const STEP_TYPE_07 ; 07 const STEP_TYPE_CONTINUE_WALK ; 07
const STEP_TYPE_NPC_JUMP ; 08 const STEP_TYPE_NPC_JUMP ; 08
const STEP_TYPE_PLAYER_JUMP ; 09 const STEP_TYPE_PLAYER_JUMP ; 09
const STEP_TYPE_HALF_STEP ; 0a const STEP_TYPE_TURN ; 0a
const STEP_TYPE_BUMP ; 0b const STEP_TYPE_BUMP ; 0b
const STEP_TYPE_TELEPORT_FROM ; 0c const STEP_TYPE_TELEPORT_FROM ; 0c
const STEP_TYPE_TELEPORT_TO ; 0d const STEP_TYPE_TELEPORT_TO ; 0d
const STEP_TYPE_SKYFALL ; 0e const STEP_TYPE_SKYFALL ; 0e
const STEP_TYPE_0F ; 0f const STEP_TYPE_STRENGTH_BOULDER ; 0f
const STEP_TYPE_GOT_BITE ; 10 const STEP_TYPE_GOT_BITE ; 10
const STEP_TYPE_ROCK_SMASH ; 11 const STEP_TYPE_ROCK_SMASH ; 11
const STEP_TYPE_RETURN_DIG ; 12 const STEP_TYPE_RETURN_DIG ; 12
const STEP_TYPE_TRACKING_OBJECT ; 13 const STEP_TYPE_TRACKING_OBJECT ; 13
const STEP_TYPE_14 ; 14 const STEP_TYPE_14 ; 14
const STEP_TYPE_15 ; 15 const STEP_TYPE_SCREENSHAKE ; 15
const STEP_TYPE_16 ; 16 const STEP_TYPE_16 ; 16
const STEP_TYPE_17 ; 17 const STEP_TYPE_17 ; 17
const STEP_TYPE_18 ; 18 const STEP_TYPE_DELETE ; 18
const STEP_TYPE_SKYFALL_TOP ; 19 const STEP_TYPE_SKYFALL_TOP ; 19
; ObjectActionPairPointers indexes (see engine/overworld/map_object_action.asm) ; ObjectActionPairPointers indexes (see engine/overworld/map_object_action.asm)
const_def const_def

8
data/sprites/map_objects.asm
View File

@@ -97,16 +97,16 @@ SpriteMovementData::
db 0 ; flags2 db 0 ; flags2
db 0 ; palette flags db 0 ; palette flags
; SPRITEMOVEDATA_0C ; SPRITEMOVEDATA_INDEXED_1
db SPRITEMOVEFN_08 ; movement function db SPRITEMOVEFN_INDEXED_1 ; movement function
db DOWN ; facing db DOWN ; facing
db OBJECT_ACTION_STAND ; action db OBJECT_ACTION_STAND ; action
db 0 ; flags1 db 0 ; flags1
db 0 ; flags2 db 0 ; flags2
db 0 ; palette flags db 0 ; palette flags
; SPRITEMOVEDATA_0D ; SPRITEMOVEDATA_INDEXED_2
db SPRITEMOVEFN_09 ; movement function db SPRITEMOVEFN_INDEXED_2 ; movement function
db DOWN ; facing db DOWN ; facing
db OBJECT_ACTION_STAND ; action db OBJECT_ACTION_STAND ; action
db 0 ; flags1 db 0 ; flags1

10
engine/overworld/map_object_action.asm
View File

@@ -1,5 +1,6 @@
ObjectActionPairPointers: ObjectActionPairPointers:
; entries correspond to OBJECT_ACTION_* constants ; entries correspond to OBJECT_ACTION_* constants
; normal action, frozen action
dw SetFacingStanding, SetFacingStanding dw SetFacingStanding, SetFacingStanding
dw SetFacingStandAction, SetFacingCurrent dw SetFacingStandAction, SetFacingCurrent
dw SetFacingStepAction, SetFacingCurrent dw SetFacingStepAction, SetFacingCurrent
@@ -163,7 +164,7 @@ CounterclockwiseSpinAction:
swap e swap e
ld d, 0 ld d, 0
ld hl, .Directions ld hl, .facings
add hl, de add hl, de
ld a, [hl] ld a, [hl]
ld hl, OBJECT_FACING ld hl, OBJECT_FACING
@@ -171,8 +172,11 @@ CounterclockwiseSpinAction:
ld [hl], a ld [hl], a
ret ret
.Directions: .facings:
db OW_DOWN, OW_RIGHT, OW_UP, OW_LEFT db OW_DOWN
db OW_RIGHT
db OW_UP
db OW_LEFT
SetFacingFish: SetFacingFish:
call GetSpriteDirection call GetSpriteDirection

283
engine/overworld/map_objects.asm
View File

File diff suppressed because it is too large Load Diff

16
engine/overworld/movement.asm
View File

@@ -131,7 +131,7 @@ Movement_step_dig:
ld [hl], a ld [hl], a
ld hl, OBJECT_STEP_TYPE ld hl, OBJECT_STEP_TYPE
add hl, bc add hl, bc
ld [hl], STEP_TYPE_03 ld [hl], STEP_TYPE_SLEEP
ld hl, OBJECT_DIRECTION_WALKING ld hl, OBJECT_DIRECTION_WALKING
add hl, bc add hl, bc
ld [hl], STANDING ld [hl], STANDING
@@ -184,7 +184,7 @@ Movement_fish_cast_rod:
ld [hl], OBJECT_ACTION_FISHING ld [hl], OBJECT_ACTION_FISHING
ld hl, OBJECT_STEP_TYPE ld hl, OBJECT_STEP_TYPE
add hl, bc add hl, bc
ld [hl], STEP_TYPE_SLEEP ld [hl], STEP_TYPE_FROM_MOVEMENT
ret ret
Movement_step_loop: Movement_step_loop:
@@ -208,7 +208,7 @@ Movement_step_end:
ld hl, OBJECT_STEP_TYPE ld hl, OBJECT_STEP_TYPE
add hl, bc add hl, bc
ld [hl], STEP_TYPE_SLEEP ld [hl], STEP_TYPE_FROM_MOVEMENT
ret ret
Movement_48: Movement_48:
@@ -228,7 +228,7 @@ Movement_48:
ld hl, OBJECT_STEP_TYPE ld hl, OBJECT_STEP_TYPE
add hl, bc add hl, bc
ld [hl], STEP_TYPE_03 ld [hl], STEP_TYPE_SLEEP
ld hl, wVramState ld hl, wVramState
res 7, [hl] res 7, [hl]
@@ -254,7 +254,7 @@ Movement_4b:
ld hl, OBJECT_STEP_TYPE ld hl, OBJECT_STEP_TYPE
add hl, bc add hl, bc
ld [hl], STEP_TYPE_04 ld [hl], STEP_TYPE_STANDING
ld hl, wVramState ld hl, wVramState
res 7, [hl] res 7, [hl]
@@ -306,7 +306,7 @@ Movement_step_sleep_common:
ld hl, OBJECT_STEP_TYPE ld hl, OBJECT_STEP_TYPE
add hl, bc add hl, bc
ld [hl], STEP_TYPE_03 ld [hl], STEP_TYPE_SLEEP
ld hl, OBJECT_ACTION ld hl, OBJECT_ACTION
add hl, bc add hl, bc
@@ -344,7 +344,7 @@ Movement_tree_shake:
ld hl, OBJECT_STEP_TYPE ld hl, OBJECT_STEP_TYPE
add hl, bc add hl, bc
ld [hl], STEP_TYPE_03 ld [hl], STEP_TYPE_SLEEP
ld hl, OBJECT_ACTION ld hl, OBJECT_ACTION
add hl, bc add hl, bc
@@ -656,7 +656,7 @@ TurnStep:
ld hl, OBJECT_STEP_TYPE ld hl, OBJECT_STEP_TYPE
add hl, bc add hl, bc
ld [hl], STEP_TYPE_HALF_STEP ld [hl], STEP_TYPE_TURN
ret ret
NormalStep: NormalStep:

4
engine/overworld/player_object.asm
View File

@@ -446,7 +446,7 @@ CopyTempObjectToObjectStruct:
ld hl, OBJECT_STEP_TYPE ld hl, OBJECT_STEP_TYPE
add hl, de add hl, de
ld [hl], STEP_TYPE_00 ld [hl], STEP_TYPE_RESET
ld hl, OBJECT_FACING_STEP ld hl, OBJECT_FACING_STEP
add hl, de add hl, de
@@ -689,7 +689,7 @@ FollowNotExact::
ld [hl], SPRITEMOVEDATA_FOLLOWNOTEXACT ld [hl], SPRITEMOVEDATA_FOLLOWNOTEXACT
ld hl, OBJECT_STEP_TYPE ld hl, OBJECT_STEP_TYPE
add hl, de add hl, de
ld [hl], STEP_TYPE_00 ld [hl], STEP_TYPE_RESET
ret ret
GetRelativeFacing:: GetRelativeFacing::

2
home/map_objects.asm
View File

@@ -410,7 +410,7 @@ LoadMovementDataPointer::
ld hl, OBJECT_STEP_TYPE ld hl, OBJECT_STEP_TYPE
add hl, bc add hl, bc
ld [hl], STEP_TYPE_00 ld [hl], STEP_TYPE_RESET
ld hl, wVramState ld hl, wVramState
set 7, [hl] set 7, [hl]