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

Rename wVramState to wStateFlags and use flag constants (#1078)

Browse Source
This commit is contained in:
xCrystal
2024-01-07 14:27:22 +01:00
parent 5be9856f3a
commit f72f078c0e
31 changed files with 125 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
engine/overworld/init_map.asm
View File

@@ -17,8 +17,8 @@ ReanchorBGMap_NoOAMUpdate::
pop af
ldh [hOAMUpdate], a
ld hl, wVramState
set 6, [hl]
ld hl, wStateFlags
set TEXT_STATE_F, [hl]
ret
.ReanchorBGMap:

12
engine/overworld/map_objects.asm
View File

@@ -2167,8 +2167,8 @@ CopyTempObjectData:
ret
UpdateAllObjectsFrozen::
ld a, [wVramState]
bit 0, a
ld a, [wStateFlags]
bit SPRITE_UPDATES_DISABLED_F, a
ret z
ld bc, wObjectStructs
xor a
@@ -2728,8 +2728,8 @@ ResetObject:
db SPRITEMOVEDATA_STANDING_RIGHT
_UpdateSprites::
ld a, [wVramState]
bit 0, a
ld a, [wStateFlags]
bit SPRITE_UPDATES_DISABLED_F, a
ret z
xor a
ldh [hUsedSpriteIndex], a
@@ -2744,8 +2744,8 @@ _UpdateSprites::
ret
.fill
ld a, [wVramState]
bit 1, a
ld a, [wStateFlags]
bit LAST_12_SPRITE_OAM_STRUCTS_RESERVED_F, a
ld b, NUM_SPRITE_OAM_STRUCTS * SPRITEOAMSTRUCT_LENGTH
jr z, .ok
ld b, (NUM_SPRITE_OAM_STRUCTS - 12) * SPRITEOAMSTRUCT_LENGTH

16
engine/overworld/movement.asm
View File

@@ -205,8 +205,8 @@ Movement_step_end:
add hl, bc
ld [hl], $0
ld hl, wVramState
res 7, [hl]
ld hl, wStateFlags
res SCRIPTED_MOVEMENT_STATE_F, [hl]
ld hl, OBJECT_STEP_TYPE
add hl, bc
@@ -232,8 +232,8 @@ Movement_48:
add hl, bc
ld [hl], STEP_TYPE_SLEEP
ld hl, wVramState
res 7, [hl]
ld hl, wStateFlags
res SCRIPTED_MOVEMENT_STATE_F, [hl]
ret
Movement_remove_object:
@@ -245,8 +245,8 @@ Movement_remove_object:
ld [hl], -1
.not_leading
ld hl, wVramState
res 7, [hl]
ld hl, wStateFlags
res SCRIPTED_MOVEMENT_STATE_F, [hl]
ret
Movement_4b:
@@ -258,8 +258,8 @@ Movement_4b:
add hl, bc
ld [hl], STEP_TYPE_STANDING
ld hl, wVramState
res 7, [hl]
ld hl, wStateFlags
res SCRIPTED_MOVEMENT_STATE_F, [hl]
ret
Movement_step_sleep_1:

4
engine/overworld/player_object.asm
View File

@@ -153,8 +153,8 @@ CopyObjectStruct::
ld d, h
ld e, l
call CopyMapObjectToObjectStruct
ld hl, wVramState
bit 7, [hl]
ld hl, wStateFlags
bit SCRIPTED_MOVEMENT_STATE_F, [hl]
ret z
ld hl, OBJECT_FLAGS2

8
engine/overworld/scripting.asm
View File

@@ -44,8 +44,8 @@ WaitScript:
WaitScriptMovement:
call StopScript
ld hl, wVramState
bit 7, [hl]
ld hl, wStateFlags
bit SCRIPTED_MOVEMENT_STATE_F, [hl]
ret nz
farcall UnfreezeAllObjects
@@ -925,8 +925,8 @@ ApplyObjectFacing:
pop de
ld a, e
call SetSpriteDirection
ld hl, wVramState
bit 6, [hl]
ld hl, wStateFlags
bit TEXT_STATE_F, [hl]
jr nz, .text_state
call .DisableTextTiles
.text_state

10
engine/overworld/warp_connection.asm
View File

@@ -226,9 +226,9 @@ EnterMapWarp:
ret
LoadMapTimeOfDay:
ld hl, wVramState
res 6, [hl]
ld a, $1
ld hl, wStateFlags
res TEXT_STATE_F, [hl]
ld a, TRUE
ld [wSpriteUpdatesEnabled], a
farcall ReplaceTimeOfDayPals
farcall UpdateTimeOfDayPal
@@ -321,8 +321,8 @@ RefreshMapSprites:
ld hl, wPlayerSpriteSetupFlags
bit PLAYERSPRITESETUP_SKIP_RELOAD_GFX_F, [hl]
jr nz, .skip
ld hl, wVramState
set 0, [hl]
ld hl, wStateFlags
set SPRITE_UPDATES_DISABLED_F, [hl]
call SafeUpdateSprites
.skip
ld a, [wPlayerSpriteSetupFlags]