Predef_FlagAction -> Predef_SmallFarFlagAction

13 files changed, 24 insertions, 24 deletions

diff --git a/engine/battle/ai/move.asm b/engine/battle/ai/move.asm
index ead0fd5fa..b4550383a 100755
--- a/engine/battle/ai/move.asm
+++ b/engine/battle/ai/move.asm
@@ -92,7 +92,7 @@ AIChooseMove: ; 440ce
 
 	push bc
 	ld d, BANK(TrainerClassAttributes)
-	predef Predef_FlagAction
+	predef Predef_SmallFarFlagAction
 	ld d, c
 	pop bc
 
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index ff415bc75..7702a0681 100644
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -2760,7 +2760,7 @@ PlayerMonFaintHappinessMod: ; 3d1aa
 	ld c, a
 	ld hl, wBattleParticipantsNotFainted
 	ld b, RESET_FLAG
-	predef Predef_FlagAction
+	predef Predef_SmallFarFlagAction
 	ld hl, EnemySubStatus3
 	res SUBSTATUS_IN_LOOP, [hl]
 	xor a
@@ -3357,10 +3357,10 @@ AddBattleParticipant: ; 3d581
 	ld hl, wBattleParticipantsNotFainted
 	ld b, SET_FLAG
 	push bc
-	predef Predef_FlagAction
+	predef Predef_SmallFarFlagAction
 	pop bc
 	ld hl, wBattleParticipantsIncludingFainted
-	predef_jump Predef_FlagAction
+	predef_jump Predef_SmallFarFlagAction
 ; 3d599
 
 FindPkmnInOTPartyToSwitchIntoBattle: ; 3d599
@@ -4350,7 +4350,7 @@ PursuitSwitch: ; 3dc5b
 	ld c, a
 	ld hl, wBattleParticipantsNotFainted
 	ld b, RESET_FLAG
-	predef Predef_FlagAction
+	predef Predef_SmallFarFlagAction
 	call PlayerMonFaintedAnimation
 	ld hl, BattleText_PkmnFainted
 	jr .done_fainted
@@ -6631,7 +6631,7 @@ LoadEnemyMon: ; 3e8eb
 	ld c, a
 	ld b, SET_FLAG
 	ld hl, PokedexSeen
-	predef Predef_FlagAction
+	predef Predef_SmallFarFlagAction
 
 	ld hl, EnemyMonStats
 	ld de, EnemyStats
@@ -7313,7 +7313,7 @@ GiveExperiencePoints: ; 3ee3b
 	ld c, a
 	ld b, CHECK_FLAG
 	ld d, $0
-	predef Predef_FlagAction
+	predef Predef_SmallFarFlagAction
 	ld a, c
 	and a
 	pop bc
@@ -7642,7 +7642,7 @@ GiveExperiencePoints: ; 3ee3b
 	ld a, [CurPartyMon]
 	ld c, a
 	ld b, SET_FLAG
-	predef Predef_FlagAction
+	predef Predef_SmallFarFlagAction
 	pop af
 	ld [CurPartyLevel], a
 
diff --git a/engine/evolve.asm b/engine/evolve.asm
index dbe1db5af..877dd9031 100755
--- a/engine/evolve.asm
+++ b/engine/evolve.asm
@@ -621,7 +621,7 @@ ShiftMoves: ; 4256e
 EvoFlagAction: ; 42577
 	push de
 	ld d, $0
-	predef Predef_FlagAction
+	predef Predef_SmallFarFlagAction
 	pop de
 	ret
 ; 42581
diff --git a/engine/item_effects.asm b/engine/item_effects.asm
index 7ce84a57a..5f346496e 100644
--- a/engine/item_effects.asm
+++ b/engine/item_effects.asm
@@ -1668,7 +1668,7 @@ RevivePokemon: ; f0d6
 	ld d, 0
 	ld hl, wBattleParticipantsIncludingFainted
 	ld b, CHECK_FLAG
-	predef Predef_FlagAction
+	predef Predef_SmallFarFlagAction
 	ld a, c
 	and a
 	jr z, .skip_to_revive
@@ -1677,7 +1677,7 @@ RevivePokemon: ; f0d6
 	ld c, a
 	ld hl, wBattleParticipantsNotFainted
 	ld b, SET_FLAG
-	predef Predef_FlagAction
+	predef Predef_SmallFarFlagAction
 
 .skip_to_revive
 	xor a
diff --git a/engine/link.asm b/engine/link.asm
index 94e7f2458..426a43a23 100755
--- a/engine/link.asm
+++ b/engine/link.asm
@@ -2584,7 +2584,7 @@ Unreferenced_Function29fe4:
 	call GetSRAMBank
 	ld d, $0
 	ld b, CHECK_FLAG
-	predef Predef_FlagAction
+	predef Predef_SmallFarFlagAction
 	call CloseSRAM
 	ld a, c
 	and a
diff --git a/engine/move_mon.asm b/engine/move_mon.asm
index 658d57611..426a3ba8b 100755
--- a/engine/move_mon.asm
+++ b/engine/move_mon.asm
@@ -1119,7 +1119,7 @@ Predef_GiveEgg:: ; df8c
 	ld d, $0
 	ld hl, PokedexCaught
 	ld b, RESET_FLAG
-	predef Predef_FlagAction
+	predef Predef_SmallFarFlagAction
 
 .skip_caught_flag
 ; If we haven't seen this Pokemon before receiving
@@ -1135,7 +1135,7 @@ Predef_GiveEgg:: ; df8c
 	ld d, $0
 	ld hl, PokedexSeen
 	ld b, RESET_FLAG
-	predef Predef_FlagAction
+	predef Predef_SmallFarFlagAction
 
 .skip_seen_flag
 	pop af
diff --git a/engine/mystery_gift.asm b/engine/mystery_gift.asm
index 27ffd97b0..a1518352f 100755
--- a/engine/mystery_gift.asm
+++ b/engine/mystery_gift.asm
@@ -1117,7 +1117,7 @@ MysteryGift_CheckAndSetDecorationAlreadyReceived: ; 105069 (41:5069)
 	ld d, $0
 	ld b, CHECK_FLAG
 	ld hl, sMysteryGiftDecorationsReceived
-	predef_id Predef_FlagAction
+	predef_id Predef_SmallFarFlagAction
 	push hl
 	push bc
 	call Predef
@@ -1129,7 +1129,7 @@ MysteryGift_CheckAndSetDecorationAlreadyReceived: ; 105069 (41:5069)
 	ret nz
 	call GetMysteryGiftBank
 	ld b, SET_FLAG
-	predef Predef_FlagAction
+	predef Predef_SmallFarFlagAction
 	call CloseSRAM
 	xor a
 	ret
@@ -1142,7 +1142,7 @@ MysteryGift_CopyReceivedDecosToPC: ; 105091 (41:5091)
 	ld d, $0
 	ld b, CHECK_FLAG
 	ld hl, sMysteryGiftDecorationsReceived
-	predef Predef_FlagAction
+	predef Predef_SmallFarFlagAction
 	ld a, c
 	and a
 	pop bc
diff --git a/engine/npctrade.asm b/engine/npctrade.asm
index 25d47e6be..bd77f21c3 100755
--- a/engine/npctrade.asm
+++ b/engine/npctrade.asm
@@ -109,7 +109,7 @@ TradeFlagAction: ; fcc4a
 	ld hl, wTradeFlags
 	ld a, [wJumptableIndex]
 	ld c, a
-	predef Predef_FlagAction
+	predef Predef_SmallFarFlagAction
 	ld a, c
 	and a
 	ret
diff --git a/engine/pokegear.asm b/engine/pokegear.asm
index 18f86c1b6..cf58da8bf 100755
--- a/engine/pokegear.asm
+++ b/engine/pokegear.asm
@@ -2331,7 +2331,7 @@ HasVisitedSpawn: ; 91c50
 	ld hl, wVisitedSpawns
 	ld b, CHECK_FLAG
 	ld d, 0
-	predef Predef_FlagAction
+	predef Predef_SmallFarFlagAction
 	ld a, c
 	ret
 
diff --git a/engine/predef.asm b/engine/predef.asm
index 749084288..62ca7b147 100644
--- a/engine/predef.asm
+++ b/engine/predef.asm
@@ -33,7 +33,7 @@ PredefPointers:: ; 856b
 	add_predef Predef_LearnMove ; $0
 	add_predef DummyPredef1
 	add_predef HealParty ; this is both a special and a predef
-	add_predef Predef_FlagAction
+	add_predef Predef_SmallFarFlagAction
 	add_predef Predef_ComputeHPBarPixels
 	add_predef Predef_FillPP
 	add_predef Predef_TryAddMonToParty
diff --git a/engine/routines/flagpredef.asm b/engine/routines/flagpredef.asm
index 5b19950a1..676960c31 100644
--- a/engine/routines/flagpredef.asm
+++ b/engine/routines/flagpredef.asm
@@ -1,5 +1,5 @@
-Predef_FlagAction: ; 4d7c1
-; Perform action b on flag c in flag array hl.
+Predef_SmallFarFlagAction: ; 4d7c1
+; Perform action b on bit c in flag array hl.
 ; If checking a flag, check flag array d:hl unless d is 0.
 
 ; For longer flag arrays, see FlagAction.
diff --git a/engine/tmhm.asm b/engine/tmhm.asm
index 1b4456c88..11f692cb6 100755
--- a/engine/tmhm.asm
+++ b/engine/tmhm.asm
@@ -23,7 +23,7 @@ Predef_CanLearnTMHMMove: ; 11639
 	ld b, CHECK_FLAG
 	push de
 	ld d, 0
-	predef Predef_FlagAction
+	predef Predef_SmallFarFlagAction
 	pop de
 	ret
 
diff --git a/home/pokedex_flags.asm b/home/pokedex_flags.asm
index 420c253ea..ace3d6802 100644
--- a/home/pokedex_flags.asm
+++ b/home/pokedex_flags.asm
@@ -31,7 +31,7 @@ CheckSeenMon:: ; 339b
 
 PokedexFlagAction:: ; 33a1
 	ld d, 0
-	predef Predef_FlagAction
+	predef Predef_SmallFarFlagAction
 	ld a, c
 	and a
 	ret