Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename some 'sub_' functions #115

Closed
wants to merge 12 commits into from
Closed

Rename some 'sub_' functions #115

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
fd2bf05
improving readability
ecopsychologer Nov 15, 2023
7232c12
readability
ecopsychologer Nov 15, 2023
e6fcd72
clean it up
ecopsychologer Nov 15, 2023
d3a8296
Update pokemon.h
ecopsychologer Nov 15, 2023
7941c4e
add function names
ecopsychologer Nov 17, 2023
717ac50
add function names
ecopsychologer Nov 17, 2023
e08989a
add struct names
ecopsychologer Nov 17, 2023
2b4710a
more functions with human names
ecopsychologer Nov 17, 2023
3d37d1c
rename chatotcrydata
ecopsychologer Nov 17, 2023
6e8a42c
doxygen documentation
ecopsychologer Nov 17, 2023
494779a
update box mon function
ecopsychologer Nov 17, 2023
44df4ee
fixing formatting
ecopsychologer Nov 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions include/constants/pokemon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ enum PokemonDataParam {
MON_DATA_3,
MON_DATA_4,
MON_DATA_SPECIES,
MON_DATA_HELD_ITEM,
MON_DATA_HELD_ITEM, // 6
ecopsychologer marked this conversation as resolved.
Show resolved Hide resolved
MON_DATA_OT_ID,
MON_DATA_EXP,
MON_DATA_FRIENDSHIP,
Expand Down Expand Up @@ -217,10 +217,10 @@ enum PokemonDataParam {
MON_DATA_OT_GENDER,
MON_DATA_158,
MON_DATA_159,
MON_DATA_STATUS_CONDITION,
MON_DATA_STATUS_CONDITION, // 160
MON_DATA_LEVEL,
MON_DATA_162,
MON_DATA_CURRENT_HP,
MON_DATA_CURRENT_HP, //163
MON_DATA_MAX_HP,
MON_DATA_ATK,
MON_DATA_DEF,
Expand All @@ -229,7 +229,7 @@ enum PokemonDataParam {
MON_DATA_SP_DEF,
MON_DATA_170,
MON_DATA_171,
MON_DATA_172,
MON_DATA_172, // data sanity?
MON_DATA_173,
MON_DATA_SPECIES_EGG,
MON_DATA_COMBINED_IVS,
Expand Down
2 changes: 1 addition & 1 deletion include/overlay006/battle_params.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ typedef struct {
UnkStruct_0207D99C * unk_E4;
UnkStruct_02026324 * unk_E8;
PCBoxes * unk_EC;
UnkStruct_0202CC84 * unk_F0[4];
ChatotCryData * unk_F0[4];
lhearachel marked this conversation as resolved.
Show resolved Hide resolved
UnkStruct_02056B24 * unk_100;
UnkStruct_0202C878 * unk_104;
UnkStruct_020279FC * unk_108;
Expand Down
2 changes: 1 addition & 1 deletion include/overlay016/ov16_0223DF00.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ int ov16_0223EDE0(BattleSystem * param0);
u8 BattleSystem_TextSpeed(BattleSystem * param0);
int BattleSystem_Ruleset(BattleSystem * param0);
UnkStruct_02015F84 * ov16_0223EE28(BattleSystem * param0);
UnkStruct_0202CC84 * BattleSystem_ChatotVoice(BattleSystem * param0, int param1);
ChatotCryData * BattleSystem_ChatotVoice(BattleSystem * param0, int param1);
ecopsychologer marked this conversation as resolved.
Show resolved Hide resolved
void ov16_0223EE70(BattleSystem * param0);
void ov16_0223EF2C(BattleSystem * param0, int param1, int param2);
void ov16_0223EF48(BattleSystem * param0, Pokemon * param1);
Expand Down
2 changes: 1 addition & 1 deletion include/overlay016/struct_ov16_02264408.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ typedef struct {
u32 unk_4C[4];
int unk_50;
UnkStruct_ov16_02264408_sub1 unk_54;
UnkStruct_0202CC84 * unk_6C;
ChatotCryData * unk_6C;
lhearachel marked this conversation as resolved.
Show resolved Hide resolved
u8 * unk_70;
u16 * unk_74;
} UnkStruct_ov16_02264408;
Expand Down
46 changes: 24 additions & 22 deletions include/pokemon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,18 +176,20 @@ typedef struct BoxPokemon {

/**
* @brief Party Pokemon data structure
* This is used to store stats for a pokemon while it is in the players party.
* Rather than recalculating stats after each battle, they're stored here.
*/
typedef struct PartyPokemon {
u32 unk_00;
u8 level; //!< The pokemons level
u8 unk_05;
u16 unk_06;
u16 unk_08;
u16 unk_0A;
u16 unk_0C;
u16 unk_0E;
u16 unk_10;
u16 unk_12;
u32 status;
u8 level;
u8 mail;
ecopsychologer marked this conversation as resolved.
Show resolved Hide resolved
u16 hp;
u16 maxHP;
u16 attack;
u16 defense;
u16 speed;
u16 spAtk;
u16 spDef;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In general, maintain the Doxygen comments on struct fields (and add them, if possible).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh, I'm sorry I'm fairly new to this and thought that was an excited comment, I'll try to add some. What does it do?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

re-added there

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The Doxygen comments are for whenever we want to generate documentation, similar to Javadoc or Sphinx: https://www.doxygen.nl/

UnkStruct_0202818C unk_14;
UnkStruct_0202CA28 unk_4C;
} PartyPokemon;
Expand All @@ -196,8 +198,8 @@ typedef struct PartyPokemon {
* @brief The main Pokemon data structure
*/
typedef struct Pokemon {
BoxPokemon box; //!< Contains the pokemons boxed data
PartyPokemon party; //!< Contains the pokemons extra data while it is in the players party
BoxPokemon box; // Contains the pokemons boxed data
PartyPokemon party; // Contains the pokemons extra data while it is in the players party
ecopsychologer marked this conversation as resolved.
Show resolved Hide resolved
} Pokemon;

/**
Expand Down Expand Up @@ -762,10 +764,10 @@ int Pokemon_LoadLevelUpMoveIdsOf(int monSpecies, int monForm, u16 *monLevelUpMov

void Pokemon_ApplyPokerus(Party *party);
u8 Pokemon_HasPokerus(Party *party, u8 param1);
void sub_020777B4(Party *party, s32 param1);
void UpdatePokerusStatusInParty(Party *party, s32 param1);
ecopsychologer marked this conversation as resolved.
Show resolved Hide resolved
void Pokemon_ValidatePokerus(Party *party);
BOOL sub_020778D8(Pokemon *mon);
BOOL sub_020778F8(Pokemon *mon);
BOOL IsPokemonInfectedWithPokerus(Pokemon *mon);
ecopsychologer marked this conversation as resolved.
Show resolved Hide resolved
BOOL CanPokemonSpreadPokerus(Pokemon *mon);
ecopsychologer marked this conversation as resolved.
Show resolved Hide resolved

/**
* @brief Sets Arceus' form based on its held item. Has no effect if the given Pokemon is not an Arceus
Expand Down Expand Up @@ -884,14 +886,14 @@ BOOL Pokemon_SetRotomForm(Pokemon *mon, int monForm, int moveSlot);
*/
void Pokemon_LoadLevelUpMovesOf(int monSpecies, int monForm, u16 *monLevelUpMoves);

void sub_02077D3C(UnkStruct_0202CC84 *param0, int param1, u16 monSpecies, int param3, int param4, int param5, int param6, int param7);
void sub_02077DB4(UnkStruct_0202CC84 *param0, int param1, u16 monSpecies, int param3, int param4, int param5, int param6, int param7, u8 param8);
BOOL sub_02077E3C(Pokemon *mon);
void sub_02077E64(Pokemon *mon, TrainerInfo *param1, int monPokeball, int param3, int param4, int param5);
void sub_02077EE4(Pokemon *mon, TrainerInfo *param1, int monPokeball, int param3, int param4, int param5);
void sub_02077F0C(Pokemon *mon, u32 param1, int param2);
void HandleChatotSpecialInteraction(ChatotCryData *param0, int param1, u16 monSpecies, int param3, int param4, int param5, int param6, int param7);
void HandleChatotSpecialAction(ChatotCryData *param0, int param1, u16 monSpecies, int param3, int param4, int param5, int param6, int param7, u8 param8);
BOOL IsPokemonEligibleForAction(Pokemon *mon);
void InitializePokemonAfterCapture(Pokemon *mon, TrainerInfo *param1, int monPokeball, int param3, int param4, int param5);
void PostCapturePokemonProcessing(Pokemon *mon, TrainerInfo *param1, int monPokeball, int param3, int param4, int param5);
void AssignHeldItemToPokemon(Pokemon *mon, u32 param1, int param2);
ecopsychologer marked this conversation as resolved.
Show resolved Hide resolved
BOOL Pokemon_CanLearnTM(Pokemon *mon, u8 tmID);
BOOL Pokemon_CanFormLearnTM(u16 monSpecies, int monForm, u8 tmID);
BOOL CanPokemonFormLearnTM(u16 monSpecies, int monForm, u8 tmID);
Comment on lines -894 to +896
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Keep the XXX_ naming scheme


/**
* @brief Sets the ability of a Pokemon based on its species, form and peronsality value
Expand Down
2 changes: 1 addition & 1 deletion include/struct_decls/struct_0202CC84_decl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#ifndef POKEPLATINUM_STRUCT_0202CC84_DECL_H
#define POKEPLATINUM_STRUCT_0202CC84_DECL_H

typedef struct UnkStruct_0202CC84_t UnkStruct_0202CC84;
typedef struct ChatotCryData_t ChatotCryData;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you merge this into the struct-definition header? In general, we are trying to get rid of opaque structs.


#endif // POKEPLATINUM_STRUCT_0202CC84_DECL_H
2 changes: 1 addition & 1 deletion include/struct_defs/battle_system.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ struct BattleSystem {
UnkStruct_02026324 *pokedex;
PCBoxes *pcBoxes;
Party *parties[4];
UnkStruct_0202CC84 * unk_78[4];
ChatotCryData * unk_78[4];
UnkStruct_02007768 * unk_88;
UnkStruct_ov12_0221FCDC * unk_8C;
UnkStruct_0200C6E4 * unk_90;
Expand Down
12 changes: 6 additions & 6 deletions include/struct_defs/struct_02090800.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ typedef struct {
UnkStruct_0200B358 * unk_08;
Pokemon * unk_0C;
BOOL unk_10;
UnkStruct_02090800_sub1 unk_14;
UnkStruct_02090800_sub1 unk_1C;
UnkStruct_02090800_sub1 unk_24;
UnkStruct_02090800_sub1 unk_2C;
UnkStruct_02090800_sub1 unk_34;
} UnkStruct_02090800;
PokemonInfoDisplayStruct_sub1 unk_14;
PokemonInfoDisplayStruct_sub1 unk_1C;
PokemonInfoDisplayStruct_sub1 unk_24;
PokemonInfoDisplayStruct_sub1 unk_2C;
PokemonInfoDisplayStruct_sub1 unk_34;
} PokemonInfoDisplayStruct;
Comment on lines +15 to +20
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
PokemonInfoDisplayStruct_sub1 unk_14;
PokemonInfoDisplayStruct_sub1 unk_1C;
PokemonInfoDisplayStruct_sub1 unk_24;
PokemonInfoDisplayStruct_sub1 unk_2C;
PokemonInfoDisplayStruct_sub1 unk_34;
} PokemonInfoDisplayStruct;
PokemonInfoDisplay_sub1 unk_14;
PokemonInfoDisplay_sub1 unk_1C;
PokemonInfoDisplay_sub1 unk_24;
PokemonInfoDisplay_sub1 unk_2C;
PokemonInfoDisplay_sub1 unk_34;
} PokemonInfoDisplay;


#endif // POKEPLATINUM_STRUCT_02090800_H
2 changes: 1 addition & 1 deletion include/struct_defs/struct_02090800_sub1.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
typedef struct {
int unk_00;
Strbuf* unk_04;
} UnkStruct_02090800_sub1;
} PokemonInfoDisplayStruct_sub1;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
} PokemonInfoDisplayStruct_sub1;
} PokemonInfoDisplay_sub1;

Also, is there enough info on this struct to document the fields?


#endif // POKEPLATINUM_STRUCT_02090800_SUB1_H
2 changes: 1 addition & 1 deletion include/struct_defs/struct_02095E80_t.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ struct UnkStruct_02095E80_t {
int (* unk_226C)(UnkStruct_02095E80 *);
Party * unk_2270;
Party * unk_2274;
UnkStruct_0202CC84 * unk_2278;
ChatotCryData * unk_2278;
UnkStruct_02027F8C * unk_227C;
UnkStruct_02027F8C unk_2280;
int unk_2308;
Expand Down
2 changes: 1 addition & 1 deletion include/struct_defs/struct_02098D38.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ typedef struct {
u32 unk_1C;
void * unk_20;
void * unk_24;
UnkStruct_0202CC84 * unk_28;
ChatotCryData * unk_28;
BOOL unk_2C;
} UnkStruct_02098D38;

Expand Down
2 changes: 1 addition & 1 deletion include/unk_02003B60.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#include <nnsys.h>

void sub_02003B60(UnkStruct_0202CC84 * param0, UnkStruct_020279FC * param1);
void sub_02003B60(ChatotCryData * param0, UnkStruct_020279FC * param1);
void sub_02003BD8(void);
void sub_02003D0C(int param0);
UnkStruct_02003D54 * sub_02003D54(void);
Expand Down
24 changes: 12 additions & 12 deletions include/unk_02006224.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@

#include <nitro/spi.h>

BOOL sub_02006224(void);
BOOL sub_02006260(const UnkStruct_0202CC84 * param0);
BOOL sub_0200629C(const UnkStruct_0202CC84 * param0, u32 param1, int param2, int param3);
void sub_02006350(void);
MICResult sub_0200637C(void);
MICResult sub_020063B8(void);
void sub_020063C0(UnkStruct_0202CC84 * param0);
void sub_020063D4(u8 param0);
BOOL sub_020063E4(UnkStruct_0202CC84 * param0, u32 param1, int param2, int param3);
BOOL sub_02006438(UnkStruct_0202CC84 * param0, u32 param1, int param2, int param3, u8 param4);
int Sound_Chatter(UnkStruct_0202CC84 * param0);
BOOL sub_020064C8(int param0);
BOOL CheckMicRecordingStatus(void);
BOOL IsChatotCryStructReadyForProcessing(const ChatotCryData * param0);
BOOL ProcessAudioInput(const ChatotCryData * param0, u32 param1, int param2, int param3);
void ResetMicStatusFlags(void);
MICResult StartMicSampling(void);
MICResult StopMicSampling(void);
void StoreMicDataInChatotCryStruct(ChatotCryData * param0);
void SetMicProcessingFlag(u8 param0);
BOOL ProcessChatotCryStructWithAudioParams(ChatotCryData * param0, u32 param1, int param2, int param3);
BOOL ProcessChatotCryStructWithExtendedAudioParams(ChatotCryData * param0, u32 param1, int param2, int param3, u8 param4);
int Sound_Chatter(ChatotCryData * param0);
BOOL IsAudioParamValid(int param0);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably give these Sound prefixes?


#endif // POKEPLATINUM_UNK_02006224_H
20 changes: 10 additions & 10 deletions include/unk_0202CC64.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
#include "struct_decls/struct_0202CC84_decl.h"
#include "struct_decls/struct_021C0794_decl.h"

int ChatotCry_SaveSize(void);
void ChatotCry_Init(UnkStruct_0202CC84 * param0);
UnkStruct_0202CC84 * sub_0202CC84(int param0);
UnkStruct_0202CC84 * sub_0202CC98(SaveData * param0);
BOOL sub_0202CCA4(const UnkStruct_0202CC84 * param0);
void sub_0202CCA8(UnkStruct_0202CC84 * param0);
const void * sub_0202CCB0(const UnkStruct_0202CC84 * param0);
void sub_0202CCB4(s8 * param0, const s8 * param1);
void sub_0202CCEC(UnkStruct_0202CC84 * param0, const s8 * param1);
void sub_0202CD3C(UnkStruct_0202CC84 * param0, const UnkStruct_0202CC84 * param1);
int GetSizeOfChatotCryData(void);
void ChatotCry_Init(ChatotCryData * param0);
ChatotCryData * AllocateAndInitializeChatotCryData(int param0);
ChatotCryData * GetChatotCryDataFromSave(SaveData * param0);
BOOL IsChatotCryDataValid(const ChatotCryData * param0);
void ResetChatotCryDataStatus(ChatotCryData * param0);
const void * GetChatotCryAudioBuffer(const ChatotCryData * param0);
void ProcessChatotCryAudioData(s8 * param0, const s8 * param1);
void StoreProcessedAudioInChatotCryData(ChatotCryData * param0, const s8 * param1);
void CopyChatotCryData(ChatotCryData * param0, const ChatotCryData * param1);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ChatotCry_ prefixes


#endif // POKEPLATINUM_UNK_0202CC64_H
2 changes: 1 addition & 1 deletion include/unk_02051D8C.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ void sub_020520A4(BattleParams * param0);
void sub_0205213C(BattleParams * param0, Pokemon * param1, int param2);
void sub_02052164(BattleParams * param0, const Party * param1, int param2);
void sub_02052184(BattleParams * param0, const TrainerInfo * param1, int param2);
void sub_020521A4(BattleParams * param0, const UnkStruct_0202CC84 * param1, int param2);
void sub_020521A4(BattleParams * param0, const ChatotCryData * param1, int param2);
void sub_020521B8(BattleParams * param0, const UnkStruct_0203CDB0 * param1, SaveData * param2, int param3, UnkStruct_0202B628 * param4, UnkStruct_0207D99C * param5, UnkStruct_0209C370 * param6);
void sub_02052314(BattleParams * param0, const UnkStruct_0203CDB0 * param1);
void sub_02052348(BattleParams * param0, const UnkStruct_0203CDB0 * param1, int param2);
Expand Down
6 changes: 3 additions & 3 deletions include/unk_02092494.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
#include "pokemon.h"
#include "struct_defs/struct_02090800.h"

UnkStruct_02090800 * sub_02092494(Pokemon * param0, BOOL param1, int param2);
void sub_0209282C(UnkStruct_02090800 * param0);
PokemonInfoDisplayStruct * sub_02092494(Pokemon * param0, BOOL param1, int param2);
void sub_0209282C(PokemonInfoDisplayStruct * param0);
void sub_0209304C(Pokemon * param0, TrainerInfo * param1, int param2, int param3, int param4);
void sub_0209305C(BoxPokemon * param0, TrainerInfo * param1, int param2, int param3, int param4);
void ProcessBoxPokemonWithTrainerInfo(BoxPokemon * param0, TrainerInfo * param1, int param2, int param3, int param4);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What does this function do? Process is a bit generic.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I updated it, it does kind of a bunch with cases but basically sets or processes the setting of box pokemon trainer info and met location


#endif // POKEPLATINUM_UNK_02092494_H
8 changes: 4 additions & 4 deletions include/unk_02096420.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
#include "pokemon.h"
#include "struct_decls/struct_party_decl.h"

u8 sub_02096420(Pokemon * param0, u16 param1, u16 param2, u32 param3);
u8 sub_0209693C(Party * param0, u16 param1, u8 param2, u8 param3, u32 param4);
u8 sub_02096954(Pokemon * param0, u16 param1, u16 param2, u16 param3, u32 param4);
u8 CheckItemEffectsOnPokemon(Pokemon * param0, u16 param1, u16 param2, u32 param3);
u8 CheckItemEffectsOnPartyMember(Party * param0, u16 param1, u8 param2, u8 param3, u32 param4);
u8 ApplyItemEffectsToPokemon(Pokemon * param0, u16 param1, u16 param2, u16 param3, u32 param4);
u8 sub_02096F14(Party * param0, u16 param1, u8 param2, u8 param3, u16 param4, u32 param5);
void sub_02097284(Party * param0);
void HealAllPokemonInParty(Party * party);

#endif // POKEPLATINUM_UNK_02096420_H
2 changes: 1 addition & 1 deletion src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ void NitroMain (void)
Unk_02101D28.unk_10.unk_00 = -1;
Unk_02101D28.unk_10.unk_08 = sub_020244AC();

sub_02003B60(sub_0202CC98(Unk_02101D28.unk_10.unk_08), sub_02025E44(Unk_02101D28.unk_10.unk_08));
sub_02003B60(GetChatotCryDataFromSave(Unk_02101D28.unk_10.unk_08), sub_02025E44(Unk_02101D28.unk_10.unk_08));
sub_02022844();

if (sub_02038FFC(3) == DWC_INIT_RESULT_DESTROY_OTHER_SETTING) {
Expand Down
6 changes: 3 additions & 3 deletions src/overlay005/ov5_021E622C.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2041,8 +2041,8 @@ static void ov5_021E62C4 (Party * param0, int param1, UnkStruct_02026218 * param
Party_RemovePokemonBySlotIndex(param0, param1);

if (Party_HasSpecies(param0, 441) == 0) {
UnkStruct_0202CC84 * v7 = sub_0202CC98(param3);
sub_0202CCA8(v7);
ChatotCryData * v7 = GetChatotCryDataFromSave(param3);
ResetChatotCryDataStatus(v7);
}
}

Expand Down Expand Up @@ -2441,7 +2441,7 @@ static void ov5_021E6948 (Pokemon * param0, BoxPokemon * param1, BoxPokemon * pa
if (v7->unk_00[v0] != 0) {
for (v1 = 0; v1 < 100; v1++) {
if (v7->unk_00[v0] == Item_MoveForTMHM(328 + v1)) {
if (Pokemon_CanFormLearnTM(v3, v6, v1)) {
if (CanPokemonFormLearnTM(v3, v6, v1)) {
if (Pokemon_AddMove(param0, v7->unk_00[v0]) == 0xffff) {
Pokemon_ReplaceMove(param0, v7->unk_00[v0]);
}
Expand Down
2 changes: 1 addition & 1 deletion src/overlay006/ov6_02240C9C.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1686,7 +1686,7 @@ static BOOL ov6_02242514 (const int param0, const UnkStruct_ov6_022422D0 * param
}
}

sub_02077F0C(param2, param3->battleType, v0);
AssignHeldItemToPokemon(param2, param3->battleType, v0);

{
u8 v1;
Expand Down
2 changes: 1 addition & 1 deletion src/overlay006/ov6_02243258.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1233,7 +1233,7 @@ static int ov6_02244228 (UnkStruct_ov6_02243FFC * param0)
param0->unk_00++;

{
sub_02077E3C(param0->unk_5C);
IsPokemonEligibleForAction(param0->unk_5C);
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/overlay006/ov6_022489E4.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ void ov6_02248D38 (int param0, int param1, void * param2, void * param3)
int v2;
u8 * v3;

v1 = ChatotCry_SaveSize();
v1 = GetSizeOfChatotCryData();
v3 = param2;
v2 = v3[v1];

Expand All @@ -311,7 +311,7 @@ BOOL ov6_02248D64 (UnkStruct_02095C48 * param0, int param1, void * param2)
int v1;
int v2;

v1 = ChatotCry_SaveSize();
v1 = GetSizeOfChatotCryData();
v0 = param0->unk_569;

if (param2 != NULL) {
Expand Down
4 changes: 2 additions & 2 deletions src/overlay012/ov12_0221FC20.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ typedef struct UnkStruct_ov12_02223178_t {
u8 unk_E8[4];
u32 unk_EC[4];
u32 unk_FC[4];
UnkStruct_0202CC84 * unk_10C;
ChatotCryData * unk_10C;
u8 * unk_110;
u16 * unk_114;
int unk_118;
Expand Down Expand Up @@ -3836,7 +3836,7 @@ static void ov12_022230D4 (UnkStruct_ov12_0221FCDC * param0)
v3 = param0->unk_BC->unk_D8[param0->unk_BC->unk_14];
v4 = param0->unk_BC->unk_E8[param0->unk_BC->unk_14];

sub_02077D3C(param0->unk_BC->unk_10C, v0, v3, v4, v1, v2, param0->unk_BC->unk_118, param0->unk_00);
HandleChatotSpecialInteraction(param0->unk_BC->unk_10C, v0, v3, v4, v1, v2, param0->unk_BC->unk_118, param0->unk_00);
}

static void ov12_02223134 (UnkStruct_ov12_0221FCDC * param0)
Expand Down
4 changes: 2 additions & 2 deletions src/overlay016/ov16_0223DF00.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ int ov16_0223EDE0(BattleSystem * param0);
u8 BattleSystem_TextSpeed(BattleSystem * param0);
int BattleSystem_Ruleset(BattleSystem * param0);
UnkStruct_02015F84 * ov16_0223EE28(BattleSystem * param0);
UnkStruct_0202CC84 * BattleSystem_ChatotVoice(BattleSystem * param0, int param1);
ChatotCryData * BattleSystem_ChatotVoice(BattleSystem * param0, int param1);
void ov16_0223EE70(BattleSystem * param0);
void ov16_0223EF2C(BattleSystem * param0, int param1, int param2);
void ov16_0223EF48(BattleSystem * param0, Pokemon * param1);
Expand Down Expand Up @@ -1053,7 +1053,7 @@ UnkStruct_02015F84 * ov16_0223EE28 (BattleSystem * param0)
return param0->unk_1C4;
}

UnkStruct_0202CC84 * BattleSystem_ChatotVoice (BattleSystem * param0, int param1)
ChatotCryData * BattleSystem_ChatotVoice (BattleSystem * param0, int param1)
{
if ((param0->battleType & 0x8) || ((param0->battleType & 0x10) && (BattleSystem_BattlerSlot(param0, param1) & 0x1))) {
return param0->unk_78[param1];
Expand Down
Loading
Loading