ref: 2c789b64b1bfa9ec33d805d06ad3a7141e3871f1
parent: e9e8bf6eb14020d4a88a7cd4bca8539a2b45803e
author: xCrystal <[email protected]>
date: Sun Jan 7 06:53:20 EST 2018
Predef_FlagAction -> Predef_SmallFarFlagAction
--- a/engine/battle/ai/move.asm
+++ b/engine/battle/ai/move.asm
@@ -92,7 +92,7 @@
push bc
ld d, BANK(TrainerClassAttributes)
- predef Predef_FlagAction
+ predef Predef_SmallFarFlagAction
ld d, c
pop bc
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -2760,7 +2760,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
ld a, [CurPartyMon]
ld c, a
ld b, SET_FLAG
- predef Predef_FlagAction
+ predef Predef_SmallFarFlagAction
pop af
ld [CurPartyLevel], a
--- a/engine/evolve.asm
+++ b/engine/evolve.asm
@@ -621,7 +621,7 @@
EvoFlagAction: ; 42577
push de
ld d, $0
- predef Predef_FlagAction
+ predef Predef_SmallFarFlagAction
pop de
ret
; 42581
--- a/engine/item_effects.asm
+++ b/engine/item_effects.asm
@@ -1668,7 +1668,7 @@
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 @@
ld c, a
ld hl, wBattleParticipantsNotFainted
ld b, SET_FLAG
- predef Predef_FlagAction
+ predef Predef_SmallFarFlagAction
.skip_to_revive
xor a
--- a/engine/link.asm
+++ b/engine/link.asm
@@ -2584,7 +2584,7 @@
call GetSRAMBank
ld d, $0
ld b, CHECK_FLAG
- predef Predef_FlagAction
+ predef Predef_SmallFarFlagAction
call CloseSRAM
ld a, c
and a
--- a/engine/move_mon.asm
+++ b/engine/move_mon.asm
@@ -1119,7 +1119,7 @@
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 @@
ld d, $0
ld hl, PokedexSeen
ld b, RESET_FLAG
- predef Predef_FlagAction
+ predef Predef_SmallFarFlagAction
.skip_seen_flag
pop af
--- a/engine/mystery_gift.asm
+++ b/engine/mystery_gift.asm
@@ -1117,7 +1117,7 @@
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 @@
ret nz
call GetMysteryGiftBank
ld b, SET_FLAG
- predef Predef_FlagAction
+ predef Predef_SmallFarFlagAction
call CloseSRAM
xor a
ret
@@ -1142,7 +1142,7 @@
ld d, $0
ld b, CHECK_FLAG
ld hl, sMysteryGiftDecorationsReceived
- predef Predef_FlagAction
+ predef Predef_SmallFarFlagAction
ld a, c
and a
pop bc
--- a/engine/npctrade.asm
+++ b/engine/npctrade.asm
@@ -109,7 +109,7 @@
ld hl, wTradeFlags
ld a, [wJumptableIndex]
ld c, a
- predef Predef_FlagAction
+ predef Predef_SmallFarFlagAction
ld a, c
and a
ret
--- a/engine/pokegear.asm
+++ b/engine/pokegear.asm
@@ -2331,7 +2331,7 @@
ld hl, wVisitedSpawns
ld b, CHECK_FLAG
ld d, 0
- predef Predef_FlagAction
+ predef Predef_SmallFarFlagAction
ld a, c
ret
--- a/engine/predef.asm
+++ b/engine/predef.asm
@@ -33,7 +33,7 @@
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
--- 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.
--- a/engine/tmhm.asm
+++ b/engine/tmhm.asm
@@ -23,7 +23,7 @@
ld b, CHECK_FLAG
push de
ld d, 0
- predef Predef_FlagAction
+ predef Predef_SmallFarFlagAction
pop de
ret
--- a/home/pokedex_flags.asm
+++ b/home/pokedex_flags.asm
@@ -31,7 +31,7 @@
PokedexFlagAction:: ; 33a1
ld d, 0
- predef Predef_FlagAction
+ predef Predef_SmallFarFlagAction
ld a, c
and a
ret