wStatusFlags/2 bit constants

engine/events/field_moves.asm

@@ -9,7 +9,7 @@ PlayWhirlpoolSound: ; 8c7d4
 BlindingFlash: ; 8c7e1
 	farcall Special_FadeOutPalettes
 	ld hl, wStatusFlags
-	set 2, [hl] ; Flash
+	set STATUSFLAGS_FLASH_F, [hl]
 	farcall ReplaceTimeOfDayPals
 	farcall UpdateTimeOfDayPal
 	ld b, SCGB_MAPPALS

engine/events/halloffame.asm

@@ -12,7 +12,7 @@ HallOfFame:: ; 0x8640e
 
 	; Enable the Pokégear map to cycle through all of Kanto
 	ld hl, wStatusFlags
-	set 6, [hl] ; hall of fame
+	set STATUSFLAGS_HALL_OF_FAME_F, [hl]
 
 	farcall HallOfFame_InitSaveIfNeeded
 

engine/events/pokerus/pokerus.asm

@@ -19,7 +19,7 @@ GivePokerusAndConvertBerries: ; 2ed44
 ; If we haven't been to Goldenrod City at least once,
 ; prevent the contraction of Pokerus.
 	ld hl, wStatusFlags2
-	bit 6, [hl]
+	bit STATUSFLAGS2_REACHED_GOLDENROD_F, [hl]
 	ret z
 	call Random
 	ld a, [hRandomAdd]
@@ -61,7 +61,7 @@ GivePokerusAndConvertBerries: ; 2ed44
 
 .TrySpreadPokerus:
 	call Random
-	cp 1 + 33 percent
+	cp 33 percent + 1
 	ret nc              ; 1/3 chance
 
 	ld a, [PartyCount]
@@ -74,7 +74,7 @@ GivePokerusAndConvertBerries: ; 2ed44
 	jr c, .checkPreviousMonsLoop    ; no more mons after this one, go backwards
 
 	call Random
-	cp 1 + 50 percent
+	cp 50 percent + 1
 	jr c, .checkPreviousMonsLoop    ; 1/2 chance, go backwards
 .checkFollowingMonsLoop
 	add hl, de
@@ -121,14 +121,15 @@ GivePokerusAndConvertBerries: ; 2ed44
 	ld [hl], a
 	ret
 
-; any berry held by a Shuckle may be converted to berry juice
 ConvertBerriesToBerryJuice: ; 2ede6
+; If we haven't been to Goldenrod City at least once,
+; prevent Shuckle from turning held Berry into Berry Juice.
 	ld hl, wStatusFlags2
-	bit 6, [hl]
+	bit STATUSFLAGS2_REACHED_GOLDENROD_F, [hl]
 	ret z
 	call Random
-	cp $10
-	ret nc              ; 1/16 chance
+	cp 6 percent + 1 ; 1/16 chance
+	ret nc
 	ld hl, PartyMons
 	ld a, [PartyCount]
 .partyMonLoop

engine/events/std_scripts.asm

@@ -122,7 +122,7 @@ PokecenterNurseScript:
 
 	checkphonecall ; elm already called about pokerus
 	iftrue .no
-	checkflag ENGINE_POKERUS ; nurse already talked about pokerus
+	checkflag ENGINE_CAUGHT_POKERUS
 	iftrue .no
 	special Special_CheckPokerus
 	iftrue .pokerus
@@ -158,7 +158,7 @@ PokecenterNurseScript:
 	closetext
 
 .pokerus_done
-	setflag ENGINE_POKERUS
+	setflag ENGINE_CAUGHT_POKERUS
 	specialphonecall SPECIALCALL_POKERUS
 	end
 

engine/events/sweet_scent.asm

@@ -37,7 +37,7 @@ SweetScentEncounter: ; 506ef
 	farcall CanUseSweetScent
 	jr nc, .no_battle
 	ld hl, wStatusFlags2
-	bit 2, [hl]
+	bit STATUSFLAGS2_BUG_CONTEST_TIMER_F, [hl]
 	jr nz, .not_in_bug_contest
 	farcall GetMapEncounterRate
 	ld a, b