diff options
| -rwxr-xr-x | engine/battle/ai/move.asm | 2 | ||||
| -rw-r--r-- | engine/battle/core.asm | 14 | ||||
| -rwxr-xr-x | engine/evolve.asm | 2 | ||||
| -rw-r--r-- | engine/item_effects.asm | 4 | ||||
| -rwxr-xr-x | engine/link.asm | 2 | ||||
| -rwxr-xr-x | engine/move_mon.asm | 4 | ||||
| -rwxr-xr-x | engine/mystery_gift.asm | 6 | ||||
| -rwxr-xr-x | engine/npctrade.asm | 2 | ||||
| -rwxr-xr-x | engine/pokegear.asm | 2 | ||||
| -rw-r--r-- | engine/predef.asm | 2 | ||||
| -rw-r--r-- | engine/routines/flagpredef.asm | 2 | ||||
| -rw-r--r-- | engine/specials.asm | 8 | ||||
| -rwxr-xr-x | engine/tmhm.asm | 2 | ||||
| -rw-r--r-- | home/pokedex_flags.asm | 2 | ||||
| -rwxr-xr-x | mobile/battle_tower_5c.asm | 4 |
15 files changed, 29 insertions, 29 deletions
diff --git a/engine/battle/ai/move.asm b/engine/battle/ai/move.asm index d91ac437d..ead0fd5fa 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_Flag + predef Predef_FlagAction ld d, c pop bc diff --git a/engine/battle/core.asm b/engine/battle/core.asm index b5ca19562..ff415bc75 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_Flag + predef Predef_FlagAction 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_Flag + predef Predef_FlagAction pop bc ld hl, wBattleParticipantsIncludingFainted - predef_jump Predef_Flag + predef_jump Predef_FlagAction ; 3d599 FindPkmnInOTPartyToSwitchIntoBattle: ; 3d599 @@ -4350,7 +4350,7 @@ PursuitSwitch: ; 3dc5b ld c, a ld hl, wBattleParticipantsNotFainted ld b, RESET_FLAG - predef Predef_Flag + predef Predef_FlagAction 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_Flag + predef Predef_FlagAction ld hl, EnemyMonStats ld de, EnemyStats @@ -7313,7 +7313,7 @@ GiveExperiencePoints: ; 3ee3b ld c, a ld b, CHECK_FLAG ld d, $0 - predef Predef_Flag + predef Predef_FlagAction 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_Flag + predef Predef_FlagAction pop af ld [CurPartyLevel], a diff --git a/engine/evolve.asm b/engine/evolve.asm index 4f2576f89..dbe1db5af 100755 --- a/engine/evolve.asm +++ b/engine/evolve.asm @@ -621,7 +621,7 @@ ShiftMoves: ; 4256e EvoFlagAction: ; 42577 push de ld d, $0 - predef Predef_Flag + predef Predef_FlagAction pop de ret ; 42581 diff --git a/engine/item_effects.asm b/engine/item_effects.asm index 67ea58612..7ce84a57a 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_Flag + predef Predef_FlagAction 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_Flag + predef Predef_FlagAction .skip_to_revive xor a diff --git a/engine/link.asm b/engine/link.asm index 66813d776..94e7f2458 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_Flag + predef Predef_FlagAction call CloseSRAM ld a, c and a diff --git a/engine/move_mon.asm b/engine/move_mon.asm index 9128eabdd..658d57611 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_Flag + predef Predef_FlagAction .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_Flag + predef Predef_FlagAction .skip_seen_flag pop af diff --git a/engine/mystery_gift.asm b/engine/mystery_gift.asm index 6eafa2cca..27ffd97b0 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_Flag + predef_id Predef_FlagAction 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_Flag + predef Predef_FlagAction 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_Flag + predef Predef_FlagAction ld a, c and a pop bc diff --git a/engine/npctrade.asm b/engine/npctrade.asm index c1726ed04..25d47e6be 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_Flag + predef Predef_FlagAction ld a, c and a ret diff --git a/engine/pokegear.asm b/engine/pokegear.asm index 0c9a991ac..18f86c1b6 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_Flag + predef Predef_FlagAction ld a, c ret diff --git a/engine/predef.asm b/engine/predef.asm index a8eccfd21..749084288 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_Flag + add_predef Predef_FlagAction 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 8074e9dbe..5b19950a1 100644 --- a/engine/routines/flagpredef.asm +++ b/engine/routines/flagpredef.asm @@ -1,4 +1,4 @@ -Predef_Flag: ; 4d7c1 +Predef_FlagAction: ; 4d7c1 ; Perform action b on flag c in flag array hl. ; If checking a flag, check flag array d:hl unless d is 0. diff --git a/engine/specials.asm b/engine/specials.asm index 5b4fd45ae..07709f0b2 100644 --- a/engine/specials.asm +++ b/engine/specials.asm @@ -142,7 +142,7 @@ SpecialsPointers:: ; c029 add_special Special_Function170114 add_special Special_BattleTowerBattle add_special UnusedSpecial_Function1704e1 - add_special DummySpecial17021d + add_special DummySpecial_17021d add_special Special_LoadOpponentTrainerAndPokemonWithOTSprite add_special Special_Function11ba38 add_special Special_CheckForBattleTowerRules @@ -174,7 +174,7 @@ SpecialsPointers:: ; c029 add_special Special_BeastsCheck add_special Special_MonCheck add_special Special_SetPlayerPalette - add_special DummySpecial170bd2 + add_special DummySpecial_170bd2 add_special Special_Mobile_SelectThreeMons add_special Special_Function1037eb add_special Special_Function10383c @@ -189,10 +189,10 @@ SpecialsPointers:: ; c029 add_special UnusedSpecial_FindItemInPCOrBag add_special Special_InitialSetDSTFlag add_special Special_InitialClearDSTFlag - add_special DummySpecialc224 + add_special DummySpecial_c224 ; c224 -DummySpecialc224: ; c224 +DummySpecial_c224: ; c224 ret ; c225 diff --git a/engine/tmhm.asm b/engine/tmhm.asm index d149e02d6..1b4456c88 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_Flag + predef Predef_FlagAction pop de ret diff --git a/home/pokedex_flags.asm b/home/pokedex_flags.asm index f4f1ac312..420c253ea 100644 --- a/home/pokedex_flags.asm +++ b/home/pokedex_flags.asm @@ -31,7 +31,7 @@ CheckSeenMon:: ; 339b PokedexFlagAction:: ; 33a1 ld d, 0 - predef Predef_Flag + predef Predef_FlagAction ld a, c and a ret diff --git a/mobile/battle_tower_5c.asm b/mobile/battle_tower_5c.asm index 745e98616..5646e196b 100755 --- a/mobile/battle_tower_5c.asm +++ b/mobile/battle_tower_5c.asm @@ -189,7 +189,7 @@ Special_BattleTowerBattle: ; 170215 ret ; 17021d -DummySpecial17021d: ; 17021d +DummySpecial_17021d: ; 17021d ret ; 17021e @@ -1751,7 +1751,7 @@ Special_LoadOpponentTrainerAndPokemonWithOTSprite: ; 0x170b44 db SPRITE_OFFICER db SPRITE_ROCKET_GIRL -DummySpecial170bd2: ; 170bd2 +DummySpecial_170bd2: ; 170bd2 ret ; 170bd3 |