pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-01-23 09:16:20 -08:00
Code Issues Packages Projects Releases Wiki Activity

Predef_Flag -> Predef_FlagAction

Browse Source
This commit is contained in:
xCrystal 2018-01-05 11:05:01 +01:00
parent d68f961793
commit e9e8bf6eb1
15 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/battle/ai/move.asm
View File

@ -92,7 +92,7 @@ AIChooseMove: ; 440ce
push bc push bc
ld d, BANK(TrainerClassAttributes) ld d, BANK(TrainerClassAttributes)
predef Predef_Flag predef Predef_FlagAction
ld d, c ld d, c
pop bc pop bc

14
engine/battle/core.asm
View File

@ -2760,7 +2760,7 @@ PlayerMonFaintHappinessMod: ; 3d1aa
ld c, a ld c, a
ld hl, wBattleParticipantsNotFainted ld hl, wBattleParticipantsNotFainted
ld b, RESET_FLAG ld b, RESET_FLAG
predef Predef_Flag predef Predef_FlagAction
ld hl, EnemySubStatus3 ld hl, EnemySubStatus3
res SUBSTATUS_IN_LOOP, [hl] res SUBSTATUS_IN_LOOP, [hl]
xor a xor a
@ -3357,10 +3357,10 @@ AddBattleParticipant: ; 3d581
ld hl, wBattleParticipantsNotFainted ld hl, wBattleParticipantsNotFainted
ld b, SET_FLAG ld b, SET_FLAG
push bc push bc
predef Predef_Flag predef Predef_FlagAction
pop bc pop bc
ld hl, wBattleParticipantsIncludingFainted ld hl, wBattleParticipantsIncludingFainted
predef_jump Predef_Flag predef_jump Predef_FlagAction
; 3d599 ; 3d599
FindPkmnInOTPartyToSwitchIntoBattle: ; 3d599 FindPkmnInOTPartyToSwitchIntoBattle: ; 3d599
@ -4350,7 +4350,7 @@ PursuitSwitch: ; 3dc5b
ld c, a ld c, a
ld hl, wBattleParticipantsNotFainted ld hl, wBattleParticipantsNotFainted
ld b, RESET_FLAG ld b, RESET_FLAG
predef Predef_Flag predef Predef_FlagAction
call PlayerMonFaintedAnimation call PlayerMonFaintedAnimation
ld hl, BattleText_PkmnFainted ld hl, BattleText_PkmnFainted
jr .done_fainted jr .done_fainted
@ -6631,7 +6631,7 @@ LoadEnemyMon: ; 3e8eb
ld c, a ld c, a
ld b, SET_FLAG ld b, SET_FLAG
ld hl, PokedexSeen ld hl, PokedexSeen
predef Predef_Flag predef Predef_FlagAction
ld hl, EnemyMonStats ld hl, EnemyMonStats
ld de, EnemyStats ld de, EnemyStats
@ -7313,7 +7313,7 @@ GiveExperiencePoints: ; 3ee3b
ld c, a ld c, a
ld b, CHECK_FLAG ld b, CHECK_FLAG
ld d, $0 ld d, $0
predef Predef_Flag predef Predef_FlagAction
ld a, c ld a, c
and a and a
pop bc pop bc
@ -7642,7 +7642,7 @@ GiveExperiencePoints: ; 3ee3b
ld a, [CurPartyMon] ld a, [CurPartyMon]
ld c, a ld c, a
ld b, SET_FLAG ld b, SET_FLAG
predef Predef_Flag predef Predef_FlagAction
pop af pop af
ld [CurPartyLevel], a ld [CurPartyLevel], a

2
engine/evolve.asm
View File

@ -621,7 +621,7 @@ ShiftMoves: ; 4256e
EvoFlagAction: ; 42577 EvoFlagAction: ; 42577
push de push de
ld d, $0 ld d, $0
predef Predef_Flag predef Predef_FlagAction
pop de pop de
ret ret
; 42581 ; 42581

4
engine/item_effects.asm
View File

@ -1668,7 +1668,7 @@ RevivePokemon: ; f0d6
ld d, 0 ld d, 0
ld hl, wBattleParticipantsIncludingFainted ld hl, wBattleParticipantsIncludingFainted
ld b, CHECK_FLAG ld b, CHECK_FLAG
predef Predef_Flag predef Predef_FlagAction
ld a, c ld a, c
and a and a
jr z, .skip_to_revive jr z, .skip_to_revive
@ -1677,7 +1677,7 @@ RevivePokemon: ; f0d6
ld c, a ld c, a
ld hl, wBattleParticipantsNotFainted ld hl, wBattleParticipantsNotFainted
ld b, SET_FLAG ld b, SET_FLAG
predef Predef_Flag predef Predef_FlagAction
.skip_to_revive .skip_to_revive
xor a xor a

2
engine/link.asm
View File

@ -2584,7 +2584,7 @@ Unreferenced_Function29fe4:
call GetSRAMBank call GetSRAMBank
ld d, $0 ld d, $0
ld b, CHECK_FLAG ld b, CHECK_FLAG
predef Predef_Flag predef Predef_FlagAction
call CloseSRAM call CloseSRAM
ld a, c ld a, c
and a and a

4
engine/move_mon.asm
View File

@ -1119,7 +1119,7 @@ Predef_GiveEgg:: ; df8c
ld d, $0 ld d, $0
ld hl, PokedexCaught ld hl, PokedexCaught
ld b, RESET_FLAG ld b, RESET_FLAG
predef Predef_Flag predef Predef_FlagAction
.skip_caught_flag .skip_caught_flag
; If we haven't seen this Pokemon before receiving ; If we haven't seen this Pokemon before receiving
@ -1135,7 +1135,7 @@ Predef_GiveEgg:: ; df8c
ld d, $0 ld d, $0
ld hl, PokedexSeen ld hl, PokedexSeen
ld b, RESET_FLAG ld b, RESET_FLAG
predef Predef_Flag predef Predef_FlagAction
.skip_seen_flag .skip_seen_flag
pop af pop af

6
engine/mystery_gift.asm
View File

@ -1117,7 +1117,7 @@ MysteryGift_CheckAndSetDecorationAlreadyReceived: ; 105069 (41:5069)
ld d, $0 ld d, $0
ld b, CHECK_FLAG ld b, CHECK_FLAG
ld hl, sMysteryGiftDecorationsReceived ld hl, sMysteryGiftDecorationsReceived
predef_id Predef_Flag predef_id Predef_FlagAction
push hl push hl
push bc push bc
call Predef call Predef
@ -1129,7 +1129,7 @@ MysteryGift_CheckAndSetDecorationAlreadyReceived: ; 105069 (41:5069)
ret nz ret nz
call GetMysteryGiftBank call GetMysteryGiftBank
ld b, SET_FLAG ld b, SET_FLAG
predef Predef_Flag predef Predef_FlagAction
call CloseSRAM call CloseSRAM
xor a xor a
ret ret
@ -1142,7 +1142,7 @@ MysteryGift_CopyReceivedDecosToPC: ; 105091 (41:5091)
ld d, $0 ld d, $0
ld b, CHECK_FLAG ld b, CHECK_FLAG
ld hl, sMysteryGiftDecorationsReceived ld hl, sMysteryGiftDecorationsReceived
predef Predef_Flag predef Predef_FlagAction
ld a, c ld a, c
and a and a
pop bc pop bc

2
engine/npctrade.asm
View File

@ -109,7 +109,7 @@ TradeFlagAction: ; fcc4a
ld hl, wTradeFlags ld hl, wTradeFlags
ld a, [wJumptableIndex] ld a, [wJumptableIndex]
ld c, a ld c, a
predef Predef_Flag predef Predef_FlagAction
ld a, c ld a, c
and a and a
ret ret

2
engine/pokegear.asm
View File

@ -2331,7 +2331,7 @@ HasVisitedSpawn: ; 91c50
ld hl, wVisitedSpawns ld hl, wVisitedSpawns
ld b, CHECK_FLAG ld b, CHECK_FLAG
ld d, 0 ld d, 0
predef Predef_Flag predef Predef_FlagAction
ld a, c ld a, c
ret ret

2
engine/predef.asm
View File

@ -33,7 +33,7 @@ PredefPointers:: ; 856b
add_predef Predef_LearnMove ; $0 add_predef Predef_LearnMove ; $0
add_predef DummyPredef1 add_predef DummyPredef1
add_predef HealParty ; this is both a special and a predef add_predef HealParty ; this is both a special and a predef
add_predef Predef_Flag add_predef Predef_FlagAction
add_predef Predef_ComputeHPBarPixels add_predef Predef_ComputeHPBarPixels
add_predef Predef_FillPP add_predef Predef_FillPP
add_predef Predef_TryAddMonToParty add_predef Predef_TryAddMonToParty

2
engine/routines/flagpredef.asm
View File

@ -1,4 +1,4 @@
Predef_Flag: ; 4d7c1 Predef_FlagAction: ; 4d7c1
; Perform action b on flag c in flag array hl. ; Perform action b on flag c in flag array hl.
; If checking a flag, check flag array d:hl unless d is 0. ; If checking a flag, check flag array d:hl unless d is 0.

8
engine/specials.asm
View File

@ -142,7 +142,7 @@ SpecialsPointers:: ; c029
add_special Special_Function170114 add_special Special_Function170114
add_special Special_BattleTowerBattle add_special Special_BattleTowerBattle
add_special UnusedSpecial_Function1704e1 add_special UnusedSpecial_Function1704e1
add_special DummySpecial17021d add_special DummySpecial_17021d
add_special Special_LoadOpponentTrainerAndPokemonWithOTSprite add_special Special_LoadOpponentTrainerAndPokemonWithOTSprite
add_special Special_Function11ba38 add_special Special_Function11ba38
add_special Special_CheckForBattleTowerRules add_special Special_CheckForBattleTowerRules
@ -174,7 +174,7 @@ SpecialsPointers:: ; c029
add_special Special_BeastsCheck add_special Special_BeastsCheck
add_special Special_MonCheck add_special Special_MonCheck
add_special Special_SetPlayerPalette add_special Special_SetPlayerPalette
add_special DummySpecial170bd2 add_special DummySpecial_170bd2
add_special Special_Mobile_SelectThreeMons add_special Special_Mobile_SelectThreeMons
add_special Special_Function1037eb add_special Special_Function1037eb
add_special Special_Function10383c add_special Special_Function10383c
@ -189,10 +189,10 @@ SpecialsPointers:: ; c029
add_special UnusedSpecial_FindItemInPCOrBag add_special UnusedSpecial_FindItemInPCOrBag
add_special Special_InitialSetDSTFlag add_special Special_InitialSetDSTFlag
add_special Special_InitialClearDSTFlag add_special Special_InitialClearDSTFlag
add_special DummySpecialc224 add_special DummySpecial_c224
; c224 ; c224
DummySpecialc224: ; c224 DummySpecial_c224: ; c224
ret ret
; c225 ; c225

2
engine/tmhm.asm
View File

@ -23,7 +23,7 @@ Predef_CanLearnTMHMMove: ; 11639
ld b, CHECK_FLAG ld b, CHECK_FLAG
push de push de
ld d, 0 ld d, 0
predef Predef_Flag predef Predef_FlagAction
pop de pop de
ret ret

2
home/pokedex_flags.asm
View File

@ -31,7 +31,7 @@ CheckSeenMon:: ; 339b
PokedexFlagAction:: ; 33a1 PokedexFlagAction:: ; 33a1
ld d, 0 ld d, 0
predef Predef_Flag predef Predef_FlagAction
ld a, c ld a, c
and a and a
ret ret

4
mobile/battle_tower_5c.asm
View File

@ -189,7 +189,7 @@ Special_BattleTowerBattle: ; 170215
ret ret
; 17021d ; 17021d
DummySpecial17021d: ; 17021d DummySpecial_17021d: ; 17021d
ret ret
; 17021e ; 17021e
@ -1751,7 +1751,7 @@ Special_LoadOpponentTrainerAndPokemonWithOTSprite: ; 0x170b44
db SPRITE_OFFICER db SPRITE_OFFICER
db SPRITE_ROCKET_GIRL db SPRITE_ROCKET_GIRL
DummySpecial170bd2: ; 170bd2 DummySpecial_170bd2: ; 170bd2
ret ret
; 170bd3 ; 170bd3