summaryrefslogtreecommitdiff
path: root/src/script_pokemon_util_80C4BF0.c
diff options
context:
space:
mode:
authorcamthesaxman <cameronghall@cox.net>2017-09-13 00:03:22 -0500
committercamthesaxman <cameronghall@cox.net>2017-09-13 00:03:22 -0500
commit270bd98d41a19c516a4be95f522deb26cc4300a9 (patch)
treedca3131793bf14acd85d6558f8195b0294870af6 /src/script_pokemon_util_80C4BF0.c
parent2c87516ca3efa260b96b92ededb24d75edfe49e8 (diff)
more labeling
Diffstat (limited to 'src/script_pokemon_util_80C4BF0.c')
-rw-r--r--src/script_pokemon_util_80C4BF0.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/script_pokemon_util_80C4BF0.c b/src/script_pokemon_util_80C4BF0.c
index 8133d8ac0..323df991a 100644
--- a/src/script_pokemon_util_80C4BF0.c
+++ b/src/script_pokemon_util_80C4BF0.c
@@ -511,7 +511,7 @@ void ScriptRandom(void)
*scriptPtr = random % *scriptPtr;
}
-void HealPlayerParty(void)
+void ScrSpecial_HealPlayerParty(void)
{
u8 i, j;
u8 ppBonuses;
@@ -620,18 +620,18 @@ bool8 GetNameOfEnigmaBerryInPlayerParty(void)
return hasItem;
}
-void ScriptWildBattle(u16 species, u8 level, u16 item)
+void CreateScriptedWildMon(u16 species, u8 level, u16 item)
{
- u8 data[2];
+ u8 heldItem[2];
ZeroEnemyPartyMons();
CreateMon(&gEnemyParty[0], species, level, 0x20, 0, 0, 0, 0);
if(item)
{
- data[0] = item;
- data[1] = item >> 8;
- SetMonData(&gEnemyParty[0], MON_DATA_HELD_ITEM, data);
+ heldItem[0] = item;
+ heldItem[1] = item >> 8;
+ SetMonData(&gEnemyParty[0], MON_DATA_HELD_ITEM, heldItem);
}
}