You've already forked pokecrystal-board
mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2025-09-08 08:13:02 -07:00
Prefix engine_flags wram addresses with w
This commit is contained in:
@@ -8,7 +8,7 @@ PlayWhirlpoolSound: ; 8c7d4
|
||||
|
||||
BlindingFlash: ; 8c7e1
|
||||
farcall FadeOutPalettes
|
||||
ld hl, StatusFlags
|
||||
ld hl, wStatusFlags
|
||||
set 2, [hl] ; Flash
|
||||
farcall ReplaceTimeOfDayPals
|
||||
farcall UpdateTimeOfDayPal
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user