Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Relabel some map_object struct fields (#1029)

Browse Source
This commit is contained in:
vulcandth
2023-01-03 21:16:08 -06:00
committed by GitHub
parent 2d40e99d11
commit c01409be5a
7 changed files with 37 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
engine/overworld/player_object.asm
View File

@@ -27,7 +27,7 @@ SpawnPlayer:
call PlayerSpawn_ConvertCoords
ld a, PLAYER_OBJECT
call GetMapObject
ld hl, MAPOBJECT_COLOR
ld hl, MAPOBJECT_PALETTE
add hl, bc
ln e, PAL_NPC_RED, OBJECTTYPE_SCRIPT
ld a, [wPlayerSpriteSetupFlags]
@@ -188,10 +188,10 @@ CopyMapObjectToObjectStruct:
call GetSpritePalette
ld [wTempObjectCopyPalette], a
ld hl, MAPOBJECT_COLOR
ld hl, MAPOBJECT_PALETTE
add hl, bc
ld a, [hl]
and $f0
and MAPOBJECT_PALETTE_MASK
jr z, .skip_color_override
swap a
and PALETTE_MASK
@@ -203,7 +203,7 @@ CopyMapObjectToObjectStruct:
ld a, [hl]
ld [wTempObjectCopyMovement], a
ld hl, MAPOBJECT_RANGE
ld hl, MAPOBJECT_SIGHT_RANGE
add hl, bc
ld a, [hl]
ld [wTempObjectCopyRange], a