mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2024-09-09 09:51:34 -07:00
Predef_FlagAction -> Predef_SmallFarFlagAction
This commit is contained in:
parent
e9e8bf6eb1
commit
2c789b64b1
@ -92,7 +92,7 @@ AIChooseMove: ; 440ce
|
||||
|
||||
push bc
|
||||
ld d, BANK(TrainerClassAttributes)
|
||||
predef Predef_FlagAction
|
||||
predef Predef_SmallFarFlagAction
|
||||
ld d, c
|
||||
pop bc
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -621,7 +621,7 @@ ShiftMoves: ; 4256e
|
||||
EvoFlagAction: ; 42577
|
||||
push de
|
||||
ld d, $0
|
||||
predef Predef_FlagAction
|
||||
predef Predef_SmallFarFlagAction
|
||||
pop de
|
||||
ret
|
||||
; 42581
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
@ -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.
|
||||
|
@ -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
|
||||
|
||||
|
@ -31,7 +31,7 @@ CheckSeenMon:: ; 339b
|
||||
|
||||
PokedexFlagAction:: ; 33a1
|
||||
ld d, 0
|
||||
predef Predef_FlagAction
|
||||
predef Predef_SmallFarFlagAction
|
||||
ld a, c
|
||||
and a
|
||||
ret
|
||||
|
Loading…
Reference in New Issue
Block a user