summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
Diffstat (limited to 'engine')
-rw-r--r--engine/battle/core.asm4
-rw-r--r--engine/caught_data.asm2
-rw-r--r--engine/cgb_layouts.asm4
-rw-r--r--engine/color.asm2
-rw-r--r--engine/events/loadfishinggfx.asm2
-rwxr-xr-xengine/events/magnet_train.asm2
-rwxr-xr-xengine/intro_menu.asm4
-rw-r--r--engine/map_objects.asm6
-rw-r--r--engine/map_setup.asm4
-rwxr-xr-xengine/overworld.asm4
-rw-r--r--engine/pack.asm2
-rw-r--r--engine/player_gfx.asm20
-rwxr-xr-xengine/player_object.asm4
-rwxr-xr-xengine/pokegear.asm6
-rw-r--r--engine/scripting.asm2
-rw-r--r--engine/specials.asm2
-rw-r--r--engine/tileset_anims.asm8
-rwxr-xr-xengine/warp_connection.asm2
18 files changed, 40 insertions, 40 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index d62e2014b..fd3125420 100644
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -9263,10 +9263,10 @@ GetTrainerBackpic: ; 3fbff
; What gender are we?
ld a, [wPlayerSpriteSetupFlags]
- bit 2, a ; transformed to male
+ bit PLAYERSPRITESETUP_FEMALE_TO_MALE_F, a
jr nz, .Chris
ld a, [wPlayerGender]
- bit 0, a
+ bit PLAYERGENDER_FEMALE_F, a
jr z, .Chris
; It's a girl.
diff --git a/engine/caught_data.asm b/engine/caught_data.asm
index 9310b7b90..f194ce1f0 100644
--- a/engine/caught_data.asm
+++ b/engine/caught_data.asm
@@ -194,7 +194,7 @@ SetBoxmonOrEggmonCaughtData: ; 4db53
call GetWorldMapLocation
ld b, a
ld a, [wPlayerGender]
- rrca
+ rrca ; shift bit 0 (PLAYERGENDER_FEMALE_F) to bit 7 (CAUGHT_GENDER_MASK)
or b
ld [hl], a
ret
diff --git a/engine/cgb_layouts.asm b/engine/cgb_layouts.asm
index 84fb6c9de..cf43a0607 100644
--- a/engine/cgb_layouts.asm
+++ b/engine/cgb_layouts.asm
@@ -184,7 +184,7 @@ InitPartyMenuBGPal0: ; 8e9f
_CGB_PokegearPals: ; 8eb9
ld a, [wPlayerGender]
- bit 0, a
+ bit PLAYERGENDER_FEMALE_F, a
jr z, .male
ld hl, FemalePokegearPals
jr .got_pals
@@ -821,7 +821,7 @@ _CGB_PackPals: ; 93d3
jr z, .tutorial_male
ld a, [wPlayerGender]
- bit 0, a
+ bit PLAYERGENDER_FEMALE_F, a
jr z, .tutorial_male
ld hl, .KrisPackPals
diff --git a/engine/color.asm b/engine/color.asm
index 485125821..0cce49655 100644
--- a/engine/color.asm
+++ b/engine/color.asm
@@ -707,7 +707,7 @@ GetPlayerOrMonPalettePointer:
and a
jp nz, GetMonNormalOrShinyPalettePointer
ld a, [wPlayerSpriteSetupFlags]
- bit 2, a ; transformed to male
+ bit PLAYERSPRITESETUP_FEMALE_TO_MALE_F, a
jr nz, .male
ld a, [wPlayerGender]
and a
diff --git a/engine/events/loadfishinggfx.asm b/engine/events/loadfishinggfx.asm
index f67c51d8b..3d3ab0ba0 100644
--- a/engine/events/loadfishinggfx.asm
+++ b/engine/events/loadfishinggfx.asm
@@ -6,7 +6,7 @@ LoadFishingGFX: ; b84b3
ld de, FishingGFX
ld a, [wPlayerGender]
- bit 0, a
+ bit PLAYERGENDER_FEMALE_F, a
jr z, .got_gender
ld de, KrisFishingGFX
.got_gender
diff --git a/engine/events/magnet_train.asm b/engine/events/magnet_train.asm
index 232372dbd..be3faac28 100755
--- a/engine/events/magnet_train.asm
+++ b/engine/events/magnet_train.asm
@@ -327,7 +327,7 @@ MagnetTrain_Jumptable: ; 8cdf7
ld a, BANK(wPlayerGender)
ld [rSVBK], a
ld a, [wPlayerGender]
- bit 0, a
+ bit PLAYERGENDER_FEMALE_F, a
jr z, .got_gender
ld b, SPRITE_ANIM_INDEX_MAGNET_TRAIN_BLUE
diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm
index c9270358b..c825a6216 100755
--- a/engine/intro_menu.asm
+++ b/engine/intro_menu.asm
@@ -812,7 +812,7 @@ NamePlayer: ; 0x6074
ld hl, PlayerName
ld de, .Chris
ld a, [wPlayerGender]
- bit 0, a
+ bit PLAYERGENDER_FEMALE_F, a
jr z, .Male
ld de, .Kris
.Male:
@@ -988,7 +988,7 @@ Intro_PlacePlayerSprite: ; 61cd
ld b, PAL_OW_RED
ld a, [wPlayerGender]
- bit 0, a
+ bit PLAYERGENDER_FEMALE_F, a
jr z, .male
ld b, PAL_OW_BLUE
.male
diff --git a/engine/map_objects.asm b/engine/map_objects.asm
index 00ce599e3..398a3ff59 100644
--- a/engine/map_objects.asm
+++ b/engine/map_objects.asm
@@ -2543,7 +2543,7 @@ RefreshPlayerSprite: ; 579d
.TryResetPlayerAction: ; 57bc
ld hl, wPlayerSpriteSetupFlags
- bit 7, [hl]
+ bit PLAYERSPRITESETUP_RESET_ACTION_F, [hl]
jr nz, .ok
ret
@@ -2555,10 +2555,10 @@ RefreshPlayerSprite: ; 579d
.SpawnInCustomFacing: ; 57ca
ld hl, wPlayerSpriteSetupFlags
- bit 5, [hl]
+ bit PLAYERSPRITESETUP_CUSTOM_FACING_F, [hl]
ret z
ld a, [wPlayerSpriteSetupFlags]
- and 3
+ and PLAYERSPRITESETUP_FACING_MASK
add a
add a
jr ContinueSpawnFacing
diff --git a/engine/map_setup.asm b/engine/map_setup.asm
index 5e593e04e..d2140c569 100644
--- a/engine/map_setup.asm
+++ b/engine/map_setup.asm
@@ -143,13 +143,13 @@ LoadObjectsRunCallback_02: ; 154d7
DelayClearingOldSprites: ; 154eb
ld hl, wPlayerSpriteSetupFlags
- set 7, [hl]
+ set PLAYERSPRITESETUP_RESET_ACTION_F, [hl]
ret
; 154f1
DelayLoadingNewSprites: ; 154f1
ld hl, wPlayerSpriteSetupFlags
- set 6, [hl]
+ set PLAYERSPRITESETUP_SKIP_RELOAD_GFX_F, [hl]
ret
CheckReplaceKrisSprite: ; 154f7
diff --git a/engine/overworld.asm b/engine/overworld.asm
index 4c379711d..2cac7df02 100755
--- a/engine/overworld.asm
+++ b/engine/overworld.asm
@@ -62,10 +62,10 @@ GetPlayerSprite: ; 14183
; Get Chris or Kris's sprite.
ld hl, .Chris
ld a, [wPlayerSpriteSetupFlags]
- bit 2, a
+ bit PLAYERSPRITESETUP_FEMALE_TO_MALE_F, a
jr nz, .go
ld a, [wPlayerGender]
- bit 0, a
+ bit PLAYERGENDER_FEMALE_F, a
jr z, .go
ld hl, .Kris
diff --git a/engine/pack.asm b/engine/pack.asm
index f9c7490af..da75b71b1 100644
--- a/engine/pack.asm
+++ b/engine/pack.asm
@@ -1288,7 +1288,7 @@ DrawPackGFX: ; 1089d
cp BATTLETYPE_TUTORIAL
jr z, .male_dude
ld a, [wPlayerGender]
- bit 0, a
+ bit PLAYERGENDER_FEMALE_F, a
jr nz, .female
.male_dude
ld hl, PackGFXPointers
diff --git a/engine/player_gfx.asm b/engine/player_gfx.asm
index 21929e32c..28441e700 100644
--- a/engine/player_gfx.asm
+++ b/engine/player_gfx.asm
@@ -1,7 +1,7 @@
Unreferenced_Function88248: ; 88248
ld c, CAL
ld a, [wPlayerGender]
- bit 0, a
+ bit PLAYERGENDER_FEMALE_F, a
jr z, .okay
ld c, KAREN
@@ -58,7 +58,7 @@ MovePlayerPic: ; 88266
ShowPlayerNamingChoices: ; 88297
ld hl, ChrisNameMenuDataHeader
ld a, [wPlayerGender]
- bit 0, a
+ bit PLAYERGENDER_FEMALE_F, a
jr z, .GotGender
ld hl, KrisNameMenuDataHeader
.GotGender:
@@ -76,7 +76,7 @@ GetPlayerNameArray: ; 88318 This Function is never called
ld hl, PlayerName
ld de, MalePlayerNameArray
ld a, [wPlayerGender]
- bit 0, a
+ bit PLAYERGENDER_FEMALE_F, a
jr z, .done
ld de, FemalePlayerNameArray
@@ -92,7 +92,7 @@ GetPlayerIcon: ; 8832c
ld b, BANK(ChrisSpriteGFX)
ld a, [wPlayerGender]
- bit 0, a
+ bit PLAYERGENDER_FEMALE_F, a
jr z, .done
; Female
@@ -105,7 +105,7 @@ GetPlayerIcon: ; 8832c
GetCardPic: ; 8833e
ld hl, ChrisCardPic
ld a, [wPlayerGender]
- bit 0, a
+ bit PLAYERGENDER_FEMALE_F, a
jr z, .GotClass
ld hl, KrisCardPic
.GotClass:
@@ -131,7 +131,7 @@ INCBIN "gfx/trainer_card/trainer_card.2bpp"
GetPlayerBackpic: ; 88825
ld a, [wPlayerGender]
- bit 0, a
+ bit PLAYERGENDER_FEMALE_F, a
jr z, GetChrisBackpic
call GetKrisBackpic
ret
@@ -150,7 +150,7 @@ HOF_LoadTrainerFrontpic: ; 88840
ld [hBGMapMode], a
ld e, 0
ld a, [wPlayerGender]
- bit 0, a
+ bit PLAYERGENDER_FEMALE_F, a
jr z, .GotClass
ld e, 1
@@ -159,7 +159,7 @@ HOF_LoadTrainerFrontpic: ; 88840
ld [TrainerClass], a
ld de, ChrisPic
ld a, [wPlayerGender]
- bit 0, a
+ bit PLAYERGENDER_FEMALE_F, a
jr z, .GotPic
ld de, KrisPic
@@ -179,7 +179,7 @@ DrawIntroPlayerPic: ; 88874
; Get class
ld e, CHRIS
ld a, [wPlayerGender]
- bit 0, a
+ bit PLAYERGENDER_FEMALE_F, a
jr z, .GotClass
ld e, KRIS
.GotClass:
@@ -189,7 +189,7 @@ DrawIntroPlayerPic: ; 88874
; Load pic
ld de, ChrisPic
ld a, [wPlayerGender]
- bit 0, a
+ bit PLAYERGENDER_FEMALE_F, a
jr z, .GotPic
ld de, KrisPic
.GotPic:
diff --git a/engine/player_object.asm b/engine/player_object.asm
index 802cf6ade..f89a63fb1 100755
--- a/engine/player_object.asm
+++ b/engine/player_object.asm
@@ -31,10 +31,10 @@ SpawnPlayer: ; 8029
add hl, bc
ln e, PAL_NPC_RED, OBJECTTYPE_SCRIPT
ld a, [wPlayerSpriteSetupFlags]
- bit 2, a
+ bit PLAYERSPRITESETUP_FEMALE_TO_MALE_F, a
jr nz, .ok
ld a, [wPlayerGender]
- bit 0, a
+ bit PLAYERGENDER_FEMALE_F, a
jr z, .ok
ln e, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT
diff --git a/engine/pokegear.asm b/engine/pokegear.asm
index cfb8857fa..86c538253 100755
--- a/engine/pokegear.asm
+++ b/engine/pokegear.asm
@@ -687,7 +687,7 @@ PokegearMap_InitPlayerIcon: ; 9106a
depixel 0, 0
ld b, SPRITE_ANIM_INDEX_RED_WALK
ld a, [wPlayerGender]
- bit 0, a ; ENGINE_PLAYER_IS_FEMALE
+ bit PLAYERGENDER_FEMALE_F, a
jr z, .got_gender
ld b, SPRITE_ANIM_INDEX_BLUE_WALK
.got_gender
@@ -2690,7 +2690,7 @@ Pokedex_GetArea: ; 91d11
push bc
ld c, PAL_OW_RED
ld a, [wPlayerGender]
- bit 0, a
+ bit PLAYERGENDER_FEMALE_F, a
jr z, .male
inc c ; PAL_OW_BLUE
.male
@@ -2917,7 +2917,7 @@ TownMapPlayerIcon: ; 91fa6
depixel 0, 0
ld b, SPRITE_ANIM_INDEX_RED_WALK ; Male
ld a, [wPlayerGender]
- bit 0, a
+ bit PLAYERGENDER_FEMALE_F, a
jr z, .got_gender
ld b, SPRITE_ANIM_INDEX_BLUE_WALK ; Female
.got_gender
diff --git a/engine/scripting.asm b/engine/scripting.asm
index c847ed96d..eebebb752 100644
--- a/engine/scripting.asm
+++ b/engine/scripting.asm
@@ -2477,7 +2477,7 @@ Script_warpfacing:
maskbits NUM_DIRECTIONS
ld c, a
ld a, [wPlayerSpriteSetupFlags]
- set 5, a
+ set PLAYERSPRITESETUP_CUSTOM_FACING_F, a
or c
ld [wPlayerSpriteSetupFlags], a
; fall through
diff --git a/engine/specials.asm b/engine/specials.asm
index 965e3d58b..429b752c3 100644
--- a/engine/specials.asm
+++ b/engine/specials.asm
@@ -350,7 +350,7 @@ Special_CheckPokerus: ; c419
Special_ResetLuckyNumberShowFlag: ; c422
farcall RestartLuckyNumberCountdown
ld hl, wLuckyNumberShowFlag
- res 0, [hl]
+ res LUCKYNUMBERSHOW_GAME_OVER_F, [hl]
farcall LoadOrRegenerateLuckyIDNumber
ret
; c434
diff --git a/engine/tileset_anims.asm b/engine/tileset_anims.asm
index 5113ae9a3..62e84a401 100644
--- a/engine/tileset_anims.asm
+++ b/engine/tileset_anims.asm
@@ -502,7 +502,7 @@ ForestTreeLeftAnimation: ; fc45c
; Only during the Celebi event.
ld a, [wCelebiEvent]
- bit 2, a
+ bit CELEBIEVENT_FOREST_IS_RESTLESS_F, a
jr nz, .asm_fc46c
ld hl, ForestTreeLeftFrames
jr .asm_fc47d
@@ -544,7 +544,7 @@ ForestTreeRightAnimation: ; fc4c4
; Only during the Celebi event.
ld a, [wCelebiEvent]
- bit 2, a
+ bit CELEBIEVENT_FOREST_IS_RESTLESS_F, a
jr nz, .asm_fc4d4
ld hl, ForestTreeRightFrames
jr .asm_fc4eb
@@ -579,7 +579,7 @@ ForestTreeLeftAnimation2: ; fc4f2
; Only during the Celebi event.
ld a, [wCelebiEvent]
- bit 2, a
+ bit CELEBIEVENT_FOREST_IS_RESTLESS_F, a
jr nz, .asm_fc502
ld hl, ForestTreeLeftFrames
jr .asm_fc515
@@ -611,7 +611,7 @@ ForestTreeRightAnimation2: ; fc51c
; Only during the Celebi event.
ld a, [wCelebiEvent]
- bit 2, a
+ bit CELEBIEVENT_FOREST_IS_RESTLESS_F, a
jr nz, .asm_fc52c
ld hl, ForestTreeRightFrames
jr .asm_fc545
diff --git a/engine/warp_connection.asm b/engine/warp_connection.asm
index e15809c04..a16a2885e 100755
--- a/engine/warp_connection.asm
+++ b/engine/warp_connection.asm
@@ -322,7 +322,7 @@ RefreshMapSprites: ; 1047f0
farcall RefreshPlayerSprite
farcall CheckReplaceKrisSprite
ld hl, wPlayerSpriteSetupFlags
- bit 6, [hl]
+ bit PLAYERSPRITESETUP_SKIP_RELOAD_GFX_F, [hl]
jr nz, .skip
ld hl, VramState
set 0, [hl]
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-27 03:46:21 +0000