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

fixed GetBattlerSide, removed debug script

Browse Source
This commit is contained in:
AgustinGDLV 2023-05-23 15:50:51 -07:00
parent a9a32651ac
commit bb10b0d1b0
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
data/scripts/debug.inc
View File

@ -68,12 +68,6 @@ Debug_FlagsNotSetBattleConfigMessage_Text:
.string "'include/config/battle.h'!$" .string "'include/config/battle.h'!$"
Debug_Script_1:: Debug_Script_1::
givemon SPECIES_TREECKO, 20, ITEM_NONE
givemon SPECIES_TORCHIC, 20, ITEM_NONE
giveitem ITEM_REVIVE, 3
giveitem ITEM_HYPER_POTION, 3
setwildbattle SPECIES_UNOWN, 20, 0, SPECIES_UNOWN, 20, 0
dowildbattle
end end
Debug_Script_2:: Debug_Script_2::

2
src/battle_script_commands.c
View File

@ -16324,7 +16324,7 @@ void BS_CheckParentalBondCounter(void)
void BS_GetBattlerSide(void) void BS_GetBattlerSide(void)
{ {
NATIVE_ARGS(u8 battler); NATIVE_ARGS(u8 battler);
gBattleCommunication[0] = GetBattlerSide(cmd->battler); gBattleCommunication[0] = GetBattlerSide(GetBattlerForBattleScript(cmd->battler));
gBattlescriptCurrInstr = cmd->nextInstr; gBattlescriptCurrInstr = cmd->nextInstr;
} }