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

Prefix engine_flags wram addresses with w

Browse Source
This commit is contained in:
xCrystal
2017-12-28 13:15:46 +01:00
parent e2b378f5e3
commit 9457679af8
53 changed files with 270 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
constants/engine_flags.asm
View File

@@ -16,14 +16,14 @@
const ENGINE_DST
; wUnusedTwoDayTimerOn
const ENGINE_0A
; StatusFlags
; wStatusFlags
const ENGINE_POKEDEX
const ENGINE_UNOWN_DEX
const ENGINE_POKERUS
const ENGINE_ROCKET_SIGNAL_ON_CH20
const ENGINE_CREDITS_SKIP
const ENGINE_BUG_CONTEST_ON ; 10
; StatusFlags2
; wStatusFlags2
const ENGINE_BUG_CONTEST_TIMER
const ENGINE_SAFARI_ZONE
const ENGINE_ROCKETS_IN_RADIO_TOWER
@@ -31,11 +31,11 @@
const ENGINE_GIVE_POKERUS
const ENGINE_FLORIA
const ENGINE_ROCKETS_IN_MAHOGANY
; BikeFlags
; wBikeFlags
const ENGINE_STRENGTH_ACTIVE
const ENGINE_ALWAYS_ON_BIKE
const ENGINE_DOWNHILL
; JohtoBadges
; wJohtoBadges
const ENGINE_ZEPHYRBADGE
const ENGINE_HIVEBADGE
const ENGINE_PLAINBADGE
@@ -44,7 +44,7 @@
const ENGINE_STORMBADGE ; 20
const ENGINE_GLACIERBADGE
const ENGINE_RISINGBADGE
; KantoBadges
; wKantoBadges
const ENGINE_BOULDERBADGE
const ENGINE_CASCADEBADGE
const ENGINE_THUNDERBADGE
@@ -53,7 +53,7 @@
const ENGINE_MARSHBADGE
const ENGINE_VOLCANOBADGE
const ENGINE_EARTHBADGE
; UnlockedUnowns
; wUnlockedUnowns
const ENGINE_UNLOCKED_UNOWNS_1
const ENGINE_UNLOCKED_UNOWNS_2
const ENGINE_UNLOCKED_UNOWNS_3
@@ -62,7 +62,7 @@
const ENGINE_UNLOCKED_UNOWNS_6 ; 30
const ENGINE_UNLOCKED_UNOWNS_7
const ENGINE_UNLOCKED_UNOWNS_8
; VisitedSpawns
; wVisitedSpawns
const ENGINE_FLYPOINT_KRISS_HOUSE
const ENGINE_FLYPOINT_VIRIDIAN_POKECENTER
const ENGINE_FLYPOINT_PALLET
@@ -92,9 +92,9 @@
const ENGINE_FLYPOINT_UNUSED
; wLuckyNumberShowFlag
const ENGINE_LUCKY_NUMBER_SHOW
; StatusFlags2
; wStatusFlags2
const ENGINE_4F
; DailyFlags
; wDailyFlags
const ENGINE_KURT_MAKING_BALLS ; 50
const ENGINE_DAILY_BUG_CONTEST
const ENGINE_SPECIAL_WILDDATA
@@ -103,7 +103,7 @@
const ENGINE_SHUCKLE_GIVEN
const ENGINE_GOLDENROD_UNDERGROUND_MERCHANT_CLOSED
const ENGINE_FOUGHT_IN_TRAINER_HALL_TODAY
; WeeklyFlags
; wWeeklyFlags
const ENGINE_MT_MOON_SQUARE_CLEFAIRY
const ENGINE_UNION_CAVE_LAPRAS
const ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT
@@ -112,12 +112,12 @@
const ENGINE_INDIGO_PLATEAU_RIVAL_FIGHT
const ENGINE_DAILY_MOVE_TUTOR
const ENGINE_BUENAS_PASSWORD
; SwarmFlags
; wSwarmFlags
const ENGINE_BUENAS_PASSWORD_2 ; 60
const ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON
; GameTimerPause
; wGameTimerPause
const ENGINE_62
; PlayerGender
; wPlayerGender
const ENGINE_PLAYER_IS_FEMALE
; wCelebiEvent
const ENGINE_HAVE_EXAMINED_GS_BALL
@@ -184,7 +184,7 @@
const ENGINE_ERIN_SATURDAY_NIGHT
; wPlayerSpriteSetupFlags
const ENGINE_KRIS_IN_CABLE_CLUB
; SwarmFlags
; wSwarmFlags
const ENGINE_DUNSPARCE_SWARM ; a0
const ENGINE_YANMA_SWARM
NUM_ENGINE_FLAGS EQU const_value

4
constants/wram_constants.asm
View File

@@ -131,7 +131,7 @@ DAY_CARE_DEPOSIT EQU 3
const DEXMODE_ABC
const DEXMODE_UNOWN
; JohtoBadges:
; wJohtoBadges:
const_def
const ZEPHYRBADGE
const HIVEBADGE
@@ -143,7 +143,7 @@ DAY_CARE_DEPOSIT EQU 3
const RISINGBADGE
NUM_JOHTO_BADGES EQU const_value
; KantoBadges:
; wKantoBadges:
const_def
const BOULDERBADGE
const CASCADEBADGE

180
data/engine_flags.asm
View File

@@ -26,110 +26,110 @@ EngineFlags: ; 80462
engine_flag wUnusedTwoDayTimerOn, 0 ; unused, possibly related to a 2-day timer
engine_flag StatusFlags, 0 ; pokedex
engine_flag StatusFlags, 1 ; unown dex
engine_flag StatusFlags, 3 ; pokerus
engine_flag StatusFlags, 4 ; rocket signal on ch20
engine_flag StatusFlags, 6 ; credits skip
engine_flag StatusFlags, 7 ; bug contest on ; $10
engine_flag StatusFlags2, 2 ; bug contest timer
engine_flag StatusFlags2, 1 ; safari zone?
engine_flag StatusFlags2, 0 ; rockets in radio tower
engine_flag StatusFlags2, 4 ; bike shop call enabled (1024 bike steps reqd)
engine_flag StatusFlags2, 5 ; give pokerus
engine_flag StatusFlags2, 6 ; berry -> berry juice when trading?
engine_flag StatusFlags2, 7 ; rockets in mahogany
engine_flag wStatusFlags, 0 ; pokedex
engine_flag wStatusFlags, 1 ; unown dex
engine_flag wStatusFlags, 3 ; pokerus
engine_flag wStatusFlags, 4 ; rocket signal on ch20
engine_flag wStatusFlags, 6 ; credits skip
engine_flag wStatusFlags, 7 ; bug contest on ; $10
engine_flag wStatusFlags2, 2 ; bug contest timer
engine_flag wStatusFlags2, 1 ; safari zone?
engine_flag wStatusFlags2, 0 ; rockets in radio tower
engine_flag wStatusFlags2, 4 ; bike shop call enabled (1024 bike steps reqd)
engine_flag wStatusFlags2, 5 ; give pokerus
engine_flag wStatusFlags2, 6 ; berry -> berry juice when trading?
engine_flag wStatusFlags2, 7 ; rockets in mahogany
engine_flag BikeFlags, 0 ; strength active ; $18
engine_flag BikeFlags, 1 ; always on bike (cant surf)
engine_flag BikeFlags, 2 ; downhill (cycling road)
engine_flag wBikeFlags, 0 ; strength active ; $18
engine_flag wBikeFlags, 1 ; always on bike (cant surf)
engine_flag wBikeFlags, 2 ; downhill (cycling road)
engine_flag JohtoBadges, 0 ; zephyrbadge
engine_flag JohtoBadges, 1 ; hivebadge
engine_flag JohtoBadges, 2 ; plainbadge
engine_flag JohtoBadges, 3 ; fogbadge
engine_flag JohtoBadges, 4 ; mineralbadge
engine_flag JohtoBadges, 5 ; stormbadge ; $20
engine_flag JohtoBadges, 6 ; glacierbadge
engine_flag JohtoBadges, 7 ; risingbadge
engine_flag wJohtoBadges, 0 ; zephyrbadge
engine_flag wJohtoBadges, 1 ; hivebadge
engine_flag wJohtoBadges, 2 ; plainbadge
engine_flag wJohtoBadges, 3 ; fogbadge
engine_flag wJohtoBadges, 4 ; mineralbadge
engine_flag wJohtoBadges, 5 ; stormbadge ; $20
engine_flag wJohtoBadges, 6 ; glacierbadge
engine_flag wJohtoBadges, 7 ; risingbadge
engine_flag KantoBadges, 0 ; boulderbadge
engine_flag KantoBadges, 1 ; cascadebadge
engine_flag KantoBadges, 2 ; thunderbadge
engine_flag KantoBadges, 3 ; rainbowbadge
engine_flag KantoBadges, 4 ; soulbadge
engine_flag KantoBadges, 5 ; marshbadge ; $28
engine_flag KantoBadges, 6 ; volcanobadge
engine_flag KantoBadges, 7 ; earthbadge
engine_flag wKantoBadges, 0 ; boulderbadge
engine_flag wKantoBadges, 1 ; cascadebadge
engine_flag wKantoBadges, 2 ; thunderbadge
engine_flag wKantoBadges, 3 ; rainbowbadge
engine_flag wKantoBadges, 4 ; soulbadge
engine_flag wKantoBadges, 5 ; marshbadge ; $28
engine_flag wKantoBadges, 6 ; volcanobadge
engine_flag wKantoBadges, 7 ; earthbadge
; unown sets
engine_flag UnlockedUnowns, 0 ; 1
engine_flag UnlockedUnowns, 1 ; 2
engine_flag UnlockedUnowns, 2 ; 3
engine_flag UnlockedUnowns, 3 ; 4
engine_flag UnlockedUnowns, 4 ; 5
engine_flag UnlockedUnowns, 5 ; 6 ; $30
engine_flag UnlockedUnowns, 6 ; 7
engine_flag UnlockedUnowns, 7 ; 8
engine_flag wUnlockedUnowns, 0 ; 1
engine_flag wUnlockedUnowns, 1 ; 2
engine_flag wUnlockedUnowns, 2 ; 3
engine_flag wUnlockedUnowns, 3 ; 4
engine_flag wUnlockedUnowns, 4 ; 5
engine_flag wUnlockedUnowns, 5 ; 6 ; $30
engine_flag wUnlockedUnowns, 6 ; 7
engine_flag wUnlockedUnowns, 7 ; 8
; fly
engine_flag VisitedSpawns, 0 ; your house
engine_flag VisitedSpawns, 1 ; viridian pokecenter
engine_flag VisitedSpawns, 2 ; pallet
engine_flag VisitedSpawns, 3 ; viridian
engine_flag VisitedSpawns, 4 ; pewter
engine_flag VisitedSpawns, 5 ; cerulean ; $38
engine_flag VisitedSpawns, 6 ; rock tunnel
engine_flag VisitedSpawns, 7 ; vermilion
engine_flag VisitedSpawns + 1, 0 ; lavender
engine_flag VisitedSpawns + 1, 1 ; saffron
engine_flag VisitedSpawns + 1, 2 ; celadon
engine_flag VisitedSpawns + 1, 3 ; fuchsia
engine_flag VisitedSpawns + 1, 4 ; cinnabar
engine_flag VisitedSpawns + 1, 5 ; indigo plateau ; $40
engine_flag VisitedSpawns + 1, 6 ; new bark
engine_flag VisitedSpawns + 1, 7 ; cherrygrove
engine_flag VisitedSpawns + 2, 0 ; violet
engine_flag wVisitedSpawns, 0 ; your house
engine_flag wVisitedSpawns, 1 ; viridian pokecenter
engine_flag wVisitedSpawns, 2 ; pallet
engine_flag wVisitedSpawns, 3 ; viridian
engine_flag wVisitedSpawns, 4 ; pewter
engine_flag wVisitedSpawns, 5 ; cerulean ; $38
engine_flag wVisitedSpawns, 6 ; rock tunnel
engine_flag wVisitedSpawns, 7 ; vermilion
engine_flag wVisitedSpawns + 1, 0 ; lavender
engine_flag wVisitedSpawns + 1, 1 ; saffron
engine_flag wVisitedSpawns + 1, 2 ; celadon
engine_flag wVisitedSpawns + 1, 3 ; fuchsia
engine_flag wVisitedSpawns + 1, 4 ; cinnabar
engine_flag wVisitedSpawns + 1, 5 ; indigo plateau ; $40
engine_flag wVisitedSpawns + 1, 6 ; new bark
engine_flag wVisitedSpawns + 1, 7 ; cherrygrove
engine_flag wVisitedSpawns + 2, 0 ; violet
; union cave
engine_flag VisitedSpawns + 2, 2 ; azalea
engine_flag VisitedSpawns + 2, 3 ; cianwood
engine_flag VisitedSpawns + 2, 4 ; goldenrod
engine_flag VisitedSpawns + 2, 5 ; olivine
engine_flag VisitedSpawns + 2, 6 ; ecruteak ; $48
engine_flag VisitedSpawns + 2, 7 ; mahogany
engine_flag VisitedSpawns + 3, 0 ; lake of rage
engine_flag VisitedSpawns + 3, 1 ; blackthorn
engine_flag VisitedSpawns + 3, 2 ; silver cave
engine_flag wVisitedSpawns + 2, 2 ; azalea
engine_flag wVisitedSpawns + 2, 3 ; cianwood
engine_flag wVisitedSpawns + 2, 4 ; goldenrod
engine_flag wVisitedSpawns + 2, 5 ; olivine
engine_flag wVisitedSpawns + 2, 6 ; ecruteak ; $48
engine_flag wVisitedSpawns + 2, 7 ; mahogany
engine_flag wVisitedSpawns + 3, 0 ; lake of rage
engine_flag wVisitedSpawns + 3, 1 ; blackthorn
engine_flag wVisitedSpawns + 3, 2 ; silver cave
; fast ship
engine_flag VisitedSpawns + 3, 4 ; unused
engine_flag wVisitedSpawns + 3, 4 ; unused
engine_flag wLuckyNumberShowFlag, 0 ; lucky number show
engine_flag StatusFlags2, 3 ; ????
engine_flag wStatusFlags2, 3 ; ????
engine_flag DailyFlags, 0 ; kurt making balls ; $50
engine_flag DailyFlags, 1 ; ????
engine_flag DailyFlags, 2 ; special wilddata?
engine_flag DailyFlags, 3 ; time capsule (24h wait)
engine_flag DailyFlags, 4 ; all fruit trees
engine_flag DailyFlags, 5 ; shuckle given
engine_flag DailyFlags, 6 ; goldenrod underground merchant closed
engine_flag DailyFlags, 7 ; fought in trainer hall today
engine_flag wDailyFlags, 0 ; kurt making balls ; $50
engine_flag wDailyFlags, 1 ; ????
engine_flag wDailyFlags, 2 ; special wilddata?
engine_flag wDailyFlags, 3 ; time capsule (24h wait)
engine_flag wDailyFlags, 4 ; all fruit trees
engine_flag wDailyFlags, 5 ; shuckle given
engine_flag wDailyFlags, 6 ; goldenrod underground merchant closed
engine_flag wDailyFlags, 7 ; fought in trainer hall today
engine_flag WeeklyFlags, 0 ; mt moon square clefairy ; $58
engine_flag WeeklyFlags, 1 ; union cave lapras
engine_flag WeeklyFlags, 2 ; goldenrod underground haircut used
engine_flag WeeklyFlags, 3 ; goldenrod mall happiness event floor05 object07
engine_flag WeeklyFlags, 4 ; tea in blues house
engine_flag WeeklyFlags, 5 ; indigo plateau rival fight
engine_flag WeeklyFlags, 6 ; move tutor
engine_flag WeeklyFlags, 7 ; buenas password
engine_flag wWeeklyFlags, 0 ; mt moon square clefairy ; $58
engine_flag wWeeklyFlags, 1 ; union cave lapras
engine_flag wWeeklyFlags, 2 ; goldenrod underground haircut used
engine_flag wWeeklyFlags, 3 ; goldenrod mall happiness event floor05 object07
engine_flag wWeeklyFlags, 4 ; tea in blues house
engine_flag wWeeklyFlags, 5 ; indigo plateau rival fight
engine_flag wWeeklyFlags, 6 ; move tutor
engine_flag wWeeklyFlags, 7 ; buenas password
engine_flag SwarmFlags, 0 ; buenas password 2
engine_flag SwarmFlags, 1 ; goldenrod dept store sale is on
engine_flag wSwarmFlags, 0 ; buenas password 2
engine_flag wSwarmFlags, 1 ; goldenrod dept store sale is on
engine_flag GameTimerPause, 7 ; $62
engine_flag wGameTimerPause, 7 ; $62
engine_flag PlayerGender, 0 ; player is female
engine_flag wPlayerGender, 0 ; player is female
engine_flag wCelebiEvent, 2 ; have gs ball after kurt examined it
@@ -200,7 +200,7 @@ EngineFlags: ; 80462
engine_flag wPlayerSpriteSetupFlags, 2 ; female player has been transformed into male
engine_flag SwarmFlags, 2 ; dunsparce swarm ; $a0
engine_flag SwarmFlags, 3 ; yanma swarm
engine_flag wSwarmFlags, 2 ; dunsparce swarm ; $a0
engine_flag wSwarmFlags, 3 ; yanma swarm
; 80648

6
engine/battle/core.asm
View File

@@ -6695,7 +6695,7 @@ CheckSleepingTreeMon: ; 3eb38
CheckUnownLetter: ; 3eb75
; Return carry if the Unown letter hasn't been unlocked yet
ld a, [UnlockedUnowns]
ld a, [wUnlockedUnowns]
ld c, a
ld de, 0
@@ -7074,7 +7074,7 @@ BadgeStatBoosts: ; 3ed45
and a
ret nz
ld a, [JohtoBadges]
ld a, [wJohtoBadges]
; Swap badges 3 (PlainBadge) and 5 (MineralBadge).
ld d, a
@@ -9349,7 +9349,7 @@ GetTrainerBackpic: ; 3fbff
ld a, [wPlayerSpriteSetupFlags]
bit 2, a ; transformed to male
jr nz, .Chris
ld a, [PlayerGender]
ld a, [wPlayerGender]
bit 0, a
jr z, .Chris

2
engine/battle/effect_commands.asm
View File

@@ -726,7 +726,7 @@ BattleCommand_CheckObedience: ; 343db
.obeylevel
; The maximum obedience level is constrained by owned badges:
ld hl, JohtoBadges
ld hl, wJohtoBadges
; risingbadge
bit RISINGBADGE, [hl]

4
engine/battle/misc.asm
View File

@@ -176,9 +176,9 @@ DoBadgeTypeBoosts: ; fbe24
ld hl, .BadgeTypes
ld a, [KantoBadges]
ld a, [wKantoBadges]
ld b, a
ld a, [JohtoBadges]
ld a, [wJohtoBadges]
ld c, a
.CheckBadge:

2
engine/caught_data.asm
View File

@@ -193,7 +193,7 @@ SetBoxmonOrEggmonCaughtData: ; 4db53
.NotPokecenter2F:
call GetWorldMapLocation
ld b, a
ld a, [PlayerGender]
ld a, [wPlayerGender]
rrca
or b
ld [hl], a

10
engine/cgb_layouts.asm
View File

@@ -183,7 +183,7 @@ InitPartyMenuBGPal0: ; 8e9f
; 8eb9
_CGB_PokegearPals: ; 8eb9
ld a, [PlayerGender]
ld a, [wPlayerGender]
bit 0, a
jr z, .male
ld hl, FemalePokegearPals
@@ -719,7 +719,7 @@ _CGB_TrainerCard: ; 9289
; fill screen with opposite-gender palette for the card border
hlcoord 0, 0, AttrMap
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
ld a, [PlayerGender]
ld a, [wPlayerGender]
and a
ld a, $1 ; kris
jr z, .got_gender
@@ -729,7 +729,7 @@ _CGB_TrainerCard: ; 9289
; fill trainer sprite area with same-gender palette
hlcoord 14, 1, AttrMap
lb bc, 7, 5
ld a, [PlayerGender]
ld a, [wPlayerGender]
and a
ld a, $0 ; chris
jr z, .got_gender2
@@ -768,7 +768,7 @@ _CGB_TrainerCard: ; 9289
ld a, $7 ; pryce
call FillBoxCGB
; clair uses kris's palette
ld a, [PlayerGender]
ld a, [wPlayerGender]
and a
push af
jr z, .got_gender3
@@ -847,7 +847,7 @@ _CGB_PackPals: ; 93d3
cp BATTLETYPE_TUTORIAL
jr z, .tutorial_male
ld a, [PlayerGender]
ld a, [wPlayerGender]
bit 0, a
jr z, .tutorial_male

2
engine/color.asm
View File

@@ -718,7 +718,7 @@ GetPlayerOrMonPalettePointer:
ld a, [wPlayerSpriteSetupFlags]
bit 2, a ; transformed to male
jr nz, .male
ld a, [PlayerGender]
ld a, [wPlayerGender]
and a
jr z, .male
ld hl, KrisPalette

2
engine/events.asm
View File

@@ -491,7 +491,7 @@ CheckTimeEvents: ; 9693a
and a
jr nz, .nothing
ld hl, StatusFlags2
ld hl, wStatusFlags2
bit 2, [hl] ; bug contest
jr z, .do_daily

2
engine/events/field_moves.asm
View File

@@ -8,7 +8,7 @@ PlayWhirlpoolSound: ; 8c7d4
BlindingFlash: ; 8c7e1
farcall FadeOutPalettes
ld hl, StatusFlags
ld hl, wStatusFlags
set 2, [hl] ; Flash
farcall ReplaceTimeOfDayPals
farcall UpdateTimeOfDayPal

2
engine/events/fish.asm
View File

@@ -97,7 +97,7 @@ GetFishGroupIndex: ; 9245b
; Return the index of fishgroup d in de.
push hl
ld hl, DailyFlags
ld hl, wDailyFlags
bit 2, [hl]
pop hl
jr z, .done

4
engine/events/fruit_trees.asm
View File

@@ -43,7 +43,7 @@ GetCurTreeFruit: ; 44041
; 4404c
TryResetFruitTrees: ; 4404c
ld hl, DailyFlags
ld hl, wDailyFlags
bit 4, [hl]
ret nz
jp ResetFruitTrees
@@ -70,7 +70,7 @@ ResetFruitTrees: ; 4406a
ld [hli], a
ld [hli], a
ld [hl], a
ld hl, DailyFlags
ld hl, wDailyFlags
set 4, [hl]
ret
; 44078

6
engine/events/halloffame.asm
View File

@@ -2,7 +2,7 @@ HALLOFFAME_COLON EQU $63
HallOfFame:: ; 0x8640e
call HallOfFame_FadeOutMusic
ld a, [StatusFlags]
ld a, [wStatusFlags]
push af
ld a, 1
ld [wGameLogicPaused], a
@@ -11,7 +11,7 @@ HallOfFame:: ; 0x8640e
ld [wSpawnAfterChampion], a
; Enable the Pokégear map to cycle through all of Kanto
ld hl, StatusFlags
ld hl, wStatusFlags
set 6, [hl] ; hall of fame
farcall HallOfFame_InitSaveIfNeeded
@@ -52,7 +52,7 @@ RedCredits:: ; 86455
call DisableSpriteUpdates
ld a, SPAWN_RED
ld [wSpawnAfterChampion], a
ld a, [StatusFlags]
ld a, [wStatusFlags]
ld b, a
farcall Credits
ret

2
engine/events/magnet_train.asm
View File

@@ -328,7 +328,7 @@ MagnetTrain_Jumptable: ; 8cdf7
push af
ld a, $1
ld [rSVBK], a
ld a, [PlayerGender]
ld a, [wPlayerGender]
bit 0, a
jr z, .got_gender
ld b, SPRITE_ANIM_INDEX_MAGNET_TRAIN_BLUE

10
engine/events/overworld.asm
View File

@@ -358,7 +358,7 @@ SurfFunction: ; c909
ld de, ENGINE_FOGBADGE
call CheckBadge
jr c, .asm_c956
ld hl, BikeFlags
ld hl, wBikeFlags
bit 1, [hl] ; always on bike
jr nz, .cannotsurf
ld a, [PlayerState]
@@ -520,7 +520,7 @@ TrySurfOW:: ; c9e7
call CheckPartyMove
jr c, .quit
ld hl, BikeFlags
ld hl, wBikeFlags
bit 1, [hl] ; always on bike (can't surf)
jr nz, .quit
@@ -1008,7 +1008,7 @@ StrengthFunction: ; cce5
ret
SetStrengthFlag: ; cd12
ld hl, BikeFlags
ld hl, wBikeFlags
set 0, [hl]
ld a, [CurPartyMon]
ld e, a
@@ -1086,7 +1086,7 @@ TryStrengthOW: ; cd78
call CheckEngineFlag
jr c, .nope
ld hl, BikeFlags
ld hl, wBikeFlags
bit 0, [hl]
jr z, .already_using
@@ -1683,7 +1683,7 @@ BikeFunction: ; d0b3
ret
.GetOffBike:
ld hl, BikeFlags
ld hl, wBikeFlags
bit 1, [hl]
jr nz, .CantGetOffBike
ld hl, Script_GetOffBike

4
engine/events/pokerus/pokerus.asm
View File

@@ -18,7 +18,7 @@ GivePokerusAndConvertBerries: ; 2ed44
; If we haven't been to Goldenrod City at least once,
; prevent the contraction of Pokerus.
ld hl, StatusFlags2
ld hl, wStatusFlags2
bit 6, [hl]
ret z
call Random
@@ -123,7 +123,7 @@ GivePokerusAndConvertBerries: ; 2ed44
; any berry held by a Shuckle may be converted to berry juice
ConvertBerriesToBerryJuice: ; 2ede6
ld hl, StatusFlags2
ld hl, wStatusFlags2
bit 6, [hl]
ret z
call Random

2
engine/events/special.asm
View File

@@ -53,7 +53,7 @@ SpecialGiveShuckle: ; 7305
call CopyName2
; Engine flag for this event.
ld hl, DailyFlags
ld hl, wDailyFlags
set 5, [hl]
; setflag ENGINE_SHUCKLE_GIVEN
ld a, 1

2
engine/events/sweet_scent.asm
View File

@@ -36,7 +36,7 @@ SweetScentNothing: ; 0x506e9
SweetScentEncounter: ; 506ef
farcall CanUseSweetScent
jr nc, .no_battle
ld hl, StatusFlags2
ld hl, wStatusFlags2
bit 2, [hl]
jr nz, .not_in_bug_contest
farcall GetMapEncounterRate

10
engine/events_2.asm
View File

@@ -2,7 +2,7 @@
WarpToSpawnPoint:: ; 97c28
ld hl, StatusFlags2
ld hl, wStatusFlags2
res 1, [hl] ; safari zone?
res 2, [hl] ; bug contest
ret
@@ -108,7 +108,7 @@ RandomEncounter:: ; 97cc0
jr c, .nope
call CanUseSweetScent
jr nc, .nope
ld hl, StatusFlags2
ld hl, wStatusFlags2
bit 2, [hl] ; bug contest
jr nz, .bug_contest
farcall TryWildEncounter
@@ -149,7 +149,7 @@ WildBattleScript: ; 97cf9
; 97cfd
CanUseSweetScent:: ; 97cfd
ld hl, StatusFlags
ld hl, wStatusFlags
bit 5, [hl]
jr nz, .no
ld a, [wEnvironment]
@@ -263,7 +263,7 @@ DoBikeStep:: ; 97db3
; If the bike shop owner doesn't have our number, or
; if we've already gotten the call, we don't have to
; be here.
ld hl, StatusFlags2
ld hl, wStatusFlags2
bit 4, [hl] ; bike shop call
jr z, .NoCall
@@ -314,7 +314,7 @@ DoBikeStep:: ; 97db3
ld [wSpecialPhoneCallID], a
xor a
ld [wSpecialPhoneCallID + 1], a
ld hl, StatusFlags2
ld hl, wStatusFlags2
res 4, [hl] ; bike shop call
scf
ret

Some files were not shown because too many files have changed in this diff Show More