ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-31 16:30:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

use NATIVE_ARGS in various to callnative conversions

Browse Source
This commit is contained in:
ghoulslash 2023-05-15 15:07:09 -04:00
parent 60710f823e
commit 6458cab70a
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/battle_script_commands.c
View File

@ -8805,7 +8805,7 @@ static bool32 CanTeleport(u8 battlerId)
{ {
struct Pokemon *party = GetBattlerParty(battlerId); struct Pokemon *party = GetBattlerParty(battlerId);
u32 species, count, i; u32 species, count, i;
for (i = 0; i < PARTY_SIZE; i++) for (i = 0; i < PARTY_SIZE; i++)
{ {
species = GetMonData(&party[i], MON_DATA_SPECIES_OR_EGG); species = GetMonData(&party[i], MON_DATA_SPECIES_OR_EGG);
@ -16317,33 +16317,33 @@ static bool8 IsFinalStrikeEffect(u16 move)
// 10 bytes long (callnative(5) + counter(1) + ptr(4)) // 10 bytes long (callnative(5) + counter(1) + ptr(4))
void BS_CheckParentalBondCounter(void) void BS_CheckParentalBondCounter(void)
{ {
NATIVE_ARGS(u8 counter, const u8 *jumpInstr);
// Some effects should only happen on the first or second strike of Parental Bond, // Some effects should only happen on the first or second strike of Parental Bond,
// so a way to check this in battle scripts is useful // so a way to check this in battle scripts is useful
u8 counter = T1_READ_8(gBattlescriptCurrInstr + 5); if (gSpecialStatuses[gBattlerAttacker].parentalBondState == cmd->counter && gBattleMons[gBattlerTarget].hp != 0)
if (gSpecialStatuses[gBattlerAttacker].parentalBondState == counter && gBattleMons[gBattlerTarget].hp != 0) gBattlescriptCurrInstr = cmd->jumpInstr;
gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 6);
else else
gBattlescriptCurrInstr += 10; gBattlescriptCurrInstr = cmd->nextInstr;
} }
// 6 bytes long (callnative(5) + battler(1)) // 6 bytes long (callnative(5) + battler(1))
void BS_GetBattlerSide(void) void BS_GetBattlerSide(void)
{ {
gBattleCommunication[0] = GetBattlerSide(gBattlescriptCurrInstr[5]); NATIVE_ARGS(u8 battler);
gBattlescriptCurrInstr += 6; gBattleCommunication[0] = GetBattlerSide(cmd->battler);
gBattlescriptCurrInstr = cmd->nextInstr;
} }
// 6 bytes long (callnative(5) + battler(1))
void BS_CanTeleport(void) void BS_CanTeleport(void)
{ {
u8 battler = gBattlescriptCurrInstr[5]; NATIVE_ARGS(u8 battler);
gBattleCommunication[0] = CanTeleport(battler); gBattleCommunication[0] = CanTeleport(cmd->battler);
gBattlescriptCurrInstr += 6; gBattlescriptCurrInstr = cmd->nextInstr;
} }
// 5 bytes long
void BS_TrySymbiosis(void) void BS_TrySymbiosis(void)
{ {
NATIVE_ARGS();
//called by Bestow, Fling, and Bug Bite, which don't work with Cmd_removeitem. //called by Bestow, Fling, and Bug Bite, which don't work with Cmd_removeitem.
gActiveBattler = gBattlerAttacker; gActiveBattler = gBattlerAttacker;
if (SYMBIOSIS_CHECK(gBattlerAttacker, BATTLE_PARTNER(gActiveBattler))) if (SYMBIOSIS_CHECK(gBattlerAttacker, BATTLE_PARTNER(gActiveBattler)))
@ -16357,7 +16357,7 @@ void BS_TrySymbiosis(void)
return; return;
} }
gBattlescriptCurrInstr += 5; gBattlescriptCurrInstr = cmd->nextInstr;
} }
void BS_SetZEffect(void) void BS_SetZEffect(void)