mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2024-12-26 19:54:21 +01:00
more battle 4
This commit is contained in:
DizzyEggg
parent
b3c788f2ca
commit
b4875d82d5
@ -6492,7 +6492,7 @@ _0803A0AE:
|
||||
lsrs r0, 31
|
||||
movs r1, 0
|
||||
strb r0, [r3, 0x1D]
|
||||
ldr r0, =gUnknown_02024212
|
||||
ldr r0, =gMultiHitCounter
|
||||
strb r1, [r0]
|
||||
ldr r0, =gBattleOutcome
|
||||
strb r1, [r0]
|
||||
@ -13676,7 +13676,7 @@ _0803E110:
|
||||
strb r2, [r0]
|
||||
ldr r0, =gBattleMoveFlags
|
||||
strb r2, [r0]
|
||||
ldr r0, =gUnknown_02024212
|
||||
ldr r0, =gMultiHitCounter
|
||||
strb r2, [r0]
|
||||
ldr r0, =gBattleCommunication
|
||||
strb r2, [r0, 0x6]
|
||||
@ -15619,8 +15619,8 @@ bsC_8016D70: @ 803F300
|
||||
.pool
|
||||
thumb_func_end bsC_8016D70
|
||||
|
||||
thumb_func_start get_battle_side_of_something
|
||||
get_battle_side_of_something: @ 803F3CC
|
||||
thumb_func_start GetBattleBank
|
||||
GetBattleBank: @ 803F3CC
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r1, r0, 24
|
||||
@ -15696,7 +15696,7 @@ _0803F472:
|
||||
_0803F47A:
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end get_battle_side_of_something
|
||||
thumb_func_end GetBattleBank
|
||||
|
||||
thumb_func_start PressurePPLose
|
||||
PressurePPLose: @ 803F480
|
||||
|
||||
2530
asm/battle_4.s
2530
asm/battle_4.s
File diff suppressed because it is too large
Load Diff
@ -114,7 +114,7 @@ _08062CBA:
|
||||
ldrh r1, [r4]
|
||||
mov r3, r9
|
||||
ldrb r2, [r3]
|
||||
bl ai_rate_move
|
||||
bl AI_TypeCalc
|
||||
lsls r0, 24
|
||||
lsrs r1, r0, 24
|
||||
movs r0, 0x2
|
||||
@ -246,7 +246,7 @@ _08062DE0:
|
||||
beq _08062E1E
|
||||
ldrh r1, [r5]
|
||||
ldrb r2, [r7]
|
||||
bl ai_rate_move
|
||||
bl AI_TypeCalc
|
||||
lsls r0, 24
|
||||
lsrs r1, r0, 24
|
||||
movs r0, 0x2
|
||||
@ -741,7 +741,7 @@ _0806320A:
|
||||
ldrh r1, [r5]
|
||||
mov r3, r8
|
||||
ldrb r2, [r3]
|
||||
bl ai_rate_move
|
||||
bl AI_TypeCalc
|
||||
lsls r0, 24
|
||||
lsrs r1, r0, 24
|
||||
movs r0, 0x2
|
||||
@ -815,7 +815,7 @@ _080632AE:
|
||||
ldrh r1, [r5]
|
||||
mov r3, r8
|
||||
ldrb r2, [r3]
|
||||
bl ai_rate_move
|
||||
bl AI_TypeCalc
|
||||
lsls r0, 24
|
||||
lsrs r1, r0, 24
|
||||
movs r0, 0x2
|
||||
@ -1126,7 +1126,7 @@ _08063564:
|
||||
adds r0, r1
|
||||
ldrh r0, [r0]
|
||||
adds r1, r4, 0
|
||||
bl ai_rate_move
|
||||
bl AI_TypeCalc
|
||||
ldr r1, [sp]
|
||||
ands r1, r0
|
||||
cmp r1, 0
|
||||
@ -1161,7 +1161,7 @@ _080635A2:
|
||||
beq _080635DE
|
||||
ldrh r1, [r5]
|
||||
ldrb r2, [r7]
|
||||
bl ai_rate_move
|
||||
bl AI_TypeCalc
|
||||
lsls r0, 24
|
||||
lsrs r1, r0, 24
|
||||
movs r0, 0x2
|
||||
@ -1688,7 +1688,7 @@ sub_8063A08: @ 8063A08
|
||||
lsrs r2, 24
|
||||
mov r8, r2
|
||||
movs r7, 0
|
||||
ldr r0, =gUnknown_0831ACE8
|
||||
ldr r0, =gTypeEffectiveness
|
||||
mov r10, r0
|
||||
ldrb r0, [r0]
|
||||
cmp r0, 0xFF
|
||||
|
||||
@ -2599,10 +2599,10 @@ _0818FFFC:
|
||||
b _081900A4
|
||||
.pool
|
||||
_0819002C:
|
||||
ldr r0, =gUnknown_0831ACE8
|
||||
ldr r0, =gTypeEffectiveness
|
||||
adds r1, r6, r0
|
||||
ldrb r0, [r1]
|
||||
ldr r7, =gUnknown_0831ACE8
|
||||
ldr r7, =gTypeEffectiveness
|
||||
cmp r0, 0xFF
|
||||
beq _081900A4
|
||||
adds r4, r1, 0
|
||||
@ -2657,7 +2657,7 @@ _08190088:
|
||||
_08190096:
|
||||
adds r4, 0x3
|
||||
adds r6, 0x3
|
||||
ldr r1, =gUnknown_0831ACE8
|
||||
ldr r1, =gTypeEffectiveness
|
||||
adds r0, r6, r1
|
||||
ldrb r0, [r0]
|
||||
cmp r0, 0xFF
|
||||
@ -10109,7 +10109,7 @@ _08194074:
|
||||
lsls r0, r4, 1
|
||||
add r0, r10
|
||||
ldrh r0, [r0]
|
||||
bl ai_rate_move
|
||||
bl AI_TypeCalc
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
movs r0, 0x6
|
||||
|
||||
12
asm/rom3.s
12
asm/rom3.s
@ -2465,8 +2465,8 @@ _08033AF2:
|
||||
.pool
|
||||
thumb_func_end sub_8033AC4
|
||||
|
||||
thumb_func_start dp01_build_cmdbuf_x0F_aa_b_cc_dddd_e_mlc_weather_00_x1Cbytes
|
||||
dp01_build_cmdbuf_x0F_aa_b_cc_dddd_e_mlc_weather_00_x1Cbytes: @ 8033B0C
|
||||
thumb_func_start EmitMoveAnimation
|
||||
EmitMoveAnimation: @ 8033B0C
|
||||
push {r4-r7,lr}
|
||||
mov r7, r9
|
||||
mov r6, r8
|
||||
@ -2568,7 +2568,7 @@ _08033BB6:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end dp01_build_cmdbuf_x0F_aa_b_cc_dddd_e_mlc_weather_00_x1Cbytes
|
||||
thumb_func_end EmitMoveAnimation
|
||||
|
||||
thumb_func_start dp01_build_cmdbuf_x10_TODO
|
||||
dp01_build_cmdbuf_x10_TODO: @ 8033BE4
|
||||
@ -2938,8 +2938,8 @@ dp01_build_cmdbuf_x17_17_17_17: @ 8033EDC
|
||||
.pool
|
||||
thumb_func_end dp01_build_cmdbuf_x17_17_17_17
|
||||
|
||||
thumb_func_start dp01_build_cmdbuf_x18_0_aa_health_bar_update
|
||||
dp01_build_cmdbuf_x18_0_aa_health_bar_update: @ 8033EFC
|
||||
thumb_func_start EmitHealthBarUpdate
|
||||
EmitHealthBarUpdate: @ 8033EFC
|
||||
push {r4,lr}
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
@ -2965,7 +2965,7 @@ dp01_build_cmdbuf_x18_0_aa_health_bar_update: @ 8033EFC
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end dp01_build_cmdbuf_x18_0_aa_health_bar_update
|
||||
thumb_func_end EmitHealthBarUpdate
|
||||
|
||||
thumb_func_start dp01_build_cmdbuf_x19_a_bb
|
||||
dp01_build_cmdbuf_x19_a_bb: @ 8033F34
|
||||
|
||||
@ -90,7 +90,7 @@ gUnknown_082DAB11:: @ 82DAB11
|
||||
gUnknown_082DAB15:: @ 82DAB15
|
||||
.incbin "baserom.gba", 0x2dab15, 0xa4
|
||||
|
||||
gUnknown_082DABB9:: @ 82DABB9
|
||||
BattleScript_Pausex20:: @ 82DABB9
|
||||
.incbin "baserom.gba", 0x2dabb9, 0x4
|
||||
|
||||
gUnknown_082DABBD:: @ 82DABBD
|
||||
|
||||
@ -202,7 +202,7 @@ gUnknown_0831ACA0:: @ 831ACA0
|
||||
gUnknown_0831ACE0:: @ 831ACE0
|
||||
.incbin "baserom.gba", 0x31ace0, 0x8
|
||||
|
||||
gUnknown_0831ACE8:: @ 831ACE8
|
||||
gTypeEffectiveness:: @ 831ACE8
|
||||
.incbin "baserom.gba", 0x31ace8, 0x150
|
||||
|
||||
@ 831AE38
|
||||
|
||||
@ -213,6 +213,19 @@
|
||||
#define MOVE_TARGET_FOES_AND_ALLY 0x20
|
||||
#define MOVE_TARGET_OPPONENTS_FIELD 0x40
|
||||
|
||||
#define TYPE_MUL_NO_EFFECT 0
|
||||
#define TYPE_MUL_NOT_EFFECTIVE 5
|
||||
#define TYPE_MUL_NORMAL 10
|
||||
#define TYPE_MUL_SUPER_EFFECTIVE 20
|
||||
|
||||
#define BS_GET_TARGET 0
|
||||
#define BS_GET_ATTACKER 1
|
||||
#define BS_GET_EFFECT_BANK 2
|
||||
#define BS_GET_SCRIPTING_BANK 10
|
||||
#define BS_GET_OPPONENT1 12
|
||||
#define BS_GET_PLAYER2 13
|
||||
#define BS_GET_OPPONENT2 14
|
||||
|
||||
struct Trainer
|
||||
{
|
||||
/*0x00*/ u8 partyFlags;
|
||||
@ -640,14 +653,16 @@ extern struct BattleStruct* gBattleStruct;
|
||||
var2[offsetof(struct structName, offsetField)] = value; \
|
||||
}
|
||||
|
||||
#define GET_MOVE_TYPE(move, type) \
|
||||
#define GET_MOVE_TYPE(move, typeArg) \
|
||||
{ \
|
||||
if (gBattleStruct->dynamicMoveType) \
|
||||
type = gBattleStruct->dynamicMoveType & 0x3F; \
|
||||
typeArg = gBattleStruct->dynamicMoveType & 0x3F; \
|
||||
else \
|
||||
type = gBattleMoves[move].type; \
|
||||
typeArg = gBattleMoves[move].type; \
|
||||
}
|
||||
|
||||
#define GET_BANK_SIDE(bank)((GetBankIdentity(bank) & 1))
|
||||
|
||||
struct BattleScripting
|
||||
{
|
||||
u8 field_0;
|
||||
@ -671,8 +686,8 @@ struct BattleScripting
|
||||
u8 field_15;
|
||||
u8 field_16;
|
||||
u8 bank;
|
||||
u8 field_18;
|
||||
u8 field_19;
|
||||
u8 animTurn;
|
||||
u8 animTargetsHit;
|
||||
u8 statChanger;
|
||||
};
|
||||
|
||||
@ -684,6 +699,7 @@ extern struct BattleScripting gBattleScripting;
|
||||
void CancelMultiTurnMoves(u8 bank);
|
||||
void PressurePPLose(u8 bankAtk, u8 bankDef, u16 move);
|
||||
void PrepareStringBattle(u16 stringId, u8 bank);
|
||||
u8 GetBattleBank(u8 caseId);
|
||||
|
||||
// battle_3
|
||||
void b_movescr_stack_push(const u8* bsPtr);
|
||||
@ -709,6 +725,11 @@ void sub_80458B4(void);
|
||||
u8 GetMoveTarget(u16 move, u8 useMoveTarget);
|
||||
u8 IsPokeDisobedient(void);
|
||||
|
||||
// battle_4
|
||||
void AI_CalcDmg(u8 bankAtk, u8 bankDef);
|
||||
u8 TypeCalc(u16 move, u8 bankAtk, u8 bankDef);
|
||||
u8 AI_TypeCalc(u16 move, u16 species, u8 ability);
|
||||
|
||||
// rom_80A5C6C
|
||||
u8 GetBankSide(u8 bank);
|
||||
u8 GetBankIdentity(u8 bank);
|
||||
|
||||
11
include/battle_controllers.h
Normal file
11
include/battle_controllers.h
Normal file
@ -0,0 +1,11 @@
|
||||
#ifndef GUARD_BATTLE_CONTROLLERS_H
|
||||
#define GUARD_BATTLE_CONTROLLERS_H
|
||||
|
||||
// rom3.s, emitters
|
||||
void EmitSetAttributes(u8 bufferId, u8 request, u8 c, u8 bytes, void *data);
|
||||
void EmitMoveAnimation(u8 bufferId, u16 move, u8 turnOfMove, u16 movePower, s32 dmg, u8 friendship, struct DisableStruct* disableStructPtr, u8 multihit);
|
||||
void EmitHealthBarUpdate(u8 bufferId, u16 hpValue);
|
||||
|
||||
void MarkBufferBankForExecution(u8 bank);
|
||||
|
||||
#endif // GUARD_BATTLE_CONTROLLERS_H
|
||||
@ -14,6 +14,7 @@
|
||||
#include "string_util.h"
|
||||
#include "battle_message.h"
|
||||
#include "battle_ai.h"
|
||||
#include "battle_controllers.h"
|
||||
#include "event_data.h"
|
||||
#include "calculate_base_damage.h"
|
||||
|
||||
@ -183,10 +184,8 @@ extern u8 b_first_side(u8, u8, u8);
|
||||
extern void sub_803CEDC(u8, u8);
|
||||
extern void b_call_bc_move_exec(const u8 *);
|
||||
extern void BattleTurnPassed(void);
|
||||
extern void EmitSetAttributes(u8 a, u8 request, u8 c, u8 bytes, void *data);
|
||||
extern void SetMoveEffect(bool8 primary, u8 certainArg);
|
||||
extern bool8 UproarWakeUpCheck(u8 bank);
|
||||
extern void MarkBufferBankForExecution(u8 bank);
|
||||
extern u8 sub_803F90C(u8 bank);
|
||||
extern void sub_803F9EC();
|
||||
extern bool8 sub_80423F4(u8 bank, u8, u8);
|
||||
|
||||
644
src/battle_4.c
644
src/battle_4.c
@ -12,6 +12,8 @@
|
||||
#include "pokemon.h"
|
||||
#include "calculate_base_damage.h"
|
||||
#include "rng.h"
|
||||
#include "battle_controllers.h"
|
||||
#include "species.h"
|
||||
|
||||
// variables
|
||||
|
||||
@ -135,7 +137,7 @@ extern const u8 BattleScript_ShakeBallThrow[];
|
||||
bool8 IsTwoTurnsMove(u16 move);
|
||||
void DestinyBondFlagUpdate(void);
|
||||
u8 AttacksThisTurn(u8 bank, u16 move); // Note: returns 1 if it's a charging turn, otherwise 2.
|
||||
void b_wonderguard_and_levitate(void);
|
||||
static void CheckWonderGuardAndLevitate(void);
|
||||
|
||||
void atk00_attackcanceler(void);
|
||||
void atk01_accuracycheck(void);
|
||||
@ -1000,7 +1002,7 @@ void atk01_accuracycheck(void)
|
||||
else
|
||||
gBattleCommunication[6] = 0;
|
||||
|
||||
b_wonderguard_and_levitate();
|
||||
CheckWonderGuardAndLevitate();
|
||||
}
|
||||
JumpIfMoveFailed(7, move);
|
||||
}
|
||||
@ -1018,3 +1020,641 @@ void atk02_attackstring(void)
|
||||
gBattlescriptCurrInstr++;
|
||||
gBattleCommunication[MSG_DISPLAY] = 0;
|
||||
}
|
||||
|
||||
void atk03_ppreduce(void)
|
||||
{
|
||||
s32 to_deduct = 1;
|
||||
|
||||
if (gBattleExecBuffer)
|
||||
return;
|
||||
|
||||
if (!gSpecialStatuses[gBankAttacker].flag20)
|
||||
{
|
||||
switch (gBattleMoves[gCurrentMove].target)
|
||||
{
|
||||
case MOVE_TARGET_FOES_AND_ALLY:
|
||||
to_deduct += AbilityBattleEffects(ABILITYEFFECT_COUNT_ON_FIELD, gBankAttacker, ABILITY_PRESSURE, 0, 0);
|
||||
break;
|
||||
case MOVE_TARGET_BOTH:
|
||||
case MOVE_TARGET_OPPONENTS_FIELD:
|
||||
to_deduct += AbilityBattleEffects(ABILITYEFFECT_COUNT_OTHER_SIZE, gBankAttacker, ABILITY_PRESSURE, 0, 0);
|
||||
break;
|
||||
default:
|
||||
if (gBankAttacker != gBankTarget && gBattleMons[gBankTarget].ability == ABILITY_PRESSURE)
|
||||
to_deduct++;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (!(gHitMarker & (HITMARKER_NO_PPDEDUCT | HITMARKER_NO_ATTACKSTRING)) && gBattleMons[gBankAttacker].pp[gCurrMovePos])
|
||||
{
|
||||
gProtectStructs[gBankAttacker].notFirstStrike = 1;
|
||||
|
||||
if (gBattleMons[gBankAttacker].pp[gCurrMovePos] > to_deduct)
|
||||
gBattleMons[gBankAttacker].pp[gCurrMovePos] -= to_deduct;
|
||||
else
|
||||
gBattleMons[gBankAttacker].pp[gCurrMovePos] = 0;
|
||||
|
||||
if (!(gBattleMons[gBankAttacker].status2 & STATUS2_TRANSFORMED)
|
||||
&& !((gDisableStructs[gBankAttacker].unk18_b) & gBitTable[gCurrMovePos]))
|
||||
{
|
||||
gActiveBank = gBankAttacker;
|
||||
EmitSetAttributes(0, REQUEST_PPMOVE1_BATTLE + gCurrMovePos, 0, 1, &gBattleMons[gBankAttacker].pp[gCurrMovePos]);
|
||||
MarkBufferBankForExecution(gBankAttacker);
|
||||
}
|
||||
}
|
||||
|
||||
gHitMarker &= ~(HITMARKER_NO_PPDEDUCT);
|
||||
gBattlescriptCurrInstr++;
|
||||
}
|
||||
|
||||
void atk04_critcalc(void)
|
||||
{
|
||||
u8 holdEffect;
|
||||
u16 item, critChance;
|
||||
|
||||
item = gBattleMons[gBankAttacker].item;
|
||||
|
||||
if (item == ITEM_ENIGMA_BERRY)
|
||||
holdEffect = gEnigmaBerries[gBankAttacker].holdEffect;
|
||||
else
|
||||
holdEffect = ItemId_GetHoldEffect(item);
|
||||
|
||||
gStringBank = gBankAttacker;
|
||||
|
||||
critChance = 2 * ((gBattleMons[gBankAttacker].status2 & STATUS2_FOCUS_ENERGY) != 0)
|
||||
+ (gBattleMoves[gCurrentMove].effect == EFFECT_HIGH_CRITICAL)
|
||||
+ (gBattleMoves[gCurrentMove].effect == EFFECT_SKY_ATTACK)
|
||||
+ (gBattleMoves[gCurrentMove].effect == EFFECT_BLAZE_KICK)
|
||||
+ (gBattleMoves[gCurrentMove].effect == EFFECT_POISON_TAIL)
|
||||
+ (holdEffect == HOLD_EFFECT_SCOPE_LENS)
|
||||
+ 2 * (holdEffect == HOLD_EFFECT_LUCKY_PUNCH && gBattleMons[gBankAttacker].species == SPECIES_CHANSEY)
|
||||
+ 2 * (holdEffect == HOLD_EFFECT_STICK && gBattleMons[gBankAttacker].species == SPECIES_FARFETCHD);
|
||||
|
||||
if (critChance > 4)
|
||||
critChance = 4;
|
||||
|
||||
if ((gBattleMons[gBankTarget].ability != ABILITY_BATTLE_ARMOR && gBattleMons[gBankTarget].ability != ABILITY_SHELL_ARMOR)
|
||||
&& !(gStatuses3[gBankAttacker] & STATUS3_CANT_SCORE_A_CRIT)
|
||||
&& !(gBattleTypeFlags & (BATTLE_TYPE_WALLY_TUTORIAL | BATTLE_TYPE_FIRST_BATTLE))
|
||||
&& !(Random() % gCriticalHitChance[critChance]))
|
||||
gCritMultiplier = 2;
|
||||
else
|
||||
gCritMultiplier = 1;
|
||||
|
||||
gBattlescriptCurrInstr++;
|
||||
}
|
||||
|
||||
void atk05_damagecalc1(void)
|
||||
{
|
||||
u16 sideStatus = gSideAffecting[GET_BANK_SIDE(gBankTarget)];
|
||||
gBattleMoveDamage = CalculateBaseDamage(&gBattleMons[gBankAttacker], &gBattleMons[gBankTarget], gCurrentMove,
|
||||
sideStatus, gDynamicBasePower,
|
||||
gBattleStruct->dynamicMoveType, gBankAttacker, gBankTarget);
|
||||
gBattleMoveDamage = gBattleMoveDamage * gCritMultiplier * gBattleScripting.dmgMultiplier;
|
||||
|
||||
if (gStatuses3[gBankAttacker] & STATUS3_CHARGED_UP && gBattleMoves[gCurrentMove].type == TYPE_ELECTRIC)
|
||||
gBattleMoveDamage *= 2;
|
||||
if (gProtectStructs[gBankAttacker].helpingHand)
|
||||
gBattleMoveDamage = gBattleMoveDamage * 15 / 10;
|
||||
|
||||
gBattlescriptCurrInstr++;
|
||||
}
|
||||
|
||||
void AI_CalcDmg(u8 bankAtk, u8 bankDef)
|
||||
{
|
||||
u16 sideStatus = gSideAffecting[GET_BANK_SIDE(bankDef)];
|
||||
gBattleMoveDamage = CalculateBaseDamage(&gBattleMons[bankAtk], &gBattleMons[bankDef], gCurrentMove,
|
||||
sideStatus, gDynamicBasePower,
|
||||
gBattleStruct->dynamicMoveType, bankAtk, bankDef);
|
||||
gDynamicBasePower = 0;
|
||||
gBattleMoveDamage = gBattleMoveDamage * gCritMultiplier * gBattleScripting.dmgMultiplier;
|
||||
|
||||
if (gStatuses3[bankAtk] & STATUS3_CHARGED_UP && gBattleMoves[gCurrentMove].type == TYPE_ELECTRIC)
|
||||
gBattleMoveDamage *= 2;
|
||||
if (gProtectStructs[bankAtk].helpingHand)
|
||||
gBattleMoveDamage = gBattleMoveDamage * 15 / 10;
|
||||
}
|
||||
|
||||
void ModulateDmgByType(u8 multiplier)
|
||||
{
|
||||
gBattleMoveDamage = gBattleMoveDamage * multiplier / 10;
|
||||
if (gBattleMoveDamage == 0 && multiplier != 0)
|
||||
gBattleMoveDamage = 1;
|
||||
|
||||
switch (multiplier)
|
||||
{
|
||||
case TYPE_MUL_NO_EFFECT:
|
||||
gBattleMoveFlags |= MOVESTATUS_NOTAFFECTED;
|
||||
gBattleMoveFlags &= ~MOVESTATUS_NOTVERYEFFECTIVE;
|
||||
gBattleMoveFlags &= ~MOVESTATUS_SUPEREFFECTIVE;
|
||||
break;
|
||||
case TYPE_MUL_NOT_EFFECTIVE:
|
||||
if (gBattleMoves[gCurrentMove].power && !(gBattleMoveFlags & MOVESTATUS_NOEFFECT))
|
||||
{
|
||||
if (gBattleMoveFlags & MOVESTATUS_SUPEREFFECTIVE)
|
||||
gBattleMoveFlags &= ~MOVESTATUS_SUPEREFFECTIVE;
|
||||
else
|
||||
gBattleMoveFlags |= MOVESTATUS_NOTVERYEFFECTIVE;
|
||||
}
|
||||
break;
|
||||
case TYPE_MUL_SUPER_EFFECTIVE:
|
||||
if (gBattleMoves[gCurrentMove].power && !(gBattleMoveFlags & MOVESTATUS_NOEFFECT))
|
||||
{
|
||||
if (gBattleMoveFlags & MOVESTATUS_NOTVERYEFFECTIVE)
|
||||
gBattleMoveFlags &= ~MOVESTATUS_NOTVERYEFFECTIVE;
|
||||
else
|
||||
gBattleMoveFlags |= MOVESTATUS_SUPEREFFECTIVE;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
#define TYPE_FORESIGHT 0xFE
|
||||
#define TYPE_ENDTABLE 0xFF
|
||||
|
||||
void atk06_typecalc(void)
|
||||
{
|
||||
s32 i = 0;
|
||||
u8 moveType;
|
||||
|
||||
if (gCurrentMove == MOVE_STRUGGLE)
|
||||
{
|
||||
gBattlescriptCurrInstr++;
|
||||
return;
|
||||
}
|
||||
|
||||
GET_MOVE_TYPE(gCurrentMove, moveType);
|
||||
|
||||
// check stab
|
||||
if (gBattleMons[gBankAttacker].type1 == moveType || gBattleMons[gBankAttacker].type2 == moveType)
|
||||
{
|
||||
gBattleMoveDamage = gBattleMoveDamage * 15;
|
||||
gBattleMoveDamage = gBattleMoveDamage / 10;
|
||||
}
|
||||
|
||||
if (gBattleMons[gBankTarget].ability == ABILITY_LEVITATE && moveType == TYPE_GROUND)
|
||||
{
|
||||
gLastUsedAbility = gBattleMons[gBankTarget].ability;
|
||||
gBattleMoveFlags |= (MOVESTATUS_MISSED | MOVESTATUS_NOTAFFECTED);
|
||||
gUnknown_02024250[gBankTarget] = 0;
|
||||
gUnknown_02024258[gBankTarget] = 0;
|
||||
gBattleCommunication[6] = moveType;
|
||||
RecordAbilityBattle(gBankTarget, gLastUsedAbility);
|
||||
}
|
||||
else
|
||||
{
|
||||
while (gTypeEffectiveness[i] != TYPE_ENDTABLE)
|
||||
{
|
||||
if (gTypeEffectiveness[i] == TYPE_FORESIGHT)
|
||||
{
|
||||
if (gBattleMons[gBankTarget].status2 & STATUS2_FORESIGHT)
|
||||
break;
|
||||
i += 3;
|
||||
continue;
|
||||
}
|
||||
else if (gTypeEffectiveness[i] == moveType)
|
||||
{
|
||||
// check type1
|
||||
if (gTypeEffectiveness[i + 1] == gBattleMons[gBankTarget].type1)
|
||||
ModulateDmgByType(gTypeEffectiveness[i + 2]);
|
||||
// check type2
|
||||
if (gTypeEffectiveness[i + 1] == gBattleMons[gBankTarget].type2 &&
|
||||
gBattleMons[gBankTarget].type1 != gBattleMons[gBankTarget].type2)
|
||||
ModulateDmgByType(gTypeEffectiveness[i + 2]);
|
||||
}
|
||||
i += 3;
|
||||
}
|
||||
}
|
||||
|
||||
if (gBattleMons[gBankTarget].ability == ABILITY_WONDER_GUARD && AttacksThisTurn(gBankAttacker, gCurrentMove) == 2
|
||||
&& (!(gBattleMoveFlags & MOVESTATUS_SUPEREFFECTIVE) || ((gBattleMoveFlags & (MOVESTATUS_SUPEREFFECTIVE | MOVESTATUS_NOTVERYEFFECTIVE)) == (MOVESTATUS_SUPEREFFECTIVE | MOVESTATUS_NOTVERYEFFECTIVE)))
|
||||
&& gBattleMoves[gCurrentMove].power)
|
||||
{
|
||||
gLastUsedAbility = ABILITY_WONDER_GUARD;
|
||||
gBattleMoveFlags |= MOVESTATUS_MISSED;
|
||||
gUnknown_02024250[gBankTarget] = 0;
|
||||
gUnknown_02024258[gBankTarget] = 0;
|
||||
gBattleCommunication[6] = 3;
|
||||
RecordAbilityBattle(gBankTarget, gLastUsedAbility);
|
||||
}
|
||||
if (gBattleMoveFlags & MOVESTATUS_NOTAFFECTED)
|
||||
gProtectStructs[gBankAttacker].notEffective = 1;
|
||||
|
||||
gBattlescriptCurrInstr++;
|
||||
}
|
||||
|
||||
static void CheckWonderGuardAndLevitate(void)
|
||||
{
|
||||
u8 flags = 0;
|
||||
s32 i = 0;
|
||||
u8 moveType;
|
||||
|
||||
if (gCurrentMove == MOVE_STRUGGLE || !gBattleMoves[gCurrentMove].power)
|
||||
return;
|
||||
|
||||
GET_MOVE_TYPE(gCurrentMove, moveType);
|
||||
|
||||
if (gBattleMons[gBankTarget].ability == ABILITY_LEVITATE && moveType == TYPE_GROUND)
|
||||
{
|
||||
gLastUsedAbility = ABILITY_LEVITATE;
|
||||
gBattleCommunication[6] = moveType;
|
||||
RecordAbilityBattle(gBankTarget, ABILITY_LEVITATE);
|
||||
return;
|
||||
}
|
||||
|
||||
while (gTypeEffectiveness[i] != TYPE_ENDTABLE)
|
||||
{
|
||||
if (gTypeEffectiveness[i] == TYPE_FORESIGHT)
|
||||
{
|
||||
if (gBattleMons[gBankTarget].status2 & STATUS2_FORESIGHT)
|
||||
break;
|
||||
i += 3;
|
||||
continue;
|
||||
}
|
||||
if (gTypeEffectiveness[i] == moveType)
|
||||
{
|
||||
// check no effect
|
||||
if (gTypeEffectiveness[i + 1] == gBattleMons[gBankTarget].type1 && gTypeEffectiveness[i + 2] == 0)
|
||||
{
|
||||
gBattleMoveFlags |= MOVESTATUS_NOTAFFECTED;
|
||||
gProtectStructs[gBankAttacker].notEffective = 1;
|
||||
}
|
||||
if (gTypeEffectiveness[i + 1] == gBattleMons[gBankTarget].type2 &&
|
||||
gBattleMons[gBankTarget].type1 != gBattleMons[gBankTarget].type2 &&
|
||||
gTypeEffectiveness[i + 2] == TYPE_MUL_NO_EFFECT)
|
||||
{
|
||||
gBattleMoveFlags |= MOVESTATUS_NOTAFFECTED;
|
||||
gProtectStructs[gBankAttacker].notEffective = 1;
|
||||
}
|
||||
|
||||
// check super effective
|
||||
if (gTypeEffectiveness[i + 1] == gBattleMons[gBankTarget].type1 && gTypeEffectiveness[i + 2] == 20)
|
||||
flags |= 1;
|
||||
if (gTypeEffectiveness[i + 1] == gBattleMons[gBankTarget].type2
|
||||
&& gBattleMons[gBankTarget].type1 != gBattleMons[gBankTarget].type2
|
||||
&& gTypeEffectiveness[i + 2] == TYPE_MUL_SUPER_EFFECTIVE)
|
||||
flags |= 1;
|
||||
|
||||
// check not very effective
|
||||
if (gTypeEffectiveness[i + 1] == gBattleMons[gBankTarget].type1 && gTypeEffectiveness[i + 2] == 5)
|
||||
flags |= 2;
|
||||
if (gTypeEffectiveness[i + 1] == gBattleMons[gBankTarget].type2
|
||||
&& gBattleMons[gBankTarget].type1 != gBattleMons[gBankTarget].type2
|
||||
&& gTypeEffectiveness[i + 2] == TYPE_MUL_NOT_EFFECTIVE)
|
||||
flags |= 2;
|
||||
}
|
||||
i += 3;
|
||||
}
|
||||
|
||||
if (gBattleMons[gBankTarget].ability == ABILITY_WONDER_GUARD && AttacksThisTurn(gBankAttacker, gCurrentMove) == 2)
|
||||
{
|
||||
if (((flags & 2) || !(flags & 1)) && gBattleMoves[gCurrentMove].power)
|
||||
{
|
||||
gLastUsedAbility = ABILITY_WONDER_GUARD;
|
||||
gBattleCommunication[6] = 3;
|
||||
RecordAbilityBattle(gBankTarget, ABILITY_WONDER_GUARD);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void ModulateDmgByType2(u8 multiplier, u16 move, u8* flags) // same as ModulateDmgByType except different arguments
|
||||
{
|
||||
gBattleMoveDamage = gBattleMoveDamage * multiplier / 10;
|
||||
if (gBattleMoveDamage == 0 && multiplier != 0)
|
||||
gBattleMoveDamage = 1;
|
||||
|
||||
switch (multiplier)
|
||||
{
|
||||
case TYPE_MUL_NO_EFFECT:
|
||||
*flags |= MOVESTATUS_NOTAFFECTED;
|
||||
*flags &= ~MOVESTATUS_NOTVERYEFFECTIVE;
|
||||
*flags &= ~MOVESTATUS_SUPEREFFECTIVE;
|
||||
break;
|
||||
case TYPE_MUL_NOT_EFFECTIVE:
|
||||
if (gBattleMoves[move].power && !(*flags & MOVESTATUS_NOEFFECT))
|
||||
{
|
||||
if (*flags & MOVESTATUS_SUPEREFFECTIVE)
|
||||
*flags &= ~MOVESTATUS_SUPEREFFECTIVE;
|
||||
else
|
||||
*flags |= MOVESTATUS_NOTVERYEFFECTIVE;
|
||||
}
|
||||
break;
|
||||
case TYPE_MUL_SUPER_EFFECTIVE:
|
||||
if (gBattleMoves[move].power && !(*flags & MOVESTATUS_NOEFFECT))
|
||||
{
|
||||
if (*flags & MOVESTATUS_NOTVERYEFFECTIVE)
|
||||
*flags &= ~MOVESTATUS_NOTVERYEFFECTIVE;
|
||||
else
|
||||
*flags |= MOVESTATUS_SUPEREFFECTIVE;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
u8 TypeCalc(u16 move, u8 bankAtk, u8 bankDef)
|
||||
{
|
||||
s32 i = 0;
|
||||
u8 flags = 0;
|
||||
u8 moveType;
|
||||
|
||||
if (move == MOVE_STRUGGLE)
|
||||
return 0;
|
||||
|
||||
moveType = gBattleMoves[move].type;
|
||||
|
||||
// check stab
|
||||
if (gBattleMons[bankAtk].type1 == moveType || gBattleMons[bankAtk].type2 == moveType)
|
||||
{
|
||||
gBattleMoveDamage = gBattleMoveDamage * 15;
|
||||
gBattleMoveDamage = gBattleMoveDamage / 10;
|
||||
}
|
||||
|
||||
if (gBattleMons[bankDef].ability == ABILITY_LEVITATE && moveType == TYPE_GROUND)
|
||||
{
|
||||
flags |= (MOVESTATUS_MISSED | MOVESTATUS_NOTAFFECTED);
|
||||
}
|
||||
else
|
||||
{
|
||||
while (gTypeEffectiveness[i]!= TYPE_ENDTABLE)
|
||||
{
|
||||
if (gTypeEffectiveness[i] == TYPE_FORESIGHT)
|
||||
{
|
||||
if (gBattleMons[bankDef].status2 & STATUS2_FORESIGHT)
|
||||
break;
|
||||
i += 3;
|
||||
continue;
|
||||
}
|
||||
|
||||
else if (gTypeEffectiveness[i] == moveType)
|
||||
{
|
||||
// check type1
|
||||
if (gTypeEffectiveness[i + 1] == gBattleMons[bankDef].type1)
|
||||
ModulateDmgByType2(gTypeEffectiveness[i + 2], move, &flags);
|
||||
// check type2
|
||||
if (gTypeEffectiveness[i + 1] == gBattleMons[bankDef].type2 &&
|
||||
gBattleMons[bankDef].type1 != gBattleMons[bankDef].type2)
|
||||
ModulateDmgByType2(gTypeEffectiveness[i + 2], move, &flags);
|
||||
}
|
||||
i += 3;
|
||||
}
|
||||
}
|
||||
|
||||
if (gBattleMons[bankDef].ability == ABILITY_WONDER_GUARD && !(flags & MOVESTATUS_MISSED)
|
||||
&& AttacksThisTurn(bankAtk, move) == 2
|
||||
&& (!(flags & MOVESTATUS_SUPEREFFECTIVE) || ((flags & (MOVESTATUS_SUPEREFFECTIVE | MOVESTATUS_NOTVERYEFFECTIVE)) == (MOVESTATUS_SUPEREFFECTIVE | MOVESTATUS_NOTVERYEFFECTIVE)))
|
||||
&& gBattleMoves[move].power)
|
||||
{
|
||||
flags |= MOVESTATUS_MISSED;
|
||||
}
|
||||
return flags;
|
||||
}
|
||||
|
||||
u8 AI_TypeCalc(u16 move, u16 species, u8 ability)
|
||||
{
|
||||
s32 i = 0;
|
||||
u8 flags = 0;
|
||||
u8 type1 = gBaseStats[species].type1, type2 = gBaseStats[species].type2;
|
||||
u8 moveType;
|
||||
|
||||
if (move == MOVE_STRUGGLE)
|
||||
return 0;
|
||||
|
||||
moveType = gBattleMoves[move].type;
|
||||
|
||||
if (ability == ABILITY_LEVITATE && moveType == TYPE_GROUND)
|
||||
{
|
||||
flags = MOVESTATUS_MISSED | MOVESTATUS_NOTAFFECTED;
|
||||
}
|
||||
else
|
||||
{
|
||||
while (gTypeEffectiveness[i] != TYPE_ENDTABLE)
|
||||
{
|
||||
if (gTypeEffectiveness[i] == TYPE_FORESIGHT)
|
||||
{
|
||||
i += 3;
|
||||
continue;
|
||||
}
|
||||
if (gTypeEffectiveness[i] == moveType)
|
||||
{
|
||||
// check type1
|
||||
if (gTypeEffectiveness[i + 1] == type1)
|
||||
ModulateDmgByType2(gTypeEffectiveness[i + 2], move, &flags);
|
||||
// check type2
|
||||
if (gTypeEffectiveness[i + 1] == type2 && type1 != type2)
|
||||
ModulateDmgByType2(gTypeEffectiveness[i + 2], move, &flags);
|
||||
}
|
||||
i += 3;
|
||||
}
|
||||
}
|
||||
if (ability == ABILITY_WONDER_GUARD
|
||||
&& (!(flags & MOVESTATUS_SUPEREFFECTIVE) || ((flags & (MOVESTATUS_SUPEREFFECTIVE | MOVESTATUS_NOTVERYEFFECTIVE)) == (MOVESTATUS_SUPEREFFECTIVE | MOVESTATUS_NOTVERYEFFECTIVE)))
|
||||
&& gBattleMoves[move].power)
|
||||
flags |= MOVESTATUS_NOTAFFECTED;
|
||||
return flags;
|
||||
}
|
||||
|
||||
// Multiplies the damage by a random factor between 85% to 100% inclusive
|
||||
static inline void ApplyRandomDmgMultiplier(void)
|
||||
{
|
||||
u16 rand = Random();
|
||||
u16 randPercent = 100 - (rand % 16);
|
||||
|
||||
if (gBattleMoveDamage != 0)
|
||||
{
|
||||
gBattleMoveDamage *= randPercent;
|
||||
gBattleMoveDamage /= 100;
|
||||
if (gBattleMoveDamage == 0)
|
||||
gBattleMoveDamage = 1;
|
||||
}
|
||||
}
|
||||
|
||||
void Unused_ApplyRandomDmgMultiplier(void)
|
||||
{
|
||||
ApplyRandomDmgMultiplier();
|
||||
}
|
||||
|
||||
void atk07_dmg_adjustment(void)
|
||||
{
|
||||
u8 holdEffect, quality;
|
||||
|
||||
ApplyRandomDmgMultiplier();
|
||||
|
||||
if (gBattleMons[gBankTarget].item == ITEM_ENIGMA_BERRY)
|
||||
{
|
||||
holdEffect = gEnigmaBerries[gBankTarget].holdEffect, quality = gEnigmaBerries[gBankTarget].holdEffectParam;
|
||||
}
|
||||
else
|
||||
{
|
||||
holdEffect = ItemId_GetHoldEffect(gBattleMons[gBankTarget].item);
|
||||
quality = ItemId_GetHoldEffectParam(gBattleMons[gBankTarget].item);
|
||||
}
|
||||
|
||||
gStringBank = gBankTarget;
|
||||
|
||||
if (holdEffect == HOLD_EFFECT_FOCUS_BAND && (Random() % 100) < quality)
|
||||
{
|
||||
RecordItemEffectBattle(gBankTarget, holdEffect);
|
||||
gSpecialStatuses[gBankTarget].focusBanded = 1;
|
||||
}
|
||||
if (gBattleMons[gBankTarget].status2 & STATUS2_SUBSTITUTE)
|
||||
goto END;
|
||||
if (gBattleMoves[gCurrentMove].effect != EFFECT_FALSE_SWIPE && !gProtectStructs[gBankTarget].endured
|
||||
&& !gSpecialStatuses[gBankTarget].focusBanded)
|
||||
goto END;
|
||||
|
||||
if (gBattleMons[gBankTarget].hp > gBattleMoveDamage)
|
||||
goto END;
|
||||
|
||||
gBattleMoveDamage = gBattleMons[gBankTarget].hp - 1;
|
||||
|
||||
if (gProtectStructs[gBankTarget].endured)
|
||||
{
|
||||
gBattleMoveFlags |= MOVESTATUS_ENDURED;
|
||||
}
|
||||
else if (gSpecialStatuses[gBankTarget].focusBanded)
|
||||
{
|
||||
gBattleMoveFlags |= MOVESTATUS_HUNGON;
|
||||
gLastUsedItem = gBattleMons[gBankTarget].item;
|
||||
}
|
||||
|
||||
END:
|
||||
gBattlescriptCurrInstr++;
|
||||
}
|
||||
|
||||
void atk08_dmg_adjustment2(void) // The same as 0x7 except it doesn't check for false swipe move effect.
|
||||
{
|
||||
u8 holdEffect, quality;
|
||||
|
||||
ApplyRandomDmgMultiplier();
|
||||
|
||||
if (gBattleMons[gBankTarget].item == ITEM_ENIGMA_BERRY)
|
||||
{
|
||||
holdEffect = gEnigmaBerries[gBankTarget].holdEffect, quality = gEnigmaBerries[gBankTarget].holdEffectParam;
|
||||
}
|
||||
else
|
||||
{
|
||||
holdEffect = ItemId_GetHoldEffect(gBattleMons[gBankTarget].item);
|
||||
quality = ItemId_GetHoldEffectParam(gBattleMons[gBankTarget].item);
|
||||
}
|
||||
|
||||
gStringBank = gBankTarget;
|
||||
|
||||
if (holdEffect == HOLD_EFFECT_FOCUS_BAND && (Random() % 100) < quality)
|
||||
{
|
||||
RecordItemEffectBattle(gBankTarget, holdEffect);
|
||||
gSpecialStatuses[gBankTarget].focusBanded = 1;
|
||||
}
|
||||
if (gBattleMons[gBankTarget].status2 & STATUS2_SUBSTITUTE)
|
||||
goto END;
|
||||
if (!gProtectStructs[gBankTarget].endured && !gSpecialStatuses[gBankTarget].focusBanded)
|
||||
goto END;
|
||||
if (gBattleMons[gBankTarget].hp > gBattleMoveDamage)
|
||||
goto END;
|
||||
|
||||
gBattleMoveDamage = gBattleMons[gBankTarget].hp - 1;
|
||||
|
||||
if (gProtectStructs[gBankTarget].endured)
|
||||
{
|
||||
gBattleMoveFlags |= MOVESTATUS_ENDURED;
|
||||
}
|
||||
else if (gSpecialStatuses[gBankTarget].focusBanded)
|
||||
{
|
||||
gBattleMoveFlags |= MOVESTATUS_HUNGON;
|
||||
gLastUsedItem = gBattleMons[gBankTarget].item;
|
||||
}
|
||||
|
||||
END:
|
||||
gBattlescriptCurrInstr++;
|
||||
}
|
||||
|
||||
void atk09_attackanimation(void)
|
||||
{
|
||||
if (gBattleExecBuffer)
|
||||
return;
|
||||
|
||||
if ((gHitMarker & HITMARKER_NO_ANIMATIONS) && (gCurrentMove != MOVE_TRANSFORM && gCurrentMove != MOVE_SUBSTITUTE))
|
||||
{
|
||||
b_movescr_stack_push(gBattlescriptCurrInstr + 1);
|
||||
gBattlescriptCurrInstr = BattleScript_Pausex20;
|
||||
gBattleScripting.animTurn++;
|
||||
gBattleScripting.animTargetsHit++;
|
||||
}
|
||||
else
|
||||
{
|
||||
if ((gBattleMoves[gCurrentMove].target & MOVE_TARGET_BOTH
|
||||
|| gBattleMoves[gCurrentMove].target & MOVE_TARGET_FOES_AND_ALLY
|
||||
|| gBattleMoves[gCurrentMove].target & MOVE_TARGET_DEPENDS)
|
||||
&& gBattleScripting.animTargetsHit)
|
||||
{
|
||||
gBattlescriptCurrInstr++;
|
||||
return;
|
||||
}
|
||||
if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT))
|
||||
{
|
||||
u8 multihit;
|
||||
|
||||
gActiveBank = gBankAttacker;
|
||||
|
||||
if (gBattleMons[gBankTarget].status2 & STATUS2_SUBSTITUTE)
|
||||
multihit = gMultiHitCounter;
|
||||
else if (gMultiHitCounter != 0 && gMultiHitCounter != 1)
|
||||
{
|
||||
if (gBattleMons[gBankTarget].hp <= gBattleMoveDamage)
|
||||
multihit = 1;
|
||||
else
|
||||
multihit = gMultiHitCounter;
|
||||
}
|
||||
else
|
||||
multihit = gMultiHitCounter;
|
||||
|
||||
EmitMoveAnimation(0, gCurrentMove, gBattleScripting.animTurn, gBattleMovePower, gBattleMoveDamage, gBattleMons[gBankAttacker].friendship, &gDisableStructs[gBankAttacker], multihit);
|
||||
gBattleScripting.animTurn += 1;
|
||||
gBattleScripting.animTargetsHit += 1;
|
||||
MarkBufferBankForExecution(gBankAttacker);
|
||||
gBattlescriptCurrInstr++;
|
||||
}
|
||||
else
|
||||
{
|
||||
b_movescr_stack_push(gBattlescriptCurrInstr + 1);
|
||||
gBattlescriptCurrInstr = BattleScript_Pausex20;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void atk0A_waitanimation(void)
|
||||
{
|
||||
if (gBattleExecBuffer == 0)
|
||||
gBattlescriptCurrInstr++;
|
||||
}
|
||||
|
||||
void atk0B_healthbarupdate(void)
|
||||
{
|
||||
register s16 healthValue asm("r1");
|
||||
|
||||
if (gBattleExecBuffer)
|
||||
return;
|
||||
if (gBattleMoveFlags & MOVESTATUS_NOEFFECT)
|
||||
goto END;
|
||||
|
||||
gActiveBank = GetBattleBank(BSScriptRead8(gBattlescriptCurrInstr + 1));
|
||||
|
||||
if (gBattleMons[gActiveBank].status2 & STATUS2_SUBSTITUTE && gDisableStructs[gActiveBank].substituteHP && !(gHitMarker & HITMARKER_IGNORE_SUBSTITUTE))
|
||||
{
|
||||
PrepareStringBattle(0x80, gActiveBank);
|
||||
goto END;
|
||||
}
|
||||
|
||||
healthValue = 10000;
|
||||
if (healthValue <= gBattleMoveDamage)
|
||||
healthValue = gBattleMoveDamage;
|
||||
|
||||
EmitHealthBarUpdate(0, healthValue);
|
||||
MarkBufferBankForExecution(gActiveBank);
|
||||
|
||||
if (GetBankSide(gActiveBank) == SIDE_PLAYER && gBattleMoveDamage > 0)
|
||||
gBattleResults.unk5_0 = 1;
|
||||
|
||||
END:
|
||||
gBattlescriptCurrInstr += 2;
|
||||
}
|
||||
|
||||
@ -73,10 +73,7 @@ extern const struct BaseStats gBaseStats[];
|
||||
extern const u32 gBitTable[];
|
||||
extern u8 * const gBattleAI_ScriptsTable[];
|
||||
|
||||
extern u8 GetBankIdentity(u8);
|
||||
extern u8 b_first_side(u8, u8, u8);
|
||||
extern u8 GetBankByPlayerAI(u8);
|
||||
extern void TypeCalc(u16 move, u8 bankAtk, u8 bankDef);
|
||||
extern void AI_CalcDmg(u8, u8);
|
||||
|
||||
extern u8 CheckMoveLimitations();
|
||||
|
||||
@ -376,7 +376,7 @@ gAbsentBankFlags: @ 2024210
|
||||
gCritMultiplier: @ 2024211
|
||||
.space 0x1
|
||||
|
||||
gUnknown_02024212: @ 2024212
|
||||
gMultiHitCounter: @ 2024212
|
||||
.space 0x2
|
||||
|
||||
gBattlescriptCurrInstr: @ 2024214
|
||||
|
||||
Loading…
Reference in New Issue
Block a user