diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-14 10:48:45 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-15 11:41:45 -0400 |
| commit | 154b07917927bd37d7780e1a8bc8f307dad8d70c (patch) | |
| tree | 004219bc1b62d65a388865f14660c2e1eafdc36b /arm9/src | |
| parent | 62afe08422b65aef839d74ec248d67d48be6bf55 (diff) | |
Name some script mon related routines
Diffstat (limited to 'arm9/src')
| -rw-r--r-- | arm9/src/pokemon.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arm9/src/pokemon.c b/arm9/src/pokemon.c index 05df8811..dbf86d8a 100644 --- a/arm9/src/pokemon.c +++ b/arm9/src/pokemon.c @@ -32,7 +32,7 @@ u8 CalcShininessByOtIdAndPersonality(u32 otid, u32 pid); void InitBoxMonMoveset(struct BoxPokemon * boxmon); u32 FUN_020696A8(struct BoxPokemon * boxmon, u16 move); void FUN_02069718(struct BoxPokemon * boxmon, u16 move); -void FUN_020697D4(struct BoxPokemon * boxmon, u16 move, u8 slot); +void BoxMonSetMoveInSlot(struct BoxPokemon * boxmon, u16 move, u8 slot); void FUN_020698E8(struct BoxPokemon * boxmon, int slot1, int slot2); s8 FUN_02069BD0(struct BoxPokemon * boxmon, int flavor); s8 FUN_02069BE4(u32 personality, int flavor); @@ -2825,7 +2825,7 @@ u32 FUN_020696A8(struct BoxPokemon * boxmon, u16 move) cur_move = (u16)GetBoxMonData(boxmon, MON_DATA_MOVE1 + i, NULL); if (cur_move == MOVE_NONE) { - FUN_020697D4(boxmon, move, (u8)i); + BoxMonSetMoveInSlot(boxmon, move, (u8)i); ret = move; break; } @@ -2873,12 +2873,12 @@ void FUN_02069718(struct BoxPokemon * boxmon, u16 move) ReleaseBoxMonLock(boxmon, decry); } -void FUN_020697CC(struct Pokemon * pokemon, u16 move, u8 slot) +void MonSetMoveInSlot(struct Pokemon * pokemon, u16 move, u8 slot) { - FUN_020697D4(&pokemon->box, move, slot); + BoxMonSetMoveInSlot(&pokemon->box, move, slot); } -void FUN_020697D4(struct BoxPokemon * boxmon, u16 move, u8 slot) +void BoxMonSetMoveInSlot(struct BoxPokemon * boxmon, u16 move, u8 slot) { u8 ppUp; u8 pp; |