ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-28 12:44:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Loafing Around bug fix

Browse Source
This commit is contained in:
DizzyEggg 2020-04-18 13:04:28 +02:00
parent a2813e63de
commit 1395a7d382
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/battle_scripts_1.s
View File

@ -6960,7 +6960,7 @@ BattleScript_IgnoresAndUsesRandomMove::
jumptocalledmove FALSE jumptocalledmove FALSE
BattleScript_MoveUsedLoafingAround:: BattleScript_MoveUsedLoafingAround::
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x0, BattleScript_TruantLoafingAround jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x0, BattleScript_82DB6C7
jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, 0x4, BattleScript_82DB6C7 jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, 0x4, BattleScript_82DB6C7
setbyte gBattleCommunication, 0x0 setbyte gBattleCommunication, 0x0
various24 BS_ATTACKER various24 BS_ATTACKER
@ -6970,7 +6970,7 @@ BattleScript_82DB6C7::
waitmessage 0x40 waitmessage 0x40
moveendto MOVEEND_NEXT_TARGET moveendto MOVEEND_NEXT_TARGET
end end
BattleScript_TruantLoafingAround: BattleScript_TruantLoafingAround::
call BattleScript_AbilityPopUp call BattleScript_AbilityPopUp
goto BattleScript_82DB6C7 goto BattleScript_82DB6C7

1
include/battle_scripts.h
View File

@ -179,6 +179,7 @@ extern const u8 BattleScript_AbilityCuredStatus[];
extern const u8 BattleScript_IgnoresWhileAsleep[]; extern const u8 BattleScript_IgnoresWhileAsleep[];
extern const u8 BattleScript_IgnoresAndUsesRandomMove[]; extern const u8 BattleScript_IgnoresAndUsesRandomMove[];
extern const u8 BattleScript_MoveUsedLoafingAround[]; extern const u8 BattleScript_MoveUsedLoafingAround[];
extern const u8 BattleScript_TruantLoafingAround[];
extern const u8 BattleScript_IgnoresAndFallsAsleep[]; extern const u8 BattleScript_IgnoresAndFallsAsleep[];
extern const u8 BattleScript_IgnoresAndHitsItself[]; extern const u8 BattleScript_IgnoresAndHitsItself[];
extern const u8 BattleScript_SubstituteFade[]; extern const u8 BattleScript_SubstituteFade[];

2
src/battle_util.c
View File

@ -2208,7 +2208,7 @@ u8 AtkCanceller_UnableToUseMove(void)
gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE; gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
gBattleCommunication[MULTISTRING_CHOOSER] = 0; gBattleCommunication[MULTISTRING_CHOOSER] = 0;
gBattlerAbility = gBattlerAttacker; gBattlerAbility = gBattlerAttacker;
gBattlescriptCurrInstr = BattleScript_MoveUsedLoafingAround; gBattlescriptCurrInstr = BattleScript_TruantLoafingAround;
gMoveResultFlags |= MOVE_RESULT_MISSED; gMoveResultFlags |= MOVE_RESULT_MISSED;
effect = 1; effect = 1;
} }

2
src/data/pokemon/base_stats.h
View File

@ -7296,7 +7296,7 @@ const struct BaseStats gBaseStats[] =
.growthRate = GROWTH_SLOW, .growthRate = GROWTH_SLOW,
.eggGroup1 = EGG_GROUP_FLYING, .eggGroup1 = EGG_GROUP_FLYING,
.eggGroup2 = EGG_GROUP_FLYING, .eggGroup2 = EGG_GROUP_FLYING,
.abilities = {ABILITY_SLOW_START, ABILITY_SLOW_START}, .abilities = {ABILITY_KEEN_EYE, ABILITY_STURDY},
.safariZoneFleeRate = 0, .safariZoneFleeRate = 0,
.bodyColor = BODY_COLOR_GRAY, .bodyColor = BODY_COLOR_GRAY,
.noFlip = FALSE, .noFlip = FALSE,