diff options
| author | xCrystal <rgr.crystal@gmail.com> | 2018-01-07 11:53:20 +0100 |
|---|---|---|
| committer | xCrystal <rgr.crystal@gmail.com> | 2018-01-07 11:53:20 +0100 |
| commit | 2c789b64b1bfa9ec33d805d06ad3a7141e3871f1 (patch) | |
| tree | 21ff2114ad57e9c8260beaa65b27192e73c81517 /engine/battle/core.asm | |
| parent | e9e8bf6eb14020d4a88a7cd4bca8539a2b45803e (diff) | |
Predef_FlagAction -> Predef_SmallFarFlagAction
Diffstat (limited to 'engine/battle/core.asm')
| -rw-r--r-- | engine/battle/core.asm | 14 |
1 files changed, 7 insertions, 7 deletions
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 |