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

Identify more bit flags (#1153)

Browse Source
This commit is contained in:
Sylvie
2024-11-29 19:29:30 -05:00
committed by GitHub
parent 8894e29da2
commit 644bd42fb0
78 changed files with 539 additions and 472 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
engine/overworld/events.asm
View File

@@ -32,67 +32,67 @@ EnableEvents::
CheckEnabledMapEventsBit5:
ld hl, wEnabledPlayerEvents
bit 5, [hl]
bit PLAYEREVENTS_UNUSED, [hl]
ret
DisableWarpsConnections: ; unreferenced
ld hl, wEnabledPlayerEvents
res 2, [hl]
res PLAYEREVENTS_WARPS_AND_CONNECTIONS, [hl]
ret
DisableCoordEvents: ; unreferenced
ld hl, wEnabledPlayerEvents
res 1, [hl]
res PLAYEREVENTS_COORD_EVENTS, [hl]
ret
DisableStepCount: ; unreferenced
ld hl, wEnabledPlayerEvents
res 0, [hl]
res PLAYEREVENTS_COUNT_STEPS, [hl]
ret
DisableWildEncounters: ; unreferenced
ld hl, wEnabledPlayerEvents
res 4, [hl]
res PLAYEREVENTS_WILD_ENCOUNTERS, [hl]
ret
EnableWarpsConnections: ; unreferenced
ld hl, wEnabledPlayerEvents
set 2, [hl]
set PLAYEREVENTS_WARPS_AND_CONNECTIONS, [hl]
ret
EnableCoordEvents: ; unreferenced
ld hl, wEnabledPlayerEvents
set 1, [hl]
set PLAYEREVENTS_COORD_EVENTS, [hl]
ret
EnableStepCount: ; unreferenced
ld hl, wEnabledPlayerEvents
set 0, [hl]
set PLAYEREVENTS_COUNT_STEPS, [hl]
ret
EnableWildEncounters:
ld hl, wEnabledPlayerEvents
set 4, [hl]
set PLAYEREVENTS_WILD_ENCOUNTERS, [hl]
ret
CheckWarpConnectionsEnabled:
ld hl, wEnabledPlayerEvents
bit 2, [hl]
bit PLAYEREVENTS_WARPS_AND_CONNECTIONS, [hl]
ret
CheckCoordEventsEnabled:
ld hl, wEnabledPlayerEvents
bit 1, [hl]
bit PLAYEREVENTS_COORD_EVENTS, [hl]
ret
CheckStepCountEnabled:
ld hl, wEnabledPlayerEvents
bit 0, [hl]
bit PLAYEREVENTS_COUNT_STEPS, [hl]
ret
CheckWildEncountersEnabled:
ld hl, wEnabledPlayerEvents
bit 4, [hl]
bit PLAYEREVENTS_WILD_ENCOUNTERS, [hl]
ret
StartMap:
@@ -424,13 +424,13 @@ endr
call CallScript
ld hl, wScriptFlags
res 3, [hl]
res RUN_DEFERRED_SCRIPT, [hl]
farcall EnableScriptMode
farcall ScriptEvents
ld hl, wScriptFlags
bit 3, [hl]
bit RUN_DEFERRED_SCRIPT, [hl]
jr z, .nope
ld hl, wDeferredScriptAddr

18
engine/overworld/map_objects.asm
View File

@@ -36,7 +36,7 @@ HandleObjectStep:
CheckObjectStillVisible:
ld hl, OBJECT_FLAGS2
add hl, bc
res OBJ_FLAGS2_6, [hl]
res OFF_SCREEN_F, [hl]
ld a, [wXCoord]
ld e, a
ld hl, OBJECT_MAP_X
@@ -62,7 +62,7 @@ CheckObjectStillVisible:
.ok
ld hl, OBJECT_FLAGS2
add hl, bc
set OBJ_FLAGS2_6, [hl]
set OFF_SCREEN_F, [hl]
ld a, [wXCoord]
ld e, a
ld hl, OBJECT_INIT_X
@@ -99,7 +99,7 @@ CheckObjectStillVisible:
.yes2
ld hl, OBJECT_FLAGS2
add hl, bc
set OBJ_FLAGS2_6, [hl]
set OFF_SCREEN_F, [hl]
and a
ret
@@ -147,7 +147,7 @@ HandleObjectAction:
jr nz, SetFacingStanding
ld hl, OBJECT_FLAGS2
add hl, bc
bit OBJ_FLAGS2_6, [hl]
bit OFF_SCREEN_F, [hl]
jr nz, SetFacingStanding
bit FROZEN_F, [hl]
jr nz, _CallFrozenObjectAction
@@ -663,8 +663,8 @@ MovementFunction_Strength:
jr z, .on_pit
ld hl, OBJECT_FLAGS2
add hl, bc
bit OBJ_FLAGS2_2, [hl]
res OBJ_FLAGS2_2, [hl]
bit BOULDER_MOVING_F, [hl]
res BOULDER_MOVING_F, [hl]
jr z, .ok
ld hl, OBJECT_RANGE
add hl, bc
@@ -1667,7 +1667,7 @@ StepFunction_StrengthBoulder:
pop bc
ld hl, OBJECT_FLAGS2
add hl, bc
res OBJ_FLAGS2_2, [hl]
res BOULDER_MOVING_F, [hl]
call CopyCoordsTileToLastCoordsTile
ld hl, OBJECT_WALKING
add hl, bc
@@ -2194,7 +2194,7 @@ RespawnPlayerAndOpponent:
ld a, PLAYER
call RespawnObject
ld a, [wBattleScriptFlags]
bit 7, a
bit BATTLESCRIPT_SCRIPTED_F, a
jr z, .skip_opponent
ldh a, [hLastTalked]
and a
@@ -2905,7 +2905,7 @@ InitSprites:
ld hl, OBJECT_FLAGS2
add hl, bc
ld e, [hl]
bit OBJ_FLAGS2_7, e
bit OBJ_FLAGS2_7_F, e
jr z, .not_priority
or PRIORITY
.not_priority

2
engine/overworld/map_setup.asm
View File

@@ -41,7 +41,7 @@ ReadMapSetupScript:
; Bit 7 of the bank indicates a parameter.
; This is left unused.
bit 7, b
bit MAPSETUPSCRIPT_HAS_PARAM_F, b
jr z, .go
pop de

2
engine/overworld/npc_movement.asm
View File

@@ -321,7 +321,7 @@ IsNPCAtCoord:
ld hl, OBJECT_FLAGS1
add hl, bc
bit 7, [hl]
bit EMOTE_OBJECT_F, [hl]
jr nz, .next
ld hl, OBJECT_PALETTE

28
engine/overworld/overworld.asm
View File

@@ -15,23 +15,23 @@ _UpdatePlayerSprite::
call GetUsedSprite
ret
_RefreshSprites: ; mobile
LoadStandingSpritesGFX: ; mobile
ld hl, wSpriteFlags
ld a, [hl]
push af
res 7, [hl]
set 6, [hl]
res SPRITES_SKIP_STANDING_GFX_F, [hl]
set SPRITES_SKIP_WALKING_GFX_F, [hl]
call LoadUsedSpritesGFX
pop af
ld [wSpriteFlags], a
ret
_ClearSprites: ; mobile
LoadWalkingSpritesGFX: ; mobile
ld hl, wSpriteFlags
ld a, [hl]
push af
set 7, [hl]
res 6, [hl]
set SPRITES_SKIP_STANDING_GFX_F, [hl]
res SPRITES_SKIP_WALKING_GFX_F, [hl]
call LoadUsedSpritesGFX
pop af
ld [wSpriteFlags], a
@@ -147,7 +147,7 @@ LoadUsedSpritesGFX:
LoadMiscTiles:
ld a, [wSpriteFlags]
bit 6, a
bit SPRITES_SKIP_WALKING_GFX_F, a
ret nz
ld c, EMOTE_SHADOW
@@ -524,7 +524,7 @@ GetUsedSprites:
.loop
ld a, [wSpriteFlags]
res 5, a
res SPRITES_VRAM_BANK_0_F, a
ld [wSpriteFlags], a
ld a, [hli]
@@ -535,11 +535,11 @@ GetUsedSprites:
ld a, [hli]
ldh [hUsedSpriteTile], a
bit 7, a
bit 7, a ; tiles $80+ are in VRAM bank 0
jr z, .dont_set
ld a, [wSpriteFlags]
set 5, a ; load VBank0
set SPRITES_VRAM_BANK_0_F, a
ld [wSpriteFlags], a
.dont_set
@@ -563,7 +563,7 @@ GetUsedSprite:
push de
push bc
ld a, [wSpriteFlags]
bit 7, a
bit SPRITES_SKIP_STANDING_GFX_F, a
jr nz, .skip
call .CopyToVram
@@ -581,9 +581,9 @@ endr
pop hl
ld a, [wSpriteFlags]
bit 5, a
bit SPRITES_VRAM_BANK_0_F, a
jr nz, .done
bit 6, a
bit SPRITES_SKIP_WALKING_GFX_F, a
jr nz, .done
ldh a, [hUsedSpriteIndex]
@@ -618,7 +618,7 @@ endr
ldh a, [rVBK]
push af
ld a, [wSpriteFlags]
bit 5, a
bit SPRITES_VRAM_BANK_0_F, a
ld a, $1
jr z, .bankswitch
ld a, $0

2
engine/overworld/player_movement.asm
View File

@@ -665,7 +665,7 @@ ENDM
ld hl, OBJECT_FLAGS2
add hl, bc
set 2, [hl]
set BOULDER_MOVING_F, [hl]
ld a, [wWalkingDirection]
ld d, a

2
engine/overworld/player_object.asm
View File

@@ -159,7 +159,7 @@ CopyObjectStruct::
ld hl, OBJECT_FLAGS2
add hl, de
set 5, [hl]
set FROZEN_F, [hl]
ret
CopyMapObjectToObjectStruct:

10
engine/overworld/scripting.asm
View File

@@ -1184,7 +1184,7 @@ Script_reloadmapafterbattle:
jp ScriptJump
.notblackedout
bit 0, d
bit BATTLESCRIPT_WILD_F, d
jr z, .was_wild
farcall MomTriesToBuySomething
jr .done
@@ -1393,7 +1393,7 @@ Script_sdefer:
call GetScriptByte
ld [wDeferredScriptAddr + 1], a
ld hl, wScriptFlags
set 3, [hl]
set RUN_DEFERRED_SCRIPT, [hl]
ret
Script_checkscene:
@@ -2260,7 +2260,7 @@ Script_end:
ld a, SCRIPT_OFF
ld [wScriptMode], a
ld hl, wScriptFlags
res 0, [hl]
res UNUSED_SCRIPT_FLAG_0, [hl]
call StopScript
ret
@@ -2269,7 +2269,7 @@ Script_endcallback:
jr c, .dummy
.dummy
ld hl, wScriptFlags
res 0, [hl]
res UNUSED_SCRIPT_FLAG_0, [hl]
call StopScript
ret
@@ -2310,7 +2310,7 @@ Script_endall:
ld a, SCRIPT_OFF
ld [wScriptMode], a
ld hl, wScriptFlags
res 0, [hl]
res UNUSED_SCRIPT_FLAG_0, [hl]
call StopScript
ret

4
engine/overworld/warp_connection.asm
View File

@@ -390,7 +390,7 @@ CheckMovingOffEdgeOfMap::
GetMapScreenCoords::
ld hl, wOverworldMapBlocks
ld a, [wXCoord]
bit 0, a
bit 0, a ; even or odd?
jr nz, .odd_x
; even x
srl a
@@ -408,7 +408,7 @@ GetMapScreenCoords::
ld c, a
ld b, 0
ld a, [wYCoord]
bit 0, a
bit 0, a ; even or odd?
jr nz, .odd_y
; even y
srl a